more uniform naming

plenoirf/debugging/__init__.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 
-def draw_event_ids_for_debug_output(
+def draw_event_ids_for_debugging(
     num_events_in_run,
     min_num_events,
     fraction_of_events,

plenoirf/production/__init__.py

@@ -27,7 +27,7 @@
 
 from . import job_io
 from . import sum_trigger
-from . import draw_event_ids_for_debug_output
+from . import draw_event_uids_for_debugging
 from . import draw_primaries_and_pointings
 from . import draw_pointing_range
 from . import corsika_and_grid
@@ -78,8 +78,8 @@ def run_job_in_dir(job, tmp_dir):
     job["prng"] = np.random.Generator(np.random.PCG64(seed=job["run_id"]))
     job["run"] = {}
 
-    with jll.TimeDelta(logger, "draw_event_ids_for_debug_output"):
-        job = draw_event_ids_for_debug_output.run_job(job=job, logger=logger)
+    with jll.TimeDelta(logger, "draw_event_uids_for_debugging"):
+        job = draw_event_uids_for_debugging.run_job(job=job, logger=logger)
 
     with jll.TimeDelta(logger, "draw_pointing_range"):
         job = draw_pointing_range.run_job(job=job, logger=logger)

plenoirf/production/corsika_and_grid.py

@@ -33,29 +33,11 @@ def run_job(job, logger):
 
         if job["cache"]:
             logger.info("corsika_and_grid, write cache")
-            _inspect(job=job)
             job_io.write(path=cache_path, job=job)
 
-    """
-    job["run"]["cherenkov_pools"] = event_tape_block_splitter(
-        inpath=job["paths"]["tmp"]["cherenkov_pools"],
-        outpath_block_fmt=job["paths"]["tmp"]["cherenkov_pools_block_fmt"],
-        num_events=job["max_num_events_in_merlict_run"],
-    )
-    """
-
     return job
 
 
-def _inspect(job, path=""):
-    for key in job:
-        if isinstance(job[key], dict):
-            _inspect(job=job[key], path=path + "/" + key)
-        else:
-            if isinstance(job[key], dynamicsizerecarray.DynamicSizeRecarray):
-                print(path + "/" + key)
-
-
 def corsika_and_grid(job, logger):
     logger.info("corsika_and_grid, start corsika")
 
@@ -219,7 +201,7 @@ def corsika_and_grid(job, logger):
                         groundgrid_debug=groundgrid_debug,
                     )
 
-                    if uid["event_id"] in job["run"]["event_ids_for_debug"]:
+                    if uid["uid"] in job["run"]["event_uids_for_debugging"]:
                         ImgTar_append(
                             imgtar=imgtar,
                             uid=uid,

plenoirf/production/draw_event_ids_for_debug_output.py → plenoirf/production/draw_event_uids_for_debugging.py

@@ -1,9 +1,10 @@
 from .. import debugging
 from .. import bookkeeping
+import numpy as np
 
 
 def run_job(job, logger):
-    event_ids_for_debugging = debugging.draw_event_ids_for_debug_output(
+    event_ids_for_debugging = debugging.draw_event_ids_for_debugging(
         num_events_in_run=job["num_events"],
         min_num_events=job["config"]["debug_output"]["run"]["min_num_events"],
         fraction_of_events=job["config"]["debug_output"]["run"][
@@ -12,17 +13,17 @@ def run_job(job, logger):
         prng=job["prng"],
     )
 
-    job["run"]["uids_for_debugging"] = []
+    job["run"]["event_uids_for_debugging"] = []
     for event_id in event_ids_for_debugging:
         uid = bookkeeping.uid.make_uid(run_id=job["run_id"], event_id=event_id)
-        job["run"]["uids_for_debugging"].append(uid)
-    job["run"]["uids_for_debugging"] = np.array(
-        job["run"]["uids_for_debugging"]
+        job["run"]["event_uids_for_debugging"].append(uid)
+    job["run"]["event_uids_for_debugging"] = np.array(
+        job["run"]["event_uids_for_debugging"]
     )
 
     logger.info(
         "event uids for debugging: {:s}.".format(
-            str(job["run"]["uids_for_debugging"].tolist())
+            str(job["run"]["event_uids_for_debugging"].tolist())
         )
     )
     return job

plenoirf/production/draw_primaries_and_pointings.py

@@ -22,7 +22,7 @@ def draw_primaries_and_pointings(
     pointing_range,
     field_of_view_half_angle_rad,
     num_events,
-    event_ids_for_debug=[],
+    event_ids_for_debugging=[],
 ):
     """
     Draw the random distribution of particles to induce showers and emitt
@@ -43,7 +43,7 @@ def draw_primaries_and_pointings(
         Instrument's field-of-view
     num_events : int
         The number of events in the run.
-    event_ids_for_debug : list, array, or set of ints
+    event_ids_for_debugging : list, array, or set of ints
         Event ids of which full debug output will be returned.
 
     Returns
@@ -114,7 +114,7 @@ def draw_primaries_and_pointings(
             min_num_cherenkov_photons=1e3,
         )
         primary_directions.append(res)
-        if event_id in event_ids_for_debug:
+        if event_id in event_ids_for_debugging:
             debug[event_id] = {"result": res, "debug": dbg}
 
     i8 = np.int64
@@ -182,7 +182,9 @@ def run_job(job, logger):
                 "field_of_view_half_angle_rad"
             ],
             num_events=job["num_events"],
-            event_ids_for_debug=job["run"]["event_ids_for_debug"],
+            event_ids_for_debugging=event_uids_to_event_ids(
+                event_uids=job["run"]["event_uids_for_debugging"]
+            ),
         )
         job["run"].update(drw)
         logger.info("draw_primaries_and_pointings, export debug info")
@@ -199,14 +201,22 @@ def run_job(job, logger):
     return job
 
 
+def event_uids_to_event_ids(event_uids):
+    out = []
+    for event_uid in event_uids:
+        _run_id, event_id = bookkeeping.uid.split_uid(uid=event_uid)
+        out.append(event_id)
+    return np.array(out)
+
+
 def write_draw_primaries_and_pointings_debug(
     path,
     run_id,
     debug,
 ):
-    event_ids_for_debug = sorted(list(debug.keys()))
+    event_ids_for_debugging = sorted(list(debug.keys()))
     with tarfile.open(path, "w") as tarout:
-        for event_id in event_ids_for_debug:
+        for event_id in event_ids_for_debugging:
             uid_str = bookkeeping.uid.make_uid_str(
                 run_id=run_id, event_id=event_id
             )

plenoirf/production/simulate_hardware.py

@@ -63,7 +63,6 @@ def simulate_hardware(job, block_id):
 
 def make_debug_output(job, block_id):
     uids_in_block = job["run"]["uids_in_cherenkov_pool_blocks"][str(block_id)]
-    for event_id in job["run"]["event_ids_for_debug"]:
-        uid = bookkeeping.uid.make_uid(run_id=job["run_id"], event_id=event_id)
-        if uid in uids_in_block:
-            print("Do some debug I guess?", uid, block_id)
+    for event_uid in job["run"]["event_uids_for_debugging"]:
+        if event_uid in uids_in_block:
+            print("Do some debug I guess?", event_uid, block_id)