Can't combine correcting chip hit edges, and parse clusters

lib/config.py

@@ -129,7 +129,10 @@ def parse_config(argv=None):
         parser.error('Parsing clusters (-C) is required when parsing events (-E)')
 
     if settings.freq_tot and settings.hits_combine_chips:
-         parser.error('When building --freq_tot you cannot combine chips to one matrix first. Set --hits_combine_chips to 0.')
+        parser.error('When building --freq_tot you cannot combine chips to one matrix first. Set --hits_combine_chips to 0.')
+
+    if settings.hits_correct_chip_edges and settings.C:
+        parser.error("Cannot combine correcting for hit chip edges and parsing clusters at the same time.")
 
     return settings
 

orchestration/worker.py

@@ -48,13 +48,7 @@ def run(self):
             }
 
             if self.settings.store_hits:
-                # We need to pass the uncorrected hits to cluster finding. So create copy of hits
-                if self.settings.hits_correct_chip_edges:
-                    hits_corrected = hits.copy()
-                    hits_corrected = tpx3format.correct_chip_edge_hits(hits_corrected)
-                    output['hits'] = hits_corrected
-                else:
-                    output['hits'] = hits
+                output['hits'] = hits
 
             if self.settings.C:
                 cl, cl_info = self.parse_hits(hits)

tpx3HitParser.py

@@ -74,6 +74,7 @@ def main():
 
     # ToA sorting for hits and events
     if settings.hits_sort_toa:
+        # TODO: Handle hits data not being present
         logger.info('Start sorting hits data on ToA...')
         hits = io.read_hits(settings.output)
         hits = numpy.sort(hits, 0, 'stable', 'ToA')
@@ -83,6 +84,7 @@ def main():
         logger.info('Finished sorting hits data on ToA.')
 
     if settings.event_sort_toa:
+        # TODO: Handle events data not being present
         logger.info('Start sorting event data on ToA...')
         events = io.read_events(settings.output)
         events = numpy.sort(events, 0, 'stable', 'ToA')

tpx3format/read.py

@@ -357,6 +357,9 @@ def parse_data_packages(positions, f, tot_correction, settings):
     if settings.hits_combine_chips:
         combine_chips(hits, settings.hits_cross_extra_offset)
 
+    if settings.hits_correct_chip_edges:
+        correct_chip_edge_hits(hits)
+
     hits = np.sort(hits, 0, 'stable', 'ToA')
 
     return hits, min_toa, max_toa