Support several NectarCAM cameras

notebooks/tool_implementation/tuto_photostat.py

@@ -74,6 +74,7 @@
     progress_bar=True,
     run_number=FF_run_number,
     Ped_run_number=Ped_run_number,
+    camera="NectarCAMQM",
     SPE_result=path[0],
     method="LocalPeakWindowSum",
     extractor_kwargs={"window_width": 12, "window_shift": 4},

src/nectarchain/data/management.py

@@ -53,7 +53,7 @@ def findrun(
         """
         basepath = f"{os.environ['NECTARCAMDATA']}/runs/"
         list = glob.glob(
-            basepath + "**/*" + str(run_number) + "*.fits.fz", recursive=True
+            basepath + "**/*" + str(run_number).zfill(4) + "*.fits.fz", recursive=True
         )
         list_path = [Path(chemin) for chemin in list]
         if len(list_path) == 0:
@@ -188,7 +188,7 @@ def __get_GRID_location_DIRAC(
             catalog = DCatalog()
             with redirect_stdout(sys.stdout):
                 fccli = FileCatalogClientCLI(catalog.catalog)
-                sys.stdout = StdoutRecord(keyword=f"Run{run_number}")
+                sys.stdout = StdoutRecord(keyword=f"Run{str(run_number).zfill(4)}")
                 fccli.do_find("-q " + basepath)
                 lfns = sys.stdout.output
                 sys.stdout = sys.__stdout__

src/nectarchain/makers/calibration/gain/photostat_makers.py

@@ -82,12 +82,12 @@ def _load_eventsource(self, FF_run=True):
         if FF_run:
             self.log.debug("loading FF event source")
             self.event_source = self.enter_context(
-                self.load_run(self.run_number, self.max_events)
+                self.load_run(self.run_number, self.max_events, camera=self.camera)
             )
         else:
             self.log.debug("loading Ped event source")
             self.event_source = self.enter_context(
-                self.load_run(self.Ped_run_number, self.max_events)
+                self.load_run(self.Ped_run_number, self.max_events, camera=self.camera)
             )
 
     def start(

src/nectarchain/makers/core.py

@@ -13,6 +13,8 @@
     ComponentNameList,
     Integer,
     Path,
+    TraitError,
+    Unicode,
     classes_with_traits,
     flag,
 )
@@ -70,7 +72,10 @@ def _default_log_file(self):
 
     @staticmethod
     def load_run(
-        run_number: int, max_events: int = None, run_file: str = None
+        run_number: int,
+        max_events: int = None,
+        run_file: str = None,
+        camera: int = "NectarCAMQM",
     ) -> LightNectarCAMEventSource:
         """Static method to load from $NECTARCAMDATA directory data for specified run
         with max_events.
@@ -83,6 +88,8 @@ def load_run(
             max of events to be loaded. Defaults to -1, to load everything.
         run_file : optional
             if provided, will load this run file
+        camera : str
+            camera for which data are processed. (Default: NectarCAMQM)
 
         Returns
         -------
@@ -91,7 +98,7 @@ def load_run(
         """
         # Load the data from the run file.
         if run_file is None:
-            generic_filename, _ = DataManagement.findrun(run_number)
+            generic_filename, _ = DataManagement.findrun(run_number, camera=camera)
             log.info(f"{str(generic_filename)} will be loaded")
             eventsource = LightNectarCAMEventSource(
                 input_url=generic_filename, max_events=max_events
@@ -110,6 +117,7 @@ class EventsLoopNectarCAMCalibrationTool(BaseNectarCAMCalibrationTool):
 
     Args:
         run_number (int): The ID of the run to be processed.
+        camera (str): The NectarCAM camera for which data should be processed.
         max_events (int, optional): The maximum number of events to be loaded.
         Defaults to None.
         run_file (optional): The specific run file to be loaded.
@@ -131,6 +139,7 @@ class EventsLoopNectarCAMCalibrationTool(BaseNectarCAMCalibrationTool):
     aliases = {
         ("i", "input"): "EventsLoopNectarCAMCalibrationTool.run_file",
         ("r", "run-number"): "EventsLoopNectarCAMCalibrationTool.run_number",
+        ("c", "camera"): "EventsLoopNectarCAMCalibrationTool.camera",
         ("m", "max-events"): "EventsLoopNectarCAMCalibrationTool.max_events",
         ("o", "output"): "EventsLoopNectarCAMCalibrationTool.output_path",
         "events-per-slice": "EventsLoopNectarCAMCalibrationTool.events_per_slice",
@@ -161,6 +170,13 @@ class EventsLoopNectarCAMCalibrationTool(BaseNectarCAMCalibrationTool):
         config=True
     )
 
+    camera = Unicode(
+        help="camera for which the data will be processed",
+        default_value="NectarCAMQM",
+        allow_none=False,
+        read_only=True,
+    ).tag(config=True)
+
     output_path = Path(
         help="output filename",
         default_value=pathlib.Path(
@@ -218,6 +234,14 @@ def __new__(cls, *args, **kwargs):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+
+        prefix = "NectarCAM"
+        cameras = [f"{prefix}" + "QM"]
+        cameras.extend([f"{prefix + str(i)}" for i in range(2, 10)])
+
+        if self.camera not in cameras and self.run_file is None:
+            raise TraitError(f"The camera field should be one of {cameras}.")
+
         if not ("output_path" in kwargs.keys()):
             self._init_output_path()
 

src/nectarchain/user_scripts/ggrolleron/gain_PhotoStat_computation.py

@@ -11,6 +11,10 @@
 from nectarchain.makers.calibration import PhotoStatisticNectarCAMCalibrationTool
 from nectarchain.makers.extractor.utils import CtapipeExtractor
 
+prefix = "NectarCAM"
+cameras = [f"{prefix}" + "QM"]
+cameras.extend([f"{prefix + str(i)}" for i in range(2, 10)])
+
 parser = argparse.ArgumentParser(
     prog="gain_SPEfit_computation.py",
     description=f"compute high and low gain with the Photo-statistic\
@@ -24,6 +28,16 @@
     "--Ped_run_number", nargs="+", default=[], help="run(s) list", type=int
 )
 
+parser.add_argument(
+    "-c",
+    "--camera",
+    choices=cameras,
+    default=[camera for camera in cameras if "QM" in camera][0],
+    help="""Process data for a specific NectarCAM camera.
+Default: NectarCAMQM (Qualification Model).""",
+    type=str,
+)
+
 # max events to be loaded
 parser.add_argument(
     "-m",
@@ -170,6 +184,7 @@ def main(
                 progress_bar=True,
                 run_number=_FF_run_number,
                 max_events=_max_events,
+                camera=args.camera,
                 Ped_run_number=_Ped_run_number,
                 SPE_result=path[0],
                 **kwargs,

src/nectarchain/user_scripts/ggrolleron/gain_PhotoStat_computation.sh

@@ -1,4 +1,4 @@
 #HOW TO :
 #to perform photo-statistic high and low gain computation with pedestal run 2609, flat field run 2609 and SPE fit result from run 2634 (1400V run)
-python gain_PhotoStat_computation.py --FF_run_number 3937 --Ped_run_number 3938 --SPE_run_number 3942 --SPE_config HHVfixed --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v INFO --reload_events
+python gain_PhotoStat_computation.py --camera="NectarCAMQM" --FF_run_number 3937 --Ped_run_number 3938 --SPE_run_number 3942 --SPE_config HHVfixed --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v INFO --reload_events
 

src/nectarchain/user_scripts/ggrolleron/gain_SPEfit_combined_computation.py

@@ -14,6 +14,10 @@
 )
 from nectarchain.makers.extractor.utils import CtapipeExtractor
 
+prefix = "NectarCAM"
+cameras = [f"{prefix}" + "QM"]
+cameras.extend([f"{prefix + str(i)}" for i in range(2, 10)])
+
 parser = argparse.ArgumentParser(
     prog="gain_SPEfit_combined_computation.py",
     description=f"compute high gain with SPE fit for one run at nominal voltage from a SPE result from a run at 1400V. By default, output data are saved in $NECTARCAMDATA/../SPEfit/data/",
@@ -23,6 +27,16 @@
     "-r", "--run_number", nargs="+", default=[], help="run(s) list", type=int
 )
 
+parser.add_argument(
+    "-c",
+    "--camera",
+    choices=cameras,
+    default=[camera for camera in cameras if "QM" in camera][0],
+    help="""Process data for a specific NectarCAM camera.
+Default: NectarCAMQM (Qualification Model).""",
+    type=str,
+)
+
 # max events to be loaded
 parser.add_argument(
     "-m",
@@ -171,6 +185,7 @@ def main(
             tool = FlatFieldSPECombinedStdNectarCAMCalibrationTool(
                 progress_bar=True,
                 run_number=_run_number,
+                camera=args.camera,
                 max_events=_max_events,
                 SPE_result=path[0],
                 **kwargs,

src/nectarchain/user_scripts/ggrolleron/gain_SPEfit_combined_computation.sh

@@ -1,4 +1,4 @@
 #HOW TO : 
 
 #to perform SPE fit of run 3936 (supposed to be taken at nominal voltage) from SPE fit performed on 3942 (taken at 1400V) (luminosity can not be supposed the same)
-python gain_SPEfit_combined_computation.py -r 3936 --HHV_run_number 3942 --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG --reload_events
+python gain_SPEfit_combined_computation.py --camera="NectarCAMQM" -r 3936 --HHV_run_number 3942 --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG --reload_events

src/nectarchain/user_scripts/ggrolleron/gain_SPEfit_computation.py

@@ -15,6 +15,10 @@
 )
 from nectarchain.makers.extractor.utils import CtapipeExtractor
 
+prefix = "NectarCAM"
+cameras = [f"{prefix}" + "QM"]
+cameras.extend([f"{prefix + str(i)}" for i in range(2, 10)])
+
 parser = argparse.ArgumentParser(
     prog="gain_SPEfit_computation.py",
     description=f"compute high gain with SPE fit for one run at very very high voltage (~1400V) or at nominal voltage (it can often fail). By default, output data are saved in $NECTARCAMDATA/../SPEfit/data/",
@@ -24,6 +28,16 @@
     "-r", "--run_number", nargs="+", default=[], help="run(s) list", type=int
 )
 
+parser.add_argument(
+    "-c",
+    "--camera",
+    choices=cameras,
+    default=[camera for camera in cameras if "QM" in camera][0],
+    help="""Process data for a specific NectarCAM camera.
+Default: NectarCAMQM (Qualification Model).""",
+    type=str,
+)
+
 # max events to be loaded
 parser.add_argument(
     "-m",
@@ -160,6 +174,7 @@ def main(
         try:
             tool = _class(
                 progress_bar=True,
+                camera=args.camera,
                 run_number=_run_number,
                 max_events=_max_events,
                 **kwargs,

src/nectarchain/user_scripts/ggrolleron/gain_SPEfit_computation.sh

@@ -4,8 +4,8 @@
 #nominal runs : 2633,3936
 
 #to perform SPE fit of a run at nominal voltage
-python gain_SPEfit_computation.py -r 3942 --reload_events --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG
+python gain_SPEfit_computation.py --camera="NectarCAMQM" -r 3942 --reload_events --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG
 #to perform SPE fit of a HHV run 
-python gain_SPEfit_computation.py -r 3936 --reload_events --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG
+python gain_SPEfit_computation.py --camera="NectarCAMQM" -r 3936 --reload_events --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG
 #to perform SPE fit of a HHV run letting n and pp parameters free
-python gain_SPEfit_computation.py -r 3942 --HHV --free_pp_n --reload_events --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG
+python gain_SPEfit_computation.py --camera="NectarCAMQM" -r 3942 --HHV --free_pp_n --reload_events --multiproc --nproc 8 --chunksize 2 -p 45 56 --max_events 100  --method LocalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG

src/nectarchain/user_scripts/ggrolleron/load_wfs_compute_charge.py

@@ -16,6 +16,10 @@
     WaveformsNectarCAMCalibrationTool,
 )
 
+prefix = "NectarCAM"
+cameras = [f"{prefix}" + "QM"]
+cameras.extend([f"{prefix + str(i)}" for i in range(2, 10)])
+
 parser = argparse.ArgumentParser(
     prog="load_wfs_compute_charge",
     description="This program load waveforms from fits.fz run files and compute charge",
@@ -26,6 +30,16 @@
     "-r", "--run_number", nargs="+", default=[], help="run(s) list", type=int
 )
 
+parser.add_argument(
+    "-c",
+    "--camera",
+    choices=cameras,
+    default=[camera for camera in cameras if "QM" in camera][0],
+    help="""Process data for a specific NectarCAM camera.
+Default: NectarCAMQM (Qualification Model).""",
+    type=str,
+)
+
 # max events to be loaded
 parser.add_argument(
     "-m",
@@ -132,6 +146,7 @@ def main(
                 tool = WaveformsNectarCAMCalibrationTool(
                     progress_bar=True,
                     run_number=_run_number,
+                    camera=args.camera,
                     max_events=_max_events,
                     **waveforms_kwargs,
                 )
@@ -143,6 +158,7 @@ def main(
                     tool = ChargesNectarCAMCalibrationTool(
                         progress_bar=True,
                         run_number=_run_number,
+                        camera=args.camera,
                         max_events=_max_events,
                         from_computed_waveforms=True,
                         **charges_kwargs,
@@ -155,6 +171,7 @@ def main(
                 tool = ChargesNectarCAMCalibrationTool(
                     progress_bar=True,
                     run_number=_run_number,
+                    camera=args.camera,
                     max_events=_max_events,
                     from_computed_waveforms=True,
                     **charges_kwargs,

src/nectarchain/user_scripts/ggrolleron/load_wfs_compute_charge.sh

@@ -14,5 +14,5 @@
 
 #FF and Ped : 3943
 
-python load_wfs_compute_charge.py -r 3942 --max_events 100  --method GlobalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG
+python load_wfs_compute_charge.py --camera="NectarCAMQM" -r 3942 --max_events 100  --method GlobalPeakWindowSum --extractor_kwargs '{"window_width":16,"window_shift":4}' --overwrite -v DEBUG