Merge pull request #344 from cta-observatory/overwrite-catB

Add option to overwrite the existing Cat-B calibration files

Author: marialainez

src/osa/scripts/reprocessing.py

@@ -32,6 +32,7 @@ def run_script(
     simulate: bool, 
     force: bool,
     overwrite_tailcuts: bool,
+    overwrite_catB: bool,
 ):
     """Run the sequencer for a given date."""
     osa_config = Path(config).resolve()
@@ -58,6 +59,9 @@ def run_script(
 
     if overwrite_tailcuts:
         cmd.append("--overwrite-tailcuts")
+    
+    if overwrite_catB:
+        cmd.append("--overwrite-catB")
 
     # Append the telescope to the command in the last place
     cmd.append("LST1")
@@ -88,6 +92,7 @@ def get_list_of_dates(dates_file):
 @click.option("-s", "--simulate", is_flag=True, help="Activate simulation mode.")
 @click.option("-f", "--force", is_flag=True, help="Force the autocloser to close the day.")
 @click.option("--overwrite-tailcuts", is_flag=True, help="Overwrite the tailcuts config file if it already exists.")
+@click.option("--overwrite-catB", is_flag=True, help="Overwrite the Cat-B calibration files if they already exist.")
 @click.option(
     "-c",
     "--config",
@@ -110,6 +115,7 @@ def main(
     simulate: bool = False,
     force: bool = False,
     overwrite_tailcuts: bool = False,
+    overwrite_catB: bool = False,
     ):
     """
     Loop over the dates listed in the input file and launch the script for each of them.
@@ -126,7 +132,19 @@ def main(
         # Avoid running jobs while it is still night time
         wait_for_daytime()
 
-        run_script(script, date, config, no_dl2, no_gainsel, no_calib, no_dl1ab, simulate, force, overwrite_tailcuts)
+        run_script(
+            script,
+            date,
+            config,
+            no_dl2,
+            no_gainsel,
+            no_calib,
+            no_dl1ab,
+            simulate,
+            force,
+            overwrite_tailcuts,
+            overwrite_catB,
+        )
         log.info("Waiting 1 minute to launch the process for the next date...\n")
         time.sleep(60)
 

src/osa/scripts/sequencer_catB_tailcuts.py

@@ -56,6 +56,12 @@
     default=False,
     help="Overwrite the tailcuts config file if it already exists.",
 )
+parser.add_argument(
+    "--overwrite-catB",
+    action="store_true",
+    default=False,
+    help="Overwrite the Cat-B calibration files if they already exist.",
+)
 parser.add_argument(
     "tel_id",
     choices=["ST", "LST1", "LST2", "all"],
@@ -111,7 +117,7 @@ def launch_catB_calibration(run_id: int):
     before and it finished successfully, it creates a catB_{run}.closed file.
     """
     job_id = get_catB_last_job_id(run_id)
-    if job_id:
+    if job_id and not options.overwrite_catB:
         job_status = get_sacct_output(run_sacct(job_id=job_id))["State"]
         if job_status.item() in ["RUNNING", "PENDING"]:
             log.debug(f"Job {job_id} (corresponding to run {run_id:05d}) is still running.")
@@ -129,8 +135,11 @@ def launch_catB_calibration(run_id: int):
 
     else:
         if catB_calibration_file_exists(run_id):
-            log.info(f"Cat-B calibration file already produced for run {run_id:05d}.")
-            return 
+            if not options.overwrite_catB:
+                log.info(f"Cat-B calibration file already produced for run {run_id:05d}.")
+                return 
+            else:
+                log.info(f"Cat-B calibration file already produced for run {run_id:05d}. Overwriting it.")
 
         command = cfg.get("lstchain", "catB_calibration")
         if cfg.getboolean("lstchain", "use_lstcam_env_for_CatB_calib"):
@@ -162,6 +171,9 @@ def launch_catB_calibration(run_id: int):
             cmd.append(f"--dl1-dir={analysis_dir}")
             cmd.append(f"--lstchain-version={lstchain_version[1:]}")
 
+        if options.overwrite_catB:
+            cmd.append("--yes")
+
         if not options.simulate:
             job = sp.run(cmd, encoding="utf-8", capture_output=True, text=True, check=True)
             job_id = job.stdout.strip()
@@ -217,6 +229,7 @@ def main():
     options.tel_id = opts.tel_id
     options.simulate = opts.simulate
     options.overwrite_tailcuts = opts.overwrite_tailcuts
+    options.overwrite_catB = opts.overwrite_catB
     options.date = opts.date
     options.date = set_default_date_if_needed()
     options.configfile = opts.config.resolve()