Clean up files and update CHANGELOG.

LCAV · Aug 7, 2024 · b27b973 · b27b973
1 parent 7d129ef
commit b27b973
Show file tree

Hide file tree

Showing 19 changed files with 163 additions and 207 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -15,6 +15,17 @@ Added
 
 - Option to pass background image to ``utils.io.load_data``.
 - Option to set image resolution with ``hardware.utils.display`` function.
+- Auxiliary of reconstructing output from pre-processor (not working).
+- Option to set focal range for MultiLensArray.
+- Optional to remove deadspace modelling for programmable mask.
+- Compensation branch for unrolled ADMM: https://ieeexplore.ieee.org/abstract/document/9546648
+- Multi-Wiener deconvolution network: https://opg.optica.org/oe/fulltext.cfm?uri=oe-31-23-39088&id=541387
+- Option to skip pre-processor and post-processor at inference time.
+- Option to set difference learning rate schedules, e.g. ADAMW, exponential decay, Cosine decay with warmup.
+- Various augmentations for training: random flipping, random rotate, and random shifts. Latter two don't work well since new regions appear that throw off PSF/LSI modeling.
+- HFSimulated object for simulating lensless data from ground-truth and PSF.
+- Option to set cache directory for Hugging Face datasets.
+- Option to initialize training with another model.
 
 Changed
 ~~~~~~~
@@ -24,7 +35,9 @@ Changed
 Bugfix
 ~~~~~~
 
-- Nothing
+- Computation of average metric in batches.
+- Support for grayscale PSF for RealFFTConvolve2D.
+- Calling model.eval() before inference, and model.train() before training.
 
 
 1.0.7 - (2024-05-14)

diff --git a/README.rst b/README.rst
@@ -44,7 +44,7 @@ The toolkit includes:
 * Camera assembly tutorials (`link <https://lensless.readthedocs.io/en/latest/building.html>`__).
 * Measurement scripts (`link <https://lensless.readthedocs.io/en/latest/measurement.html>`__).
 * Dataset preparation and loading tools, with `Hugging Face <https://huggingface.co/bezzam>`__ integration (`slides <https://docs.google.com/presentation/d/18h7jTcp20jeoiF8dJIEcc7wHgjpgFgVxZ_bJ04W55lg/edit?usp=sharing>`__ on uploading a dataset to Hugging Face with `this script <https://github.com/LCAV/LenslessPiCam/blob/main/scripts/data/upload_dataset_huggingface.py>`__).
-* `Reconstruction algorithms <https://lensless.readthedocs.io/en/latest/reconstruction.html>`__ (e.g. FISTA, ADMM, unrolled algorithms, trainable inversion, pre- and post-processors).
+* `Reconstruction algorithms <https://lensless.readthedocs.io/en/latest/reconstruction.html>`__ (e.g. FISTA, ADMM, unrolled algorithms, trainable inversion, , multi-Wiener deconvolution network, pre- and post-processors).
 * `Training script <https://github.com/LCAV/LenslessPiCam/blob/main/scripts/recon/train_learning_based.py>`__ for learning-based reconstruction.
 * `Pre-trained models <https://github.com/LCAV/LenslessPiCam/blob/main/lensless/recon/model_dict.py>`__ that can be loaded from `Hugging Face <https://huggingface.co/bezzam>`__, for example in `this script <https://github.com/LCAV/LenslessPiCam/blob/main/scripts/recon/diffusercam_mirflickr.py>`__.
 * Mask `design <https://lensless.readthedocs.io/en/latest/mask.html>`__ and `fabrication <https://lensless.readthedocs.io/en/latest/fabrication.html>`__ tools.

diff --git a/configs/benchmark_diffusercam_mirflickr.yaml b/configs/benchmark_diffusercam_mirflickr.yaml
@@ -5,7 +5,7 @@ defaults:
 
 dataset: HFDataset
 batchsize: 4
-device: "cuda:3"
+device: "cuda:0"
 
 huggingface:
   repo: "bezzam/DiffuserCam-Lensless-Mirflickr-Dataset-NORM"
@@ -20,39 +20,40 @@ huggingface:
   single_channel_psf: True
 
 algorithms: [
-  # "ADMM",
+  "ADMM",
 
-  # ## - -- reconstructions trained on DiffuserCam
-  # "hf:diffusercam:mirflickr:U5+Unet8M",
-  # "hf:diffusercam:mirflickr:TrainInv+Unet8M",
-  # "hf:diffusercam:mirflickr:MMCN4M+Unet4M",
-  # "hf:diffusercam:mirflickr:MWDN8M",
+  ## -- reconstructions trained on DiffuserCam measured
+  "hf:diffusercam:mirflickr:U5+Unet8M",
+  "hf:diffusercam:mirflickr:TrainInv+Unet8M",
+  "hf:diffusercam:mirflickr:MMCN4M+Unet4M",
+  "hf:diffusercam:mirflickr:MWDN8M",
   "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M",
-  # "hf:diffusercam:mirflickr:Unet4M+TrainInv+Unet4M",
-  # "hf:diffusercam:mirflickr:Unet2M+MMCN+Unet2M",
-  # "hf:diffusercam:mirflickr:Unet2M+MWDN6M",
-  # "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
-
-  # ## - -- reconstructions trained on other datasets/systems
-  # # "hf:tapecam:mirflickr:Unet4M+U10+Unet4M",
-  # # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
-  # # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
-  # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
-  # # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
-  # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips",
-  # # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips_rotate10",
-  # # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_aux1",
-  # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M",
+  "hf:diffusercam:mirflickr:Unet4M+TrainInv+Unet4M",
+  "hf:diffusercam:mirflickr:Unet2M+MMCN+Unet2M",
+  "hf:diffusercam:mirflickr:Unet2M+MWDN6M",
+  "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
+  # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam",
+  # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam_post",
+  # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam_pre",
 
+  # ## -- reconstruction trained on DiffuserCam simulated
+  # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_tapecam",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_tapecam_post",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_tapecam_pre",
-  # # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam",
-  # # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam_post",
-  # # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam_pre",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi_post",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi_pre",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi",
+
+  # ## -- reconstructions trained on other datasets/systems
+  # "hf:tapecam:mirflickr:Unet4M+U10+Unet4M",
+  # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
+  # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
+  # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
+  # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
+  # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips",
+  # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips_rotate10",
+  # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_aux1",
   # "hf:digicam:mirflickr_multi_25k:Unet4M+U10+Unet4M_wave",
   # "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave",
 ]

diff --git a/configs/benchmark_digicam_celeba.yaml b/configs/benchmark_digicam_celeba.yaml
@@ -4,23 +4,25 @@ defaults:
   - _self_
 
 
-dataset: HFDataset   # DiffuserCam, DigiCamCelebA, HFDataset
+dataset: HFDataset
 batchsize: 10
-device: "cuda:2"
+device: "cuda:0"
 
 algorithms: [
   "ADMM",
-  # "hf:digicam:celeba_26k:U5+Unet8M_wave",
-  # "hf:digicam:celeba_26k:TrainInv+Unet8M_wave",
-  # "hf:digicam:celeba_26k:MWDN8M_wave",
-  # "hf:digicam:celeba_26k:MMCN4M+Unet4M_wave",
-  # "hf:digicam:celeba_26k:Unet2M+MWDN6M_wave",
-  # "hf:digicam:celeba_26k:Unet4M+TrainInv+Unet4M_wave",
-  # "hf:digicam:celeba_26k:Unet2M+MMCN+Unet2M_wave",
-  # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
-  # "hf:digicam:celeba_26k:Unet4M+U10+Unet4M_wave",
+
+  ## -- reconstructions trained on measured data
+  "hf:digicam:celeba_26k:U5+Unet8M_wave",
+  "hf:digicam:celeba_26k:TrainInv+Unet8M_wave",
+  "hf:digicam:celeba_26k:MWDN8M_wave",
+  "hf:digicam:celeba_26k:MMCN4M+Unet4M_wave",
+  "hf:digicam:celeba_26k:Unet2M+MWDN6M_wave",
+  "hf:digicam:celeba_26k:Unet4M+TrainInv+Unet4M_wave",
+  "hf:digicam:celeba_26k:Unet2M+MMCN+Unet2M_wave",
+  "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
+  "hf:digicam:celeba_26k:Unet4M+U10+Unet4M_wave",
 
-  # #-- reconstructions trained on other datasets/systems
+  # # -- reconstructions trained on other datasets/systems
   # "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
   # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M",
@@ -29,33 +31,12 @@ algorithms: [
   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
 ]
 
-
-# ## -- reconstructions trained on other datasets/systems
-# algorithms: [
-#   "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
-#   "hf:tapecam:mirflickr:Unet4M+U10+Unet4M",
-#   "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
-#   # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
-# ]
-
-# # algorithm configuration
-# hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave:
-#   skip_post: True
-# hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M:
-#   skip_post: True
-# hf:digicam:mirflickr_multi_25k:Unet4M+U10+Unet4M:
-#   skip_post: True
-# hf:digicam:mirflickr_multi_25k:Unet4M+U10+Unet4M_wave:
-#   skip_post: True
-
 save_idx: [0, 2, 3, 4, 9]
 n_iter_range: [100]    # for ADMM
 
 huggingface:
   repo: bezzam/DigiCam-CelebA-26K
-  # cache_dir: /dev/shm
-  psf: psf_measured.png
-  # psf: psf_simulated_waveprop.png    # psf_simulated_waveprop.png, psf_simulated.png, psf_measured.png
+  psf: psf_simulated_waveprop.png    # psf_simulated_waveprop.png, psf_simulated.png, psf_measured.png
   split_seed: 0
   test_size: 0.15
   downsample: 2

diff --git a/configs/benchmark_digicam_mirflickr_multi.yaml b/configs/benchmark_digicam_mirflickr_multi.yaml
@@ -10,7 +10,6 @@ device: "cuda:0"
 
 huggingface:
   repo: "bezzam/DigiCam-Mirflickr-MultiMask-25K"
-  cache_dir: /dev/shm
   psf: null   # null for simulating PSF
   image_res: [900, 1200]  # used during measurement
   rotate: True   # if measurement is upside-down
@@ -22,34 +21,35 @@ huggingface:
   downsample: 1
 
 algorithms: [
-  # "ADMM",
-  ## -- reconstructions trained on other datasets/systems
+  "ADMM",
+
+  ## -- reconstructions trained on measured data 
+  "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave",
+  "hf:digicam:mirflickr_multi_25k:Unet4M+U10+Unet4M_wave",
+  "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave_aux1",
+  "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave_flips",
+
+  # ## -- reconstructions trained on other datasets/systems
   # "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
   # "hf:tapecam:mirflickr:Unet4M+U10+Unet4M",
   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
   # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
   # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
-  # "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave",
-  # "hf:digicam:mirflickr_multi_25k:Unet4M+U10+Unet4M_wave",
   # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_aux1",
   # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_flips",
   # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_flips_rotate10",
-  # "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave_aux1",
-  # "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave_flips",
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
   # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M",
-  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_ft_flips",
-  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_ft_flips_rotate10",
+  # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_ft_flips",
+  # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_ft_flips_rotate10",
 ]
 
+# # -- to only use output from unrolled
+# hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_aux1:
+#   skip_post: True
+#   skip_pre: True
 
-# -- to only use output from unrolled
-hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_aux1:
-  skip_post: True
-  skip_pre: True
-
-# save_idx: [1, 2, 4, 5, 9]
-save_idx: [24, 33, 61]
+save_idx: [1, 2, 4, 5, 9, 24, 33, 61]
 n_iter_range: [100]    # for ADMM
 
 # simulating PSF

diff --git a/configs/benchmark_digicam_mirflickr_single.yaml b/configs/benchmark_digicam_mirflickr_single.yaml
@@ -3,7 +3,6 @@ defaults:
   - benchmark
   - _self_
 
-
 dataset: HFDataset
 batchsize: 4
 device: "cuda:0"
@@ -23,16 +22,20 @@ huggingface:
 
 
 algorithms: [
-  # "ADMM",
-  # "hf:digicam:mirflickr_single_25k:U5+Unet8M_wave",
-  # "hf:digicam:mirflickr_single_25k:TrainInv+Unet8M_wave",
-  # "hf:digicam:mirflickr_single_25k:MMCN4M+Unet4M_wave",
-  # "hf:digicam:mirflickr_single_25k:MWDN8M_wave",
-  # "hf:digicam:mirflickr_single_25k:Unet4M+TrainInv+Unet4M_wave",
-  # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
-  # "hf:digicam:mirflickr_single_25k:Unet2M+MMCN+Unet2M_wave",
-  # "hf:digicam:mirflickr_single_25k:Unet2M+MWDN6M_wave",
-  # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
+  "ADMM",
+
+  # -- reconstructions trained on measured data
+  "hf:digicam:mirflickr_single_25k:U5+Unet8M_wave",
+  "hf:digicam:mirflickr_single_25k:TrainInv+Unet8M_wave",
+  "hf:digicam:mirflickr_single_25k:MMCN4M+Unet4M_wave",
+  "hf:digicam:mirflickr_single_25k:MWDN8M_wave",
+  "hf:digicam:mirflickr_single_25k:Unet4M+TrainInv+Unet4M_wave",
+  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
+  "hf:digicam:mirflickr_single_25k:Unet2M+MMCN+Unet2M_wave",
+  "hf:digicam:mirflickr_single_25k:Unet2M+MWDN6M_wave",
+  "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
+  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_flips",
+  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_flips_rotate10",
 
   # ## -- reconstructions trained on other datasets/systems
   # "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
@@ -42,31 +45,8 @@ algorithms: [
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
   # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M",
   # "hf:digicam:mirflickr_multi_25k:Unet4M+U5+Unet4M_wave",
-  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_flips",
-  "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave_flips_rotate10",
-
 ]
 
-
-# algorithms: [
-#   # ## - simulated PSF (simulation.use_waveprop=True, simulation.deadspace=True)
-#   # "hf:digicam:mirflickr_single_25k:U10_wave",
-#   # "hf:digicam:mirflickr_single_25k:Unet8M_wave",
-#   # "hf:digicam:mirflickr_single_25k:TrainInv+Unet8M_wave",
-#   # "hf:digicam:mirflickr_single_25k:U10+Unet8M_wave",
-#   # "hf:digicam:mirflickr_single_25k:Unet4M+TrainInv+Unet4M_wave",
-#   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave"
-
-#   ## -- below models need to set correct PSF simulation
-#   # ## - measured PSF (huggingface.psf=psf_measured.png)
-#   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_measured",
-#   # ## - simulated PSF (simulation.use_waveprop=True, simulation.deadspace=False)
-#   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave_nodead",
-#   # ## - simulated PSF (simulation.use_waveprop=False, simulation.deadspace=True)
-#   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M",
-#   # ## - simulated PSF (simulation.use_waveprop=False, simulation.deadspace=False)
-#   # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_nodead"
-# ]
 save_idx: [1, 2, 4, 5, 9]
 n_iter_range: [100]    # for ADMM
 

diff --git a/configs/benchmark_tapecam_mirflickr.yaml b/configs/benchmark_tapecam_mirflickr.yaml
@@ -23,25 +23,31 @@ huggingface:
 
 ## -- reconstructions trained with same dataset/system
 algorithms: [
-#   "ADMM",
-#   "hf:tapecam:mirflickr:U5+Unet8M",
-#   "hf:tapecam:mirflickr:TrainInv+Unet8M",
-#   "hf:tapecam:mirflickr:MMCN4M+Unet4M",
-#   "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
-#   "hf:tapecam:mirflickr:Unet4M+TrainInv+Unet4M",
-#   "hf:tapecam:mirflickr:Unet2M+MMCN+Unet2M",
-#   "hf:tapecam:mirflickr:Unet4M+U10+Unet4M",
+  "ADMM",
 
+  # -- reconstructions trained on measured data
+  "hf:tapecam:mirflickr:U5+Unet8M",
+  "hf:tapecam:mirflickr:TrainInv+Unet8M",
+  "hf:tapecam:mirflickr:MMCN4M+Unet4M",
+  "hf:tapecam:mirflickr:Unet4M+U5+Unet4M",
+  "hf:tapecam:mirflickr:Unet4M+TrainInv+Unet4M",
+  "hf:tapecam:mirflickr:Unet2M+MMCN+Unet2M",
+  "hf:tapecam:mirflickr:Unet4M+U10+Unet4M",
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips_rotate10",
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_aux1",
-
-    # single_channel_psf = True
-#   "hf:tapecam:mirflickr:MWDN8M",    
-#   "hf:tapecam:mirflickr:Unet2M+MWDN6M",
-
-  # # -- generalization
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips",
   # "hf:tapecam:mirflickr:Unet4M+U5+Unet4M_flips_rotate10",
+
+  # # below models need `single_channel_psf = True`
+  # "hf:tapecam:mirflickr:MWDN8M",    
+  # "hf:tapecam:mirflickr:Unet2M+MWDN6M",
+
+  # ## -- reconstructions trained on other datasets/systems
+  # "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
+  # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M",
+  # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
+  # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
+  # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_tapecam",
   # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_tapecam_post",
@@ -50,17 +56,9 @@ algorithms: [
   # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam",
   # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam_post",
   # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M_ft_tapecam_pre",
-  "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi_pre",
-  "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi",
-
-## -- reconstructions trained on other datasets/systems
-  # "hf:diffusercam:mirflickr:Unet4M+U10+Unet4M",
-  # "hf:diffusercam:mirflickr:Unet4M+U5+Unet4M",
-  # "hf:digicam:mirflickr_single_25k:Unet4M+U5+Unet4M_wave",
-  # "hf:digicam:celeba_26k:Unet4M+U5+Unet4M_wave",
-  # "hf:digicam:mirflickr_single_25k:Unet4M+U10+Unet4M_wave",
+  # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi_pre",
+  # "hf:diffusercam:mirflickr_sim:Unet4M+U5+Unet4M_ft_digicam_multi",
 ]
 
 save_idx: [1, 2, 4, 5, 9]
-n_iter_range: [100]    # for ADMM
-
+n_iter_range: [100]    # for ADM
diff --git a/configs/digicam_example.yaml b/configs/digicam_example.yaml
@@ -12,7 +12,7 @@ psf: null   # if not provided, simulate with parameters below
 mask:
   fp: null  # provide path, otherwise generate with seed
   seed: 0
-  # defaults to configuration use for this dataset: https://huggingface.co/datasets/bezzam/DigiCam-Mirflickr-SingleMask-25K
+  # defaults to configuration used for this dataset: https://huggingface.co/datasets/bezzam/DigiCam-Mirflickr-SingleMask-25K
   # ie this config: configs/collect_mirflickr_singlemask.yaml
   shape: [54, 26]
   center: [57, 77]