Include camera number in DQM results archive

Author: jlenain

src/nectarchain/user_scripts/jlenain/dqm_job_submitter/dqm_processor.sh

@@ -48,11 +48,13 @@ WRAPPER="singularity_wrapper.sh"
 # We can instantiate a particular container version:
 # CONTAINER="oras://ghcr.io/cta-observatory/nectarchain@sha256:cf5a812bdb1113d027facceec30009759535a8579eb4caf38f56143e65cb35e7"
 # or just use the latest available:
-CONTAINER="oras://ghcr.io/cta-observatory/nectarchain:latest"
+# CONTAINER="oras://ghcr.io/cta-observatory/nectarchain:latest"
 # of from CVMFS:
 # CONTAINER="/cvmfs/sw.cta-observatory.org/software/containers/nectarchain-latest"
 # CONTAINER="/cvmfs/sw.hess-experiment.eu/software/containers/nectarchain_w_2025_03"
-OUTDIR=NectarCAM_DQM_Run${runnb}
+# or using a local container image:
+CONTAINER="$HOME/nectarchain.sif"
+OUTDIR=NectarCAM${camera}_DQM_Run${runnb}
 DIRAC_OUTDIR=/ctao/user/j/jlenain/nectarcam/dqm/${camera}
 
 function exit_script() {

src/nectarchain/user_scripts/jlenain/parse_dqm_fits_file.py

@@ -75,7 +75,7 @@
         )
         continue
 
-    lfn = f"{args.path}/{args.camera}/NectarCAM_DQM_Run{run}.tar.gz"
+    lfn = f"{args.path}/{args.camera}/{args.camera}_DQM_Run{run}.tar.gz"
 
     if not os.path.exists(os.path.basename(lfn)):
         DIRAC.initialize()
@@ -98,7 +98,7 @@
         continue
 
     fits_file = (
-        f"./NectarCAM_DQM_Run{run}/output/NectarCAM_Run{run}/"
+        f"./{args.camera}_DQM_Run{run}/output/NectarCAM_Run{run}/"
         f"NectarCAM_Run{run}_calib/NectarCAM_Run{run}_Results.fits"
     )
 
@@ -125,12 +125,12 @@
 
     # Remove DQM archive file and directory
     try:
-        os.remove(f"NectarCAM_DQM_Run{run}.tar.gz")
+        os.remove(f"{args.camera}_DQM_Run{run}.tar.gz")
     except OSError:
         logger.warning(
-            f"Could not remove NectarCAM_DQM_Run{run}.tar.gz or it does not exist"
+            f"Could not remove {args.camera}_DQM_Run{run}.tar.gz or it does not exist"
         )
 
-    dirpath = Path(f"./NectarCAM_DQM_Run{run}")
+    dirpath = Path(f"./{args.camera}_DQM_Run{run}")
     if dirpath.exists() and dirpath.is_dir():
         shutil.rmtree(dirpath)