Code

Ilo#74

Code

Open

AF-55 wants to merge 202 commits intoLCAV:mainLCAV/LenslessPiCam:mainfrom AF-55:iloAF-55/LenslessPiCam:iloCopy head branch name to clipboard

+4,299-4

Commits

Commits on Apr 25, 2023

• notes.txt to test the branches

  

  Aaron Fargeon

  committed
  1abb1da

Commits on May 11, 2023

• masks folder, notebook to test FlatCam

  

  Aaron Fargeon

  committed
  f4e3935

• added dimensions to simulate PSF

  

  Aaron Fargeon

  committed
  a45cff3

• MURA masks with different sizes

  

  Aaron Fargeon

  committed
  8df7426

• psf simulation notebook

  

  Aaron Fargeon

  committed
  c139660

• inverted colormaps for MURA

  

  Aaron Fargeon

  committed
  5a95094

• new masks with inverted colormap

  

  Aaron Fargeon

  committed
  2dcd242

• minor changes

  

  Aaron Fargeon

  committed
  81e1980

• PhlatCam notebooks and masks creation

  

  Aaron Fargeon

  committed
  e73b565

• FZA notebooks and masks creation

  

  Aaron Fargeon

  committed
  d684709

• PNG masks for the website

  

  Aaron Fargeon

  committed
  2ea368a

• PNG masks for the website

  

  Aaron Fargeon

  committed
  e71de45

• fixed blank images

  

  Aaron Fargeon

  committed
  48615b6

• change MLS sequence

  

  Aaron Fargeon

  committed
  4681b8f

• testing new MLS sequence generator

  

  Aaron Fargeon

  committed
  2eb2d0d

• edge detection

  

  Aaron Fargeon

  committed
  b6663c1

• testing new MLS sequence generator

  

  Aaron Fargeon

  committed
  59617c9

• inp

  

  Aaron Fargeon

  committed
  ba7e8f0

• folders for MURA masks and MLS masks

  

  Aaron Fargeon

  committed
  7b20178

• removed axis on MLS

  

  Aaron Fargeon

  committed
  07ec4dd

• captioning

  

  Aaron Fargeon

  committed
  8c45427

• rectangular shape

  

  Aaron Fargeon

  committed
  c259566

• deleting images

  

  Aaron Fargeon

  committed
  18a01de

• higher dimension mask

  

  Aaron Fargeon

  committed
  63c3dc3

• different sizes and periods

  

  Aaron Fargeon

  committed
  6bd6da1

• iterative phase retrieval notebook

  

  Aaron Fargeon

  committed
  478ce3f

• bigger plot titles

  

  Aaron Fargeon

  committed
  beb99cd

• iterative phase retrieval attempt

  

  Aaron Fargeon

  committed
  ff3cfb5

• near-fresnel phase retrieval

  

  Aaron Fargeon

  committed
  9da780e

• testing fresnel on fza

  

  Aaron Fargeon

  committed
  f4bf5bf

• print shapes

  

  Aaron Fargeon

  committed
  ac5cc3d

• mask class py file

  

  Aaron Fargeon

  committed
  ecf975b

• change edges shape

  

  Aaron Fargeon

  committed
  cfa4bda

• mask generation test

  

  Aaron Fargeon

  committed
  b577e53

• mask_class rename

  

  Aaron Fargeon

  committed
  65929b6

Commits on May 15, 2023

• removed settings file

  

  Aaron Fargeon

  committed
  72a2c17

• answering pull request

  

  Aaron Fargeon

  committed
  95872cd

• Merge branch 'main' into masks

  

  Aaron Fargeon

  committed
  bceb10b

• testing phase retrieval

  

  Aaron Fargeon

  committed
  7d2ac90

• added to gitignore

  

  Aaron Fargeon

  committed
  bedbae0

• add psf computation

  

  Aaron Fargeon

  committed
  62dfafa

Commits on May 16, 2023

• added notebooks to gitignore

  

  Aaron Fargeon

  committed
  64e2a69

• removed notebooks from tracking

  

  Aaron Fargeon

  committed
  b9b3aa0

• removed from tracking

  

  Aaron Fargeon

  committed
  3dd8dd7

• add IPYNB, PNG and NPY

  

  Aaron Fargeon

  committed
  9c21a9f

• removed simulated PSF images

  

  Aaron Fargeon

  committed
  2e7df4e

• 2nd pull request comments

  

  Aaron Fargeon

  committed
  eda68f4

Commits on May 17, 2023

• mapping values from [-π,π] to [0,2π]

  

  Aaron Fargeon

  committed
  210ce26

• corrected PhaseContour

  

  Aaron Fargeon

  committed
  b267cce

• adding forward propagation coherence test

  

  Aaron Fargeon

  committed
  95c988d

Commits on May 23, 2023

• added formasks folders

  

  Aaron Fargeon

  committed
  1cee06b

Commits on May 24, 2023

• added celeba_mini dataset

  

  Aaron Fargeon

  committed
  b69e82d

• Fix simulation examples for 3D.

  ebezzam

  committed
  5ec2868

• merge with LCAV/fix_simulation_examples

  

  Aaron Fargeon

  committed
  5b0890c

• Fix single file example.

  ebezzam

  committed
  7cb34f3

• Add function to set initial estimate.

  ebezzam

  committed
  538fe6f

• Add message if reset=False

  ebezzam

  committed
  c3c2521

• Update CHANGELOG

  ebezzam

  committed
  f2e2450

Commits on May 25, 2023

• Merge remote-tracking branch 'upstream/fix_simulation_examples' into masks

  

  Aaron Fargeon

  committed
  15fda8b

• scripts/sim/test_single_file.py

  

  Aaron Fargeon

  committed
  6a3ead2

Commits on May 26, 2023

• added scripts/sim/test_dataset.py

  

  Aaron Fargeon

  committed
  5e791ba

Commits on May 31, 2023

• added CodedAperture upscaling

  

  Aaron Fargeon

  committed
  956db17

• corrected CodedAperture rows and columns

  

  Aaron Fargeon

  committed
  ea65341

• testing upscaling

  

  Aaron Fargeon

  committed
  42068a7

Commits on Jun 6, 2023

• added roundint to have 0s and 1s in upscaled MLS mask

  

  Aaron Fargeon

  committed
  3fd0769

Commits on Jun 8, 2023

• squared amplitude PSF

  

  Aaron Fargeon

  committed
  2c045bb

• making FZA mask binary

  

  Aaron Fargeon

  committed
  b7a588d

• making FZA mask binary

  

  Aaron Fargeon

  committed
  27bda12

• 3D PSF

  

  Aaron Fargeon

  committed
  ebeb0ff

Commits on Jun 12, 2023

• simplified phase contour

  

  Aaron Fargeon

  committed
  2eedf40

Commits on Jun 15, 2023

• changing upscaled coded aperture mask into int

  

  Aaron Fargeon

  committed
  5d97f40

• added cloned flatcam repo by tanjasper

  

  Aaron Fargeon

  committed
  e145931

Commits on Jun 20, 2023

• inverted dimensions for FZA

  

  Aaron Fargeon

  committed
  9c059ab

Commits on Jun 27, 2023

• Merge branch 'main' into masks

  

  Aaron Fargeon

  committed
  820e54a

Commits on Jun 28, 2023

• from_sensor class method

  

  Aaron Fargeon

  committed
  5ae52f0

• testing from_sensor class method

  

  Aaron Fargeon

  committed
  65a4d19

• fixed PhaseContour broadcast error

  

  Aaron Fargeon

  committed
  4ff7f1d

• fixed first 3 tests

  

  Aaron Fargeon

  committed
  31d8d39

Commits on Jun 29, 2023

• added from_sensor tests for phase contour and FZA

  

  Aaron Fargeon

  committed
  c538bf7

• upscaling for phase contour, removed default args from from_sensor, comments

  

  Aaron Fargeon

  committed
  ec1d9bf

Commits on Jul 4, 2023

• removed simulation-related files

  

  Aaron Fargeon

  committed
  33771b3

• Merge branch 'main' of https://github.com/AF-55/LenslessPiCam into masks

  

  Aaron Fargeon

  committed
  acf8e76

• placing mask.py in hardware module

  

  Aaron Fargeon

  committed
  252deb0

• corrected import

  

  Aaron Fargeon

  committed
  bc7dfd7

• add requirements for mask tests

  

  Aaron Fargeon

  committed
  9f29d9d

• removed 4 channel requirement

  

  Aaron Fargeon

  committed
  23ee16c

• added warnings about feature size for PhaseContour

  

  Aaron Fargeon

  committed
  70f862d

• sensor_dict copy in from_name

  

  Aaron Fargeon

  committed
  3b8bd2a

• copies of sensor attributes in from_sensor

  

  Aaron Fargeon

  committed
  44b7abc

• no global variables, if main condition

  

  Aaron Fargeon

  committed
  9508a65

Commits on Jul 7, 2023

• Fix overwriting of sensor parameters.

  ebezzam

  committed
  c1ffa07

• Refactor names, compute PSF over different wv.

  ebezzam

  committed
  fcf8a2b

• Update tests and requirements.

  ebezzam

  committed
  bef7ca9

• Update CHANGELOG.

  ebezzam

  committed
  085f5ca

• Added header, corrected docstrings

  

  Aaron Fargeon

  committed
  fa0e9e0

• removed useless requirements

  

  Aaron Fargeon

  committed
  6770fca

• added mask

  

  Aaron Fargeon

  committed
  e802bb7

• created mask rst file

  

  Aaron Fargeon

  committed
  3cb2cc3

• FIx documentation config to render mask module.

  ebezzam

  committed
  b63385a

• Update mask docstrings.

  ebezzam

  committed
  11146e1

• added Phase Contour and FZA

  

  Aaron Fargeon

  committed
  4c1d8a0

Commits on Jul 11, 2023

• corrected docstring

  

  Aaron Fargeon

  committed
  73f6b9f

• corrected docstring

  

  Aaron Fargeon

  committed
  4ff5d25

• Fix docstrings.

  ebezzam

  committed
  7b9aab3

• Add target_psf docstring.

  ebezzam

  committed
  50557ca

Commits on Jul 13, 2023

• Changed the FZA radius from px to meters

  

  Aaron Fargeon

  committed
  06e4482

• Merge branch 'masks' of https://github.com/AF-55/LenslessPiCam into masks

  

  Aaron Fargeon

  committed
  365ed56

• Changed FZA radius from pixels to meters

  

  Aaron Fargeon

  committed
  1425663

Commits on Jul 14, 2023

• Added FlatCam authors' data for simulation

  

  Aaron Fargeon

  committed
  c699ae5

• Replaced scipy.ndimage.zoom by lensless.utils.image.resize for uscpaling

  

  Aaron Fargeon

  committed
  c71a29c

Commits on Jul 17, 2023

• minor changes

  

  Aaron Fargeon

  committed
  b002820

• FlatCam recon and sim file

  

  Aaron Fargeon

  committed
  107121f

Commits on Jul 18, 2023

• deletion (replaced by tikhonov

  

  Aaron Fargeon

  committed
  cea6019

• Corrected docstrings

  

  Aaron Fargeon

  committed
  320e4ca

• fixed bayer2rgb

  

  Aaron Fargeon

  committed
  ef582e8

• Created reconstruction class, adapter rgb2bayer to different patterns

  

  Aaron Fargeon

  committed
  9f0956f

Commits on Jul 19, 2023

• Docstrings

  

  Aaron Fargeon

  committed
  c874a90

• Added conversions between RGB and 4d Bayer

  

  Aaron Fargeon

  committed
  62dbe37

• removed image-related functions

  

  Aaron Fargeon

  committed
  2d0455c

• changed default noise period for PhaseContour

  

  Aaron Fargeon

  committed
  19e1804

Commits on Jul 20, 2023

• added custom P and Q matrices

  

  Aaron Fargeon

  committed
  6a392b7

• removed resize import

  

  Aaron Fargeon

  committed
  491cc3b

• added .upper() to coded aperture methods

  

  Aaron Fargeon

  committed
  8e976ff

• fixed assertions

  

  Aaron Fargeon

  committed
  e3454dc

• single file simulation with custom masks (Tikhonov method included)

  

  Aaron Fargeon

  committed
  712990d

• Edit docstrings.

  ebezzam

  committed
  6604f9c

• Merge branch 'masks' of https://github.com/AF-55/LenslessPiCam into masks

  ebezzam

  committed
  f584b05

• Clean up mask example script.

  ebezzam

  committed
  4ebc364

• Update gitignore.

  ebezzam

  committed
  bf5d315

• Fix comment.

  ebezzam

  committed
  074919d

• Update comments.

  ebezzam

  committed
  4b466df

Commits on Jul 21, 2023

• Fix settings for FZA.

  ebezzam

  committed
  8089c4f

• changed default ADMM n_iter to 20

  

  Aaron Fargeon

  committed
  91fda9f

• separated P & Q computation function

  

  Aaron Fargeon

  committed
  7ad591e

• changed default ADMM iter to 20

  

  Aaron Fargeon

  committed
  36c6c8b

• Merge branch 'masks' of https://github.com/AF-55/LenslessPiCam into masks

  

  Aaron Fargeon

  committed
  4e1606f

Commits on Jul 25, 2023

• Changed default FZA radius

  

  Aaron Fargeon

  committed
  307ab49

• Change file name

  

  Aaron Fargeon

  committed
  b6304bd

• name change

  

  Aaron Fargeon

  committed
  66dad51

• name change

  

  Aaron Fargeon

  committed
  a1c0318

• Custom mask dataset simulation

  

  Aaron Fargeon

  committed
  c9e6aa5

• fixed MLS issue, removed comments

  

  Aaron Fargeon

  committed
  b9e4acc

• added reconstruction normalization

  

  Aaron Fargeon

  committed
  459b924

Commits on Jul 26, 2023

• changed docstrings and config name

  

  Aaron Fargeon

  committed
  925a4b3

• change default flatcam parameter to false

  

  Aaron Fargeon

  committed
  0f92ea6

Commits on Jul 28, 2023

• Merge with main.

  ebezzam

  committed
  0f7c51e

• Add line for formatting.

  ebezzam

  committed
  3622a9f

• Add support for float-valued feature_size.

  ebezzam

  committed
  69a2e3a

• Refactor.

  ebezzam

  committed
  847a426

• Clean up mask simulation and tikhonov recon.

  ebezzam

  committed
  8a6e9bc

• Formatting.

  ebezzam

  committed
  9582a5d

• Formatting

  ebezzam

  committed
  e0b6752

• Add docs for coded aperture reconstruction.

  ebezzam

  committed
  17f9b37

Commits on Jul 31, 2023

• ILO single image simulation files

  

  Aaron Fargeon

  committed
  7601b87

• added face alignment for ILO

  

  Aaron Fargeon

  committed
  e6178bd

• minor changes

  

  Aaron Fargeon

  committed
  08e3b0c

• minor changes (plots, docstring, etc)

  

  Aaron Fargeon

  committed
  498f2ce

• minor changes (plots, docstring, etc)

  

  Aaron Fargeon

  committed
  71db09d

• implemented tikhonov reconstruction

  

  Aaron Fargeon

  committed
  572e71a

• Merge branch 'main' into masks

  ebezzam

  committed
  443719a

• FIx mask parsing.

  ebezzam

  committed
  599aa1f

• Inherit from single file config, add torch support

  ebezzam

  committed
  25eb4d8

• Update changelog

  ebezzam

  committed
  dc2331b

• Update changelog.

  ebezzam

  committed
  0d78725

• Add punctuation.

  ebezzam

  committed
  c14e2f8

Commits on Aug 2, 2023

• pull from masks

  

  Aaron Fargeon

  committed
  ad3eb2b

• separated to avoid conflicts

  

  Aaron Fargeon

  committed
  4917a05

• Merge branch 'LCAV:main' into ilo

  AF-55

  authored
  e41b2f4

• adapted to modified mask class

  

  Aaron Fargeon

  committed
  8352bee

• normalize psf

  

  Aaron Fargeon

  committed
  16b5dca

• Merge branch 'masks' of https://github.com/AF-55/LenslessPiCam into ilo

  

  Aaron Fargeon

  committed
  7c424b5

• minor fixes + plots

  

  Aaron Fargeon

  committed
  e3b1c84

• minor fixes + plots

  

  Aaron Fargeon

  committed
  7f6d057

• clean code to remove ticks

  

  Aaron Fargeon

  committed
  aac401c

• Merge branch 'masks' of https://github.com/AF-55/LenslessPiCam into ilo

  

  Aaron Fargeon

  committed
  f28c9dd

Commits on Aug 3, 2023

• Dirty dump of ILO reconstruction files.

  ebezzam

  committed
  2530987

• refactor

  ebezzam

  committed
  89cfd8d

Commits on Aug 8, 2023

• rearranging

  

  Aaron Fargeon

  committed
  d0ab93c

• added numpy array PSF adaptation

  

  Aaron Fargeon

  committed
  028dd7b

Commits on Aug 9, 2023

• adapter to remote server (/scratch/...)

  

  Aaron Fargeon

  committed
  a67ae1d

• added dlib for ILO

  AF-55

  committed
  7074025

Commits on Aug 15, 2023

• File to test LatentOptimizer import

  AF-55

  committed
  7815d17

Commits on Aug 16, 2023

• Removed download, added predictor_path argument

  AF-55

  committed
  ec23cda

• testing data imports

  AF-55

  committed
  bcb4091

• added proper environment for ILO

  AF-55

  committed
  2a1d251

• minor modifications

  AF-55

  committed
  d9a93e6

• testing

  AF-55

  committed
  4ec2f6c

• Minor changes (align face)

  AF-55

  committed
  69dd5e6

• Changed forward model

  AF-55

  committed
  6025eba

Commits on Aug 21, 2023

• Add face aligner download if needed.

  ebezzam

  committed
  21a7fab

• Fix parsing of StyleGAN files.

  ebezzam

  committed
  37a707e

Commits on Aug 22, 2023

• Added Ninja

  AF-55

  committed
  1d787f8

• Changed paths and dirs

  AF-55

  committed
  fa21a75

• Removed lambda in forward model definition

  AF-55

  committed
  f7260ae

• New file for ILO dataset simulation

  AF-55

  committed
  153bf10

• started to adapt code to single file

  AF-55

  committed
  048d0ee

• Clean up file paths.

  ebezzam

  committed
  5174b33

• added psf argument

  AF-55

  committed
  a893602

• Fix forward model configuration.

  ebezzam

  committed
  63694c7

• Use newer waveprop.

  ebezzam

  committed
  97eaa68

• plotting ILO result

  AF-55

  committed
  160c03f

• Trying different hyperparameters.

  ebezzam

  committed
  dc3bfc7