Get rid of VALIDATE_HACK

DUNE · Feb 5, 2025 · 5cc0580 · 5cc0580
1 parent 29b39d6
commit 5cc0580
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 25 deletions.
diff --git a/src/proto_nd_flow/reco/charge/raw_event_builder.py b/src/proto_nd_flow/reco/charge/raw_event_builder.py
@@ -424,15 +424,14 @@ def __init__(self, **params):
         self.build_off_beam_events = params.get('build_off_beam_events', self.default_build_off_beam_events)
         self.off_beam_window = params.get('off_beam_window', self.default_off_beam_window)
         self.off_beam_threshold = params.get('off_beam_threshold', self.default_off_beam_threshold)
-        self.VALIDATE_HACK = params.get('VALIDATE_HACK', False)
         self.shifted_event_dt = params.get('shifted_event_dt', self.default_shifted_event_dt)
 
         self.event_buffer = np.empty((0,))  
         self.event_buffer_unix_ts = np.empty((0,), dtype='u8')
         self.event_buffer_mc_assn = np.empty((0,))
         self.prepend_count = 0  
         self.last_beam_trigger_idx = None
-         
+
     def get_config(self):
         return dict(
             window=self.window,
@@ -469,20 +468,12 @@ def build_events(self, packets, unix_ts, mc_assn=None):
             trig_mask &= packets['io_group'] == self.trig_io_grp
         beam_trigger_idxs = np.where(trig_mask)[0]
 
-        if self.VALIDATE_HACK:
-            n_orig = len(beam_trigger_idxs)
-            beam_trigger_idxs = beam_trigger_idxs[::3]
-            print('\n*****************\nValidation HACK! Ommiting beam some triggers:')
-            print('Total beam triggers:', len(beam_trigger_idxs))
-            print('Total off-beam:', n_orig-len(beam_trigger_idxs))
-            print('\n*****************\n')
-
         events = []
         event_unix_ts = []
         event_mc_assn = [] if mc_assn is not None else None
 
         start_times = []
-        
+
         # Mask to keep track of packets associated to beam events
         # Only used if off-beam events are built later with unused packets
         used_mask = np.zeros( len(unix_ts) ) < -1
@@ -506,7 +497,6 @@ def build_events(self, packets, unix_ts, mc_assn=None):
                 else zip(*[v for v in zip(events, event_unix_ts, event_mc_assn)])
 
         # build off beam events using SymmetricRawEventBuilder
-        if self.VALIDATE_HACK: print('USING OFF BEAM BUILDER!!')
         off_beam_config = {'window' : self.off_beam_window,
                            'threshold' : self.off_beam_threshold,
                            'rollover_ticks' : self.rollover_ticks
@@ -523,15 +513,8 @@ def build_events(self, packets, unix_ts, mc_assn=None):
             if mc_assn is not None:
                 off_beam_event_mc_assn = list(off_beam_events_list[2])
 
-        if self.VALIDATE_HACK:
-            print('N Beam events found:', len(events))
-            print('N Off beam events:', len(off_beam_events))
-
         full_events = events + off_beam_events
 
-        if self.VALIDATE_HACK:
-            print('Total events returning:', len(full_events))
-
         full_event_unix_ts = event_unix_ts + off_beam_event_unix_ts
         if not mc_assn is None: full_event_mc_assn = event_mc_assn + off_beam_event_mc_assn
 

diff --git a/yamls/fsd_flow/reco/charge/RawEventGenerator.yaml b/yamls/fsd_flow/reco/charge/RawEventGenerator.yaml
@@ -17,4 +17,3 @@ params:
     trig_io_grp: 4
     rollover_ticks: 10000000 # PPS = 1e7 ticks
     build_off_beam_events : True
-    VALIDATE_HACK : False
diff --git a/yamls/module1_flow/reco/charge/RawEventGenerator.yaml b/yamls/module1_flow/reco/charge/RawEventGenerator.yaml
@@ -16,4 +16,3 @@ params:
     window: 2000 # ExtTrigRawEventBuilder - 2000, more than one drift for 500V/cm
     rollover_ticks: 10000000 # PPS = 1e7 ticks
     build_off_beam_events : True
-    VALIDATE_HACK : False
diff --git a/yamls/module2_flow/reco/charge/RawEventGenerator.yaml b/yamls/module2_flow/reco/charge/RawEventGenerator.yaml
@@ -16,4 +16,3 @@ params:
     window: 2000 # ExtTrigRawEventBuilder - 2000, more than one drift for 500V/cm
     rollover_ticks: 10000000 # PPS = 1e7 ticks
     build_off_beam_events : True
-    VALIDATE_HACK : False
diff --git a/yamls/ndlar_flow/reco/charge/RawEventGenerator.yaml b/yamls/ndlar_flow/reco/charge/RawEventGenerator.yaml
@@ -17,4 +17,3 @@ params:
     trig_io_grp: 1
     rollover_ticks: 10000000 # PPS = 1e7 ticks
     build_off_beam_events : False
-    VALIDATE_HACK : False
diff --git a/yamls/proto_nd_flow/reco/charge/RawEventGeneratorData.yaml b/yamls/proto_nd_flow/reco/charge/RawEventGeneratorData.yaml
@@ -17,5 +17,4 @@ params:
     trig_io_grp: -1
     rollover_ticks: 10000000 # PPS = 1e7 ticks
     build_off_beam_events : True
-    VALIDATE_HACK : False
     shifted_event_dt : -70
diff --git a/yamls/proto_nd_flow/reco/charge/RawEventGeneratorMC.yaml b/yamls/proto_nd_flow/reco/charge/RawEventGeneratorMC.yaml
@@ -17,4 +17,3 @@ params:
     trig_io_grp: 1
     rollover_ticks: 10000000 # PPS = 1e7 ticks
     build_off_beam_events : True
-    VALIDATE_HACK : False