Merge pull request #184 from DUNE/feature_light_memory

merge light wvfm mc assn in the output

Author: YifanC

larndsim/detector_properties/2x2.yaml

@@ -61,5 +61,5 @@ light_window: [0, 16] # us
 light_trig_window: [1.6, 14.4] # us
 light_digit_sample_spacing: 0.016 # us
 light_nbit: 14
-max_light_truth_ids: 3 # set to zero to disable light truth backtracking
+max_light_truth_ids: 0 # set to zero to disable light truth backtracking
 mc_truth_threshold: 1 # pe/us

larndsim/detector_properties/2x2_mod2mod_variation.yaml

@@ -61,5 +61,5 @@ light_window: [0, 16] # us
 light_trig_window: [1.6, 14.4] # us
 light_digit_sample_spacing: 0.016 # us
 light_nbit: 14
-max_light_truth_ids: 3 # set to zero to disable light truth backtracking
+max_light_truth_ids: 0 # set to zero to disable light truth backtracking
 mc_truth_threshold: 1 # pe/us

larndsim/detector_properties/2x2_non_beam.yaml

@@ -61,5 +61,5 @@ light_window: [0, 16] # us
 light_trig_window: [1.6, 14.4] # us
 light_digit_sample_spacing: 0.016 # us
 light_nbit: 14
-max_light_truth_ids: 3 # set to zero to disable light truth backtracking
+max_light_truth_ids: 0 # set to zero to disable light truth backtracking
 mc_truth_threshold: 1 # pe/us

larndsim/light_sim.py

@@ -736,10 +736,19 @@ def merge_module_light_wvfm_same_trigger(output_filename):
         for i_, i_mod in enumerate(detector.MOD_IDS):
             if i_ == 0:  
                 merged_wvfm = f[f'light_wvfm/light_wvfm_mod{i_mod-1}']
+                if 'light_wvfm_mc_assn' in f.keys():
+                    merged_wvfm_mc_assn = f[f'light_wvfm_mc_assn/light_wvfm_mc_assn_mod{i_mod-1}']
             else:
                 mod_wvfm = f[f'light_wvfm/light_wvfm_mod{i_mod-1}']
                 if mod_wvfm.shape[0] != merged_wvfm.shape[0]:
-                    raise ValueError("The number of triggers should be the same in each module with light trigger mode 1.")
+                    raise ValueError("The number of triggers should be the same in each module with light trigger mode 1 (light waveform).")
+                if 'light_wvfm_mc_assn' in f.keys():
+                    mod_wvfm_mc_assn = f[f'light_wvfm_mc_assn/light_wvfm_mc_assn_mod{i_mod-1}']
+                    if mod_wvfm_mc_assn.shape[0] != merged_wvfm_mc_assn.shape[0]:
+                        raise ValueError("The number of triggers should be the same in each module with light trigger mode 1 (light waveform mc assn).")
                 merged_wvfm = np.append(merged_wvfm, mod_wvfm, axis=1)
+                merged_wvfm_mc_assn = np.append(merged_wvfm_mc_assn, mod_wvfm_mc_assn, axis=1)
         del f['light_wvfm']
+        del f['light_wvfm_mc_assn']
         f.create_dataset(f'light_wvfm', data=merged_wvfm, maxshape=(None,None,None))
+        f.create_dataset(f'light_wvfm_mc_assn', data=merged_wvfm_mc_assn, maxshape=(None,None,None))