diff --git a/yamls/fsd_flow/reco/charge/CalibHitBuilderMC.yaml b/yamls/fsd_flow/reco/charge/CalibHitBuilderMC.yaml
index 76be23bc..0f53877e 100644
--- a/yamls/fsd_flow/reco/charge/CalibHitBuilderMC.yaml
+++ b/yamls/fsd_flow/reco/charge/CalibHitBuilderMC.yaml
@@ -21,6 +21,7 @@ params:
   raw_hits_dset_name: 'charge/raw_hits'
   t0_dset_name: 'combined/t0'
   max_contrib_segments: 10
+  hit_ref: True
 
   # output
   calib_hits_dset_name: 'charge/calib_prompt_hits'
diff --git a/yamls/fsd_flow/reco/light/FlashFinder.yaml b/yamls/fsd_flow/reco/light/FlashFinder.yaml
index be434e34..7c2f51b8 100644
--- a/yamls/fsd_flow/reco/light/FlashFinder.yaml
+++ b/yamls/fsd_flow/reco/light/FlashFinder.yaml
@@ -12,7 +12,7 @@ params:
   
   eps: 10
   min_samples: 1  # >1 not supported in current implemenation
-  nchantpc: 48
+  nchantpc: 120
 
   # output
-  flash_dset_name: 'light/flash' # new dataset to produce
\ No newline at end of file
+  flash_dset_name: 'light/flash' # new dataset to produce
diff --git a/yamls/fsd_flow/reco/light/LightADC64EventGenerator.yaml b/yamls/fsd_flow/reco/light/LightADC64EventGenerator.yaml
index 09cb95d9..fdfcffc8 100644
--- a/yamls/fsd_flow/reco/light/LightADC64EventGenerator.yaml
+++ b/yamls/fsd_flow/reco/light/LightADC64EventGenerator.yaml
@@ -6,19 +6,15 @@ params:
   wvfm_dset_name: 'light/wvfm'
 
   # configuration parameters
-  n_adcs: 8
+  n_adcs: 4
   n_channels: 64
   sn_table:
-   - 642823167
-   - 642874879
-   - 215553019
-   - 215563696
-   - 215537224
-   - 632779263
-   - 642504959
-   - 215564600
+   - 242569454
+   - 215039446
+   - 215564617
+   - 242569445
   sync_channel: 0
   sync_threshold: 40000
   batch_size: 1  #FIXME: only works with batch_size=1 at the moment (to be fixed in adc64format)
   utime_ms_window: 1000
-  tai_ns_window: 1000
+  tai_ns_window: 1000
\ No newline at end of file
diff --git a/yamls/fsd_flow/reco/light/LightEventGeneratorMC.yaml b/yamls/fsd_flow/reco/light/LightEventGeneratorMC.yaml
index aa1bad16..ce34c057 100644
--- a/yamls/fsd_flow/reco/light/LightEventGeneratorMC.yaml
+++ b/yamls/fsd_flow/reco/light/LightEventGeneratorMC.yaml
@@ -6,81 +6,61 @@ params:
   wvfm_dset_name: 'light/wvfm'
 
   # configuration parameters
-  n_modules: 4
-  n_adcs: 8
+  n_modules: 1
+  n_adcs: 4
   n_channels: 64
-  n_sipms_per_module: 96
+  n_sipms_per_module: 240
   adc_sn:
    - 0
    - 1
    - 2
    - 3
-   - 4
-   - 5
-   - 6
-   - 7
   channel_map:
-   - [-1, -1, -1, -1,  
-        23,  22,  21,  20,  19,  18, 11, 10, 9, 8, 7, 6, 
-        -1, -1, -1, -1, 
-        47, 46, 45, 44, 43, 42, 35, 34, 33, 32, 31, 30, 
-        -1, -1,-1, -1, 
-        71, 70, 69, 68, 67, 66, 59, 58, 57, 56, 55, 54, 
-        -1, -1, -1, -1, 
-        95, 94, 93, 92, 91, 90, 83, 82, 81, 80, 79, 78]
-   - [-1, -1, -1, -1,  
-        17,  16,  15,  14, 13, 12, 5, 4, 3, 2, 1, 0, 
-        -1, -1, -1, -1, 
-        41, 40, 39, 38, 37, 36, 29, 28, 27, 26, 25, 24, 
-        -1, -1, -1, -1, 
-        65, 64, 63, 62, 61, 60, 53, 52, 51, 50, 49, 48, 
-        -1, -1, -1, -1, 
-        89, 88, 87, 86, 85, 84, 77, 76, 75, 74, 73, 72]
-   - [-1, -1, -1, -1, 
-        119, 118, 117, 116, 115, 114, 107, 106, 105, 104, 103, 102, 
-        -1, -1, -1, -1, 
-        143, 142, 141, 140, 139, 138, 131, 130, 129, 128, 127, 126, 
-        -1, -1, -1, -1, 
-        167, 166, 165, 164, 163, 162, 155, 154, 153, 152, 151, 150, 
-        -1, -1, -1, -1, 
-        191, 190, 189, 188, 187, 186, 179, 178, 177, 176, 175, 174]
-   - [-1, -1, -1, -1, 
-        113, 112, 111, 110, 109, 108, 101, 100, 99, 98, 97, 96, 
-        -1, -1, -1, -1, 
-        137, 136, 135, 134, 133, 132, 125, 124, 123, 122, 121, 120, 
-        -1, -1, -1, -1, 
-        161, 160, 159, 158, 157, 156, 149, 148, 147, 146, 145, 144, 
-        -1, -1, -1, -1, 
-        185, 184, 183, 182, 181, 180, 173, 172, 171, 170, 169, 168]
-   - [-1, -1, -1, -1, 
-        215, 214, 213, 212, 211, 210, 203, 202, 201, 200, 199, 198, 
-        -1, -1, -1, -1, 
-        239, 238, 237, 236, 235, 234, 227, 226, 225, 224, 223, 222, 
-        -1, -1, -1, -1, 
-        263, 262, 261, 260, 259, 258, 251, 250, 249, 248, 247, 246, 
-        -1, -1, -1, -1, 
-        287, 286, 285, 284, 283, 282, 275, 274, 273, 272, 271, 270]
-   - [-1, -1, -1, -1, 
-        209, 208, 207, 206, 205, 204, 197, 196, 195, 194, 193, 192, 
-        -1, -1, -1, -1, 
-        233, 232, 231, 230, 229, 228, 221, 220, 219, 218, 217, 216, 
-        -1, -1, -1, -1, 
-        257, 256, 255, 254, 253, 252, 245, 244, 243, 242, 241, 240, 
-        -1, -1, -1, -1, 
-        281, 280, 279, 278, 277, 276, 269, 268, 267, 266, 265, 264]
-   - [-1, -1, -1, -1, 
-        311, 310, 309, 308, 307, 306, 299, 298, 297, 296, 295, 294, 
-        -1, -1, -1, -1, 
-        335, 334, 333, 332, 331, 330, 323, 322, 321, 320, 319, 318, 
-        -1, -1, -1, -1, 
-        359, 358, 357, 356, 355, 354, 347, 346, 345, 344, 343, 342, 
-        -1, -1, -1, -1, 
-        383, 382, 381, 380, 379, 378, 371, 370, 369, 368, 367, 366]
-   - [-1, -1, -1, -1, 
-        305, 304, 303, 302, 301, 300, 293, 292, 291, 290, 289, 288, 
-        -1, -1, -1, -1, 
-        329, 328, 327, 326, 325, 324, 317, 316, 315, 314, 313, 312, 
-        -1, -1, -1, -1, 
-        353, 352, 351, 350, 349, 348, 341, 340, 339, 338, 337, 336, 
-        -1, -1, -1, -1, 
-        377, 376, 375, 374, 373, 372, 365, 364, 363, 362, 361, 360]
+   - [119, 118, 117, 116, 115, 114, 
+       113, 112, 111, 110, 109, 108, 
+       107, 106, 105, 104, 103, 102, 
+       101, 100, 99, 98, 97, 96, 
+       95, 94, 93, 92, 91, 90, 
+       -1, -1, 
+       89, 88, 87, 86, 85, 84, 
+       83, 82, 81, 80, 79, 78, 
+       77, 76, 75, 74, 73, 72, 
+       71, 70, 69, 68, 67, 66, 
+       65, 64, 63, 62, 61, 60, 
+       -1, -1]
+   - [0, 1, 2, 3, 4, 5, 
+       6, 7, 8, 9, 10, 11, 
+       12, 13, 14, 15, 16, 17, 
+       18, 19, 20, 21, 22, 23, 
+       24, 25, 26, 27, 28, 29, 
+       -1, -1, 
+       30, 31, 32, 33, 34, 35, 
+       36, 37, 38, 39, 40, 41, 
+       42, 43, 44, 45, 46, 47, 
+       48, 49, 50, 51, 52, 53, 
+       54, 55, 56, 57, 58, 59, 
+       -1, -1]
+   - [120, 121, 122, 123, 124, 125, 
+       126, 127, 128, 129, 130, 131, 
+       132, 133, 134, 135, 136, 137, 
+       138, 139, 140, 141, 142, 143, 
+       144, 145, 146, 147, 148, 149, 
+       -1, -1, 
+       150, 151, 152, 153, 154, 155, 
+       156, 157, 158, 159, 160, 161, 
+       162, 163, 164, 165, 166, 167, 
+       168, 169, 170, 171, 172, 173, 
+       174, 175, 176, 177, 178, 179, 
+       -1, -1]
+   - [239, 238, 237, 236, 235, 234, 
+       233, 232, 231, 230, 229, 228, 
+       227, 226, 225, 224, 223, 222, 
+       221, 220, 219, 218, 217, 216, 
+       215, 214, 213, 212, 211, 210, 
+       -1, -1, 
+       209, 208, 207, 206, 205, 204, 
+       203, 202, 201, 200, 199, 198, 
+       197, 196, 195, 194, 193, 192, 
+       191, 190, 189, 188, 187, 186, 
+       185, 184, 183, 182, 181, 180, 
+       -1, -1]
diff --git a/yamls/fsd_flow/reco/light/WaveformAlign.yaml b/yamls/fsd_flow/reco/light/WaveformAlign.yaml
index ceba442f..a5d84d3c 100644
--- a/yamls/fsd_flow/reco/light/WaveformAlign.yaml
+++ b/yamls/fsd_flow/reco/light/WaveformAlign.yaml
@@ -1,7 +1,7 @@
 classname: WaveformAlign
 path: proto_nd_flow.reco.light.wvfm_align
 requires:
-    - 'light/deconv'
+    - 'light/fwvfm'
 params:
-    wvfm_dset_name: 'light/deconv'
+    wvfm_dset_name: 'light/fwvfm'
     sim_latency: 100
diff --git a/yamls/fsd_flow/reco/light/WaveformCalib.yaml b/yamls/fsd_flow/reco/light/WaveformCalib.yaml
index 798c0612..47fb308c 100644
--- a/yamls/fsd_flow/reco/light/WaveformCalib.yaml
+++ b/yamls/fsd_flow/reco/light/WaveformCalib.yaml
@@ -2,11 +2,11 @@ classname: WaveformCalib
 path: proto_nd_flow.reco.light.wvfm_calib
 requires:
   - 'light/events'
-  - 'light/deconv'
-  - 'light/deconv/alignment'
+  - 'light/fwvfm'
+  - 'light/fwvfm/alignment'
 params:
   # input
-  wvfm_dset_name: 'light/deconv'
+  wvfm_dset_name: 'light/fwvfm'
 
   # output
   cwvfm_dset_name: 'light/cwvfm'
@@ -42,23 +42,3 @@ params:
         20 : 0.022857, 21 : 0.022857, 22 : 0.022857, 23 : 0.022857, 24 : 0.022857, 25 : 0.022857, 26 : 0.022857, 27 : 0.022857, 28 : 0.022857, 29 : 0.022857, 30 : 0.022857, 31 : 0.022857,
         36 : 0.022857, 37 : 0.022857, 38 : 0.022857, 39 : 0.022857, 40 : 0.022857, 41 : 0.022857, 42 : 0.022857, 43 : 0.022857, 44 : 0.022857, 45 : 0.022857, 46 : 0.022857, 47 : 0.022857, 
         52 : 0.022857, 53 : 0.022857, 54 : 0.022857, 55 : 0.022857, 56 : 0.022857, 57 : 0.022857, 58 : 0.022857, 59 : 0.022857, 60 : 0.022857, 61 : 0.022857, 62 : 0.022857, 63 : 0.022857}
-
-    4: {4 : 0.022857, 5 : 0.022857, 6 : 0.022857, 7 : 0.022857, 8 : 0.022857, 9 : 0.022857, 10 : 0.022857, 11 : 0.022857, 12 : 0.022857, 13 : 0.022857, 14 : 0.022857, 15 : 0.022857,
-        20 : 0.022857, 21 : 0.022857, 22 : 0.022857, 23 : 0.022857, 24 : 0.022857, 25 : 0.022857, 26 : 0.022857, 27 : 0.022857, 28 : 0.022857, 29 : 0.022857, 30 : 0.022857, 31 : 0.022857,
-        36 : 0.022857, 37 : 0.022857, 38 : 0.022857, 39 : 0.022857, 40 : 0.022857, 41 : 0.022857, 42 : 0.022857, 43 : 0.022857, 44 : 0.022857, 45 : 0.022857, 46 : 0.022857, 47 : 0.022857, 
-        52 : 0.022857, 53 : 0.022857, 54 : 0.022857, 55 : 0.022857, 56 : 0.022857, 57 : 0.022857, 58 : 0.022857, 59 : 0.022857, 60 : 0.022857, 61 : 0.022857, 62 : 0.022857, 63 : 0.022857}
-
-    5: {4 : 0.022857, 5 : 0.022857, 6 : 0.022857, 7 : 0.022857, 8 : 0.022857, 9 : 0.022857, 10 : 0.022857, 11 : 0.022857, 12 : 0.022857, 13 : 0.022857, 14 : 0.022857, 15 : 0.022857,
-        20 : 0.022857, 21 : 0.022857, 22 : 0.022857, 23 : 0.022857, 24 : 0.022857, 25 : 0.022857, 26 : 0.022857, 27 : 0.022857, 28 : 0.022857, 29 : 0.022857, 30 : 0.022857, 31 : 0.022857,
-        36 : 0.022857, 37 : 0.022857, 38 : 0.022857, 39 : 0.022857, 40 : 0.022857, 41 : 0.022857, 42 : 0.022857, 43 : 0.022857, 44 : 0.022857, 45 : 0.022857, 46 : 0.022857, 47 : 0.022857, 
-        52 : 0.022857, 53 : 0.022857, 54 : 0.022857, 55 : 0.022857, 56 : 0.022857, 57 : 0.022857, 58 : 0.022857, 59 : 0.022857, 60 : 0.022857, 61 : 0.022857, 62 : 0.022857, 63 : 0.022857}
-
-    6: {4 : 0.022857, 5 : 0.022857, 6 : 0.022857, 7 : 0.022857, 8 : 0.022857, 9 : 0.022857, 10 : 0.022857, 11 : 0.022857, 12 : 0.022857, 13 : 0.022857, 14 : 0.022857, 15 : 0.022857,
-        20 : 0.022857, 21 : 0.022857, 22 : 0.022857, 23 : 0.022857, 24 : 0.022857, 25 : 0.022857, 26 : 0.022857, 27 : 0.022857, 28 : 0.022857, 29 : 0.022857, 30 : 0.022857, 31 : 0.022857,
-        36 : 0.022857, 37 : 0.022857, 38 : 0.022857, 39 : 0.022857, 40 : 0.022857, 41 : 0.022857, 42 : 0.022857, 43 : 0.022857, 44 : 0.022857, 45 : 0.022857, 46 : 0.022857, 47 : 0.022857, 
-        52 : 0.022857, 53 : 0.022857, 54 : 0.022857, 55 : 0.022857, 56 : 0.022857, 57 : 0.022857, 58 : 0.022857, 59 : 0.022857, 60 : 0.022857, 61 : 0.022857, 62 : 0.022857, 63 : 0.022857}
-
-    7: {4 : 0.022857, 5 : 0.022857, 6 : 0.022857, 7 : 0.022857, 8 : 0.022857, 9 : 0.022857, 10 : 0.022857, 11 : 0.022857, 12 : 0.022857, 13 : 0.022857, 14 : 0.022857, 15 : 0.022857,
-        20 : 0.022857, 21 : 0.022857, 22 : 0.022857, 23 : 0.022857, 24 : 0.022857, 25 : 0.022857, 26 : 0.022857, 27 : 0.022857, 28 : 0.022857, 29 : 0.022857, 30 : 0.022857, 31 : 0.022857,
-        36 : 0.022857, 37 : 0.022857, 38 : 0.022857, 39 : 0.022857, 40 : 0.022857, 41 : 0.022857, 42 : 0.022857, 43 : 0.022857, 44 : 0.022857, 45 : 0.022857, 46 : 0.022857, 47 : 0.022857, 
-        52 : 0.022857, 53 : 0.022857, 54 : 0.022857, 55 : 0.022857, 56 : 0.022857, 57 : 0.022857, 58 : 0.022857, 59 : 0.022857, 60 : 0.022857, 61 : 0.022857, 62 : 0.022857, 63 : 0.022857}
\ No newline at end of file
diff --git a/yamls/fsd_flow/reco/light/WaveformDeconvolution.yaml b/yamls/fsd_flow/reco/light/WaveformDeconvolution.yaml
index 60694e70..4c8251a1 100644
--- a/yamls/fsd_flow/reco/light/WaveformDeconvolution.yaml
+++ b/yamls/fsd_flow/reco/light/WaveformDeconvolution.yaml
@@ -13,10 +13,10 @@ params:
   do_filtering: True
   filter_type: Wiener
   gaus_filter_width: 1
-  filter_channels: [ 4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-    20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-    36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 52, 53,
-    54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ]
+  filter_channels: [ 0, 1, 2, 3, 4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+    46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61 ]
   noise_spectrum_filename: 'data/proto_nd_flow/noise_power.npz'
   signal_spectrum_filename: 'data/proto_nd_flow/wvfm_deconv_signal_power.npz'
-  signal_impulse_filename: 'data/proto_nd_flow/wvfm_deconv_signal_impulse.fit.npz'
\ No newline at end of file
+  signal_impulse_filename: 'data/proto_nd_flow/wvfm_deconv_signal_impulse.fit.npz'
diff --git a/yamls/fsd_flow/reco/light/WaveformNoiseFilter.yaml b/yamls/fsd_flow/reco/light/WaveformNoiseFilter.yaml
index ffc6100b..a510fb68 100644
--- a/yamls/fsd_flow/reco/light/WaveformNoiseFilter.yaml
+++ b/yamls/fsd_flow/reco/light/WaveformNoiseFilter.yaml
@@ -11,10 +11,10 @@ params:
   noise_dset_name: 'light/fwvfm_noise'
 
   # configuration parameters
-  filter_channels: [ 4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-    20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-    36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 52, 53,
-    54, 55, 56, 57, 58, 59, 60, 61, 62, 63 ]
+  filter_channels: [ 0, 1, 2, 3, 4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+    46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61 ]
   filter_samples: [ 0, 80 ]
   modulo_param: 10 # template length
   keep_noise: False # flag to save extracted noise
diff --git a/yamls/fsd_flow/reco/light/sipm_threshold.yaml b/yamls/fsd_flow/reco/light/sipm_threshold.yaml
index 4fd19072..40f9d0ce 100644
--- a/yamls/fsd_flow/reco/light/sipm_threshold.yaml
+++ b/yamls/fsd_flow/reco/light/sipm_threshold.yaml
@@ -258,263 +258,3 @@
   61: 80
   62: 80
   63: 80
-4:
-  0: 80
-  1: 80
-  2: 80
-  3: 80
-  4: 80
-  5: 80
-  6: 80
-  7: 80
-  8: 80
-  9: 80
-  10: 80
-  11: 80
-  12: 80
-  13: 80
-  14: 80
-  15: 80
-  16: 80
-  17: 80
-  18: 80
-  19: 80
-  20: 80
-  21: 80
-  22: 80
-  23: 80
-  24: 80
-  25: 80
-  26: 80
-  27: 80
-  28: 80
-  29: 80
-  30: 80
-  31: 80
-  32: 80
-  33: 80
-  34: 80
-  35: 80
-  36: 80
-  37: 80
-  38: 80
-  39: 80
-  40: 80
-  41: 80
-  42: 80
-  43: 80
-  44: 80
-  45: 80
-  46: 80
-  47: 80
-  48: 80
-  49: 80
-  50: 80
-  51: 80
-  52: 80
-  53: 80
-  54: 80
-  55: 80
-  56: 80
-  57: 80
-  58: 80
-  59: 80
-  60: 80
-  61: 80
-  62: 80
-  63: 80
-5:
-  0: 80
-  1: 80
-  2: 80
-  3: 80
-  4: 80
-  5: 80
-  6: 80
-  7: 80
-  8: 80
-  9: 80
-  10: 80
-  11: 80
-  12: 80
-  13: 80
-  14: 80
-  15: 80
-  16: 80
-  17: 80
-  18: 80
-  19: 80
-  20: 80
-  21: 80
-  22: 80
-  23: 80
-  24: 80
-  25: 80
-  26: 80
-  27: 80
-  28: 80
-  29: 80
-  30: 80
-  31: 80
-  32: 80
-  33: 80
-  34: 80
-  35: 80
-  36: 80
-  37: 80
-  38: 80
-  39: 80
-  40: 80
-  41: 80
-  42: 80
-  43: 80
-  44: 80
-  45: 80
-  46: 80
-  47: 80
-  48: 80
-  49: 80
-  50: 80
-  51: 80
-  52: 80
-  53: 80
-  54: 80
-  55: 80
-  56: 80
-  57: 80
-  58: 80
-  59: 80
-  60: 80
-  61: 80
-  62: 80
-  63: 80
-6:
-  0: 80
-  1: 80
-  2: 80
-  3: 80
-  4: 80
-  5: 80
-  6: 80
-  7: 80
-  8: 80
-  9: 80
-  10: 80
-  11: 80
-  12: 80
-  13: 80
-  14: 80
-  15: 80
-  16: 80
-  17: 80
-  18: 80
-  19: 80
-  20: 80
-  21: 80
-  22: 80
-  23: 80
-  24: 80
-  25: 80
-  26: 80
-  27: 80
-  28: 80
-  29: 80
-  30: 80
-  31: 80
-  32: 80
-  33: 80
-  34: 80
-  35: 80
-  36: 80
-  37: 80
-  38: 80
-  39: 80
-  40: 80
-  41: 80
-  42: 80
-  43: 80
-  44: 80
-  45: 80
-  46: 80
-  47: 80
-  48: 80
-  49: 80
-  50: 80
-  51: 80
-  52: 80
-  53: 80
-  54: 80
-  55: 80
-  56: 80
-  57: 80
-  58: 80
-  59: 80
-  60: 80
-  61: 80
-  62: 80
-  63: 80
-7:
-  0: 80
-  1: 80
-  2: 80
-  3: 80
-  4: 80
-  5: 80
-  6: 80
-  7: 80
-  8: 80
-  9: 80
-  10: 80
-  11: 80
-  12: 80
-  13: 80
-  14: 80
-  15: 80
-  16: 80
-  17: 80
-  18: 80
-  19: 80
-  20: 80
-  21: 80
-  22: 80
-  23: 80
-  24: 80
-  25: 80
-  26: 80
-  27: 80
-  28: 80
-  29: 80
-  30: 80
-  31: 80
-  32: 80
-  33: 80
-  34: 80
-  35: 80
-  36: 80
-  37: 80
-  38: 80
-  39: 80
-  40: 80
-  41: 80
-  42: 80
-  43: 80
-  44: 80
-  45: 80
-  46: 80
-  47: 80
-  48: 80
-  49: 80
-  50: 80
-  51: 80
-  52: 80
-  53: 80
-  54: 80
-  55: 80
-  56: 80
-  57: 80
-  58: 80
-  59: 80
-  60: 80
-  61: 80
-  62: 80
-  63: 80
\ No newline at end of file
diff --git a/yamls/fsd_flow/workflows/charge/charge_event_building_mc.yaml b/yamls/fsd_flow/workflows/charge/charge_event_building_mc.yaml
index ec332aaf..7de84e59 100644
--- a/yamls/fsd_flow/workflows/charge/charge_event_building_mc.yaml
+++ b/yamls/fsd_flow/workflows/charge/charge_event_building_mc.yaml
@@ -9,6 +9,7 @@ flow:
 
 resources:
   - !include yamls/fsd_flow/resources/RunDataMC.yaml
+  - !include yamls/fsd_flow/resources/GeometryMC.yaml
 
 
 raw_event_generator: # groups time-sorted data packets from larpix datalog files
diff --git a/yamls/fsd_flow/workflows/light/light_event_reconstruction_mc.yaml b/yamls/fsd_flow/workflows/light/light_event_reconstruction_mc.yaml
index 3f870bb4..a1c2757e 100644
--- a/yamls/fsd_flow/workflows/light/light_event_reconstruction_mc.yaml
+++ b/yamls/fsd_flow/workflows/light/light_event_reconstruction_mc.yaml
@@ -3,7 +3,7 @@
 
 flow:
   source: 'light/events'
-  stages: [timestamp_corrector, wvfm_filt, wvfm_deconv, wvfm_align, wvfm_calib, wvfm_sum, sipm_hit_finder, sum_hit_finder, flash_finder]
+  stages: [timestamp_corrector, wvfm_filt, wvfm_align, wvfm_calib, wvfm_sum, sipm_hit_finder, sum_hit_finder, flash_finder]
 
   # remove waveforms from output file
   drop: ['light/fwvfm', 'light/deconv', 'light/swvfm', 'light/cwvfm']