lstosa 0.11.0__tar.gz → 0.11.2__tar.gz

{lstosa-0.11.0 → lstosa-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.11.0
+Version: 0.11.2
 Summary: Onsite analysis pipeline for the CTA LST-1
 Author: María Láinez, José Enrique Ruiz, Lab Saha, Andrés Baquero, José Luis Contreras, Maximilian Linhoff
 Author-email: Daniel Morcuende <dmorcuen@ucm.es>

{lstosa-0.11.0 → lstosa-0.11.2}/src/lstosa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.11.0
+Version: 0.11.2
 Summary: Onsite analysis pipeline for the CTA LST-1
 Author: María Láinez, José Enrique Ruiz, Lab Saha, Andrés Baquero, José Luis Contreras, Maximilian Linhoff
 Author-email: Daniel Morcuende <dmorcuen@ucm.es>

{lstosa-0.11.0 → lstosa-0.11.2}/src/osa/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.0'
-__version_tuple__ = version_tuple = (0, 11, 0)
+__version__ = version = '0.11.2'
+__version_tuple__ = version_tuple = (0, 11, 2)

{lstosa-0.11.0 → lstosa-0.11.2}/src/osa/scripts/autocloser.py

@@ -73,16 +73,16 @@ class Telescope:
 
         if self.is_closed():
             log.info(f"{self.telescope} is already closed! Ignoring {self.telescope}")
-            return
+            sys.exit(0)
         if not analysis_path(self.telescope).exists():
             log.warning(
                 f"Analysis directory does not exist for {self.telescope}! "
                 f"Ignoring {self.telescope}"
             )
-            return
+            sys.exit(0)
         if not self.lock_automatic_sequencer() and not ignore_cronlock:
             log.warning(f"{self.telescope} already locked! Ignoring {self.telescope}")
-            return
+            sys.exit(0)
         if not self.simulate_sequencer(date, config_file, test, no_gainsel):
             log.warning(
                 f"Simulation of the sequencer failed "

{lstosa-0.11.0 → lstosa-0.11.2}/src/osa/scripts/datasequence.py

@@ -207,7 +207,7 @@ def dl1ab(run_str: str, dl1b_config: Path, dl1_prod_id: str) -> int:
                 f"Cat-B calibration did not finish yet for run {run_str[:5]}. "
                 "Please try again later."
             )
-            sys.exit(1)
+            sys.exit(0)
 
     if options.simulate:
         return 0

{lstosa-0.11.0 → lstosa-0.11.2}/src/osa/scripts/reprocessing.py

@@ -22,7 +22,17 @@ def number_of_pending_jobs():
 
 
 def run_script(
-    script: str, date, config: Path, no_dl2: bool, no_gainsel: bool, no_calib: bool, simulate: bool, force: bool
+    script: str, 
+    date, 
+    config: Path, 
+    no_dl2: bool, 
+    no_gainsel: bool, 
+    no_calib: bool, 
+    no_dl1ab: bool, 
+    simulate: bool, 
+    force: bool,
+    overwrite_tailcuts: bool,
+    overwrite_catb: bool,
 ):
     """Run the sequencer for a given date."""
     osa_config = Path(config).resolve()
@@ -38,12 +48,21 @@ def run_script(
     if no_calib:
         cmd.append("--no-calib")
 
+    if no_dl1ab:
+        cmd.append("--no-dl1ab")
+
     if simulate:
         cmd.append("--simulate")
 
     if force:
         cmd.append("--force")
 
+    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")
 
@@ -69,8 +88,11 @@ def get_list_of_dates(dates_file):
 @click.option("--no-dl2", is_flag=True, help="Do not run the DL2 step.")
 @click.option("--no-gainsel", is_flag=True, help="Do not require gain selection to be finished.")
 @click.option("--no-calib", is_flag=True, help="Do not run the calibration step.")
+@click.option("--no-dl1ab", is_flag=True, help="Do not run the DL1AB step.")
 @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",
@@ -79,7 +101,7 @@ def get_list_of_dates(dates_file):
     help="Path to the OSA config file.",
 )
 @click.argument(
-    "script", type=click.Choice(["sequencer", "closer", "copy_datacheck", "autocloser"])
+    "script", type=click.Choice(["sequencer", "closer", "copy_datacheck", "autocloser", "sequencer_catB_tailcuts"])
 )
 @click.argument("dates-file", type=click.Path(exists=True))
 def main(
@@ -89,9 +111,12 @@ def main(
     no_dl2: bool = False,
     no_gainsel: bool = False,
     no_calib: bool = False,
+    no_dl1ab: bool = False,
     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.
     The input file should list the dates in the format YYYY-MM-DD one date per line.
@@ -107,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, simulate, force)
+        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)
 

{lstosa-0.11.0 → lstosa-0.11.2}/src/osa/scripts/sequencer_catB_tailcuts.py

@@ -50,6 +50,18 @@ parser.add_argument(
     default=False,
     help="Simulate launching of the sequencer_catB_tailcuts script.",
 )
+parser.add_argument(
+    "--overwrite-tailcuts",
+    action="store_true",
+    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"],
@@ -105,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.")
@@ -123,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"):
@@ -156,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()
@@ -210,6 +228,8 @@ def main():
     opts = parser.parse_args()
     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()
@@ -231,8 +251,13 @@ def main():
             # launch catB calibration and tailcut finder in parallel
             if cfg.getboolean("lstchain", "apply_catB_calibration") and not catB_closed_file_exists(run_id):
                 launch_catB_calibration(run_id)
-            if not cfg.getboolean("lstchain", "apply_standard_dl1b_config") and not tailcuts_config_file_exists(run_id):
-                launch_tailcuts_finder(run_id)
+            if not cfg.getboolean("lstchain", "apply_standard_dl1b_config"):
+                if tailcuts_config_file_exists(run_id) and not options.overwrite_tailcuts:
+                    log.debug(
+                        f"Tailcuts config file already exists for run {run_id:05d}. Use --overwrite-tailcuts to overwrite it."
+                    )
+                else:
+                    launch_tailcuts_finder(run_id)
 
 
 if __name__ == "__main__":