lstosa 0.11.1__py3-none-any.whl → 0.11.3__py3-none-any.whl

{lstosa-0.11.1.dist-info → lstosa-0.11.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.11.1
+Version: 0.11.3
 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.1.dist-info → lstosa-0.11.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 osa/__init__.py,sha256=crotf1NMTfNdZuCua_5T_jk3kvZrAAwVw4FPrfxv994,193
-osa/_version.py,sha256=g-BRN5ntacVPfcVOcNVRBE1Tq9w5RF-9CzVCMjwnu8w,513
+osa/_version.py,sha256=3HI3wVakaLT6OqNDadrX8IIIRO-nmIN4eu3bFgy5iM8,513
 osa/conftest.py,sha256=AdSHdWqjeMTgIeZEF8fdw6eSliySouivMWCPIqUV2os,24667
-osa/job.py,sha256=gLf-e7QRIvNhjGRINDTR5-k2PyYQqbEvPnUcg0DaVdw,27791
+osa/job.py,sha256=-W3t4_aP5dKRVy2BtyPE1eL4RRBfxIWYT_Ue88GrKXk,27866
 osa/osadb.py,sha256=pkCuYbEG-moHG0uQHxwB7giQAv2XTld4HJ5gdn1F1hA,2422
 osa/paths.py,sha256=_3-avNABr7I2koiOo4MMDymi98l7JdIj1zUVbTjHdYg,18011
 osa/raw.py,sha256=ZNIsuqfx5ljoz_hwhSuafdKf-wr8-cxRJmel-A2endg,1337
@@ -34,18 +34,18 @@ osa/provenance/config/definition.yaml,sha256=6USKM92kjLpF8cy0TFl2d1WRjowjOmtCclN
 osa/provenance/config/environment.yaml,sha256=kPM6ucPyLZLDFzkwFWoY0C6vmAArG98U-P1UAl89bgE,246
 osa/provenance/config/logger.yaml,sha256=hy_lH3DfbRFh2VM_iawI-c-3wE0cjTRHy465C2eFfnQ,510
 osa/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osa/scripts/autocloser.py,sha256=_NGhk_ehJUu1BaC-rkGziTgCeb_B8Eb_fqLccOEmznw,14386
+osa/scripts/autocloser.py,sha256=yjROBHDMbKHu0HAb0UW_3pZ-K9R20gQJTlMzKCA9dvU,14401
 osa/scripts/calibration_pipeline.py,sha256=oWX2L9WIofVHp5qYsX3YMfwoslfiUgnXtWA2EI8KuG4,6056
 osa/scripts/closer.py,sha256=vhoe9wkvPvMc5O_kXqAiBuWeqm_KrBpYzgb9zs9ZORw,21718
 osa/scripts/copy_datacheck.py,sha256=rAJu5-5oJxspynjYqVWLDKnXTF7Ib9xtzSf3_DiIHsk,3212
-osa/scripts/datasequence.py,sha256=VKeZnA2OTl3PgtiTpYdw4GiB6gpbfWiqLdZSaBCmNyw,8592
+osa/scripts/datasequence.py,sha256=0EZYlkX7ouaD66Ia2a5SWKbL0Fhlk8p4knKh0TG-2Gw,8592
 osa/scripts/gain_selection.py,sha256=PUG1J2V2SIboVKXJ-u4-h_XJyOGzfurazPu37M7lmhA,23238
 osa/scripts/gainsel_webmaker.py,sha256=40_DX7RUmImX-31iqRTFPEUvdVXXPSKp0xMEJWuAu80,5006
 osa/scripts/provprocess.py,sha256=Zv8sHTOgGNuEzu1QPUF142VQbHyfOsrxO073-xA6KG8,19107
 osa/scripts/reprocess_longterm.py,sha256=wMfc3UVwickkGFiviIhOlB9ebMIqQPWoUrgg8hQ78Lg,2138
-osa/scripts/reprocessing.py,sha256=A97kqX7QtD7ewoUvFhmSaQVVIfplViGhzTtOenTx37w,3630
+osa/scripts/reprocessing.py,sha256=IL30e2McFA0EGbzvkTXdzmKJGBTbafYlCA-PsafyzyY,4571
 osa/scripts/sequencer.py,sha256=2t-fcD1pTvYV54vFSxxKID-L7pkRg7geXo-E43cnL6M,11927
-osa/scripts/sequencer_catB_tailcuts.py,sha256=umsru9KyUAE5OrbB5OOGZs2WYM_1O8283Eap25wYwQg,9988
+osa/scripts/sequencer_catB_tailcuts.py,sha256=zVBuCBiiIoO3HKHbJ0zqaDtuwxkxcziR4T5i-2WyDX8,10476
 osa/scripts/sequencer_webmaker.py,sha256=a9okC-l9UMJHELTLLM2Q933-JELFOhXEbbH1Kbp1E8g,4936
 osa/scripts/show_run_summary.py,sha256=ofznLdoFHKQB-TELD6g5zMqD_TE9M9BuJR12zHvNdXE,2518
 osa/scripts/simulate_processing.py,sha256=D3b0kjyUS6Lm7pkQNJ-tJzQMveTwoPabfBBW80RMqN0,6828
@@ -76,9 +76,9 @@ osa/workflow/dl3.py,sha256=ZMXPrdJA0WOxDiHEW9sdM2vmYix8R3eSMTGc6o42yxg,9860
 osa/workflow/stages.py,sha256=ILg91VyNXcy--si7CpDa1UFRiugqIH6nKl10Ru2zZVc,7422
 osa/workflow/tests/test_dl3.py,sha256=81Vt4lNxNjdKi_ehzymqfFWFjncw7GuQcix9S0Yigaw,384
 osa/workflow/tests/test_stages.py,sha256=aslfOIjf-rvf3r9N7NtimaOKkVB6K1M3bidgHOzRkMs,3985
-lstosa-0.11.1.dist-info/LICENSE,sha256=h6iWot11EtMvaDaS_AvCHKLTNByO5wEbMyNj1c90y1c,1519
-lstosa-0.11.1.dist-info/METADATA,sha256=9PMpH8_HdRSOSCGYetsCvEJRuzIbgrNHQKFkhPiW--0,7302
-lstosa-0.11.1.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-lstosa-0.11.1.dist-info/entry_points.txt,sha256=CzDKpLjZZQm8jJBxOVpMR8Czpgg_Yh-k6IPETp30VZE,1048
-lstosa-0.11.1.dist-info/top_level.txt,sha256=_Tj8zVHdrOoWZuuWTHbDpNofxW0imUmKdlXhnxsXJek,4
-lstosa-0.11.1.dist-info/RECORD,,
+lstosa-0.11.3.dist-info/LICENSE,sha256=h6iWot11EtMvaDaS_AvCHKLTNByO5wEbMyNj1c90y1c,1519
+lstosa-0.11.3.dist-info/METADATA,sha256=8E9rqpM04-dAuH_l9y14_F_n3FojBSeIwQ8oJLk3xTA,7302
+lstosa-0.11.3.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+lstosa-0.11.3.dist-info/entry_points.txt,sha256=CzDKpLjZZQm8jJBxOVpMR8Czpgg_Yh-k6IPETp30VZE,1048
+lstosa-0.11.3.dist-info/top_level.txt,sha256=_Tj8zVHdrOoWZuuWTHbDpNofxW0imUmKdlXhnxsXJek,4
+lstosa-0.11.3.dist-info/RECORD,,

osa/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.11.1'
-__version_tuple__ = version_tuple = (0, 11, 1)
+__version__ = version = '0.11.3'
+__version_tuple__ = version_tuple = (0, 11, 3)

osa/job.py

@@ -99,7 +99,10 @@ def are_all_jobs_correctly_finished(sequence_list):
     flag = True
     analysis_directory = Path(options.directory)
     for sequence in sequence_list:
-        history_files_list = analysis_directory.rglob(f"*{sequence.run}*.history")
+        if sequence.type != "DATA":
+            continue
+        else:
+            history_files_list = analysis_directory.rglob(f"*{sequence.run}*.history")
         
         if not options.test:
             try:

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 "

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

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)
 

osa/scripts/sequencer_catB_tailcuts.py

@@ -56,6 +56,12 @@ parser.add_argument(
     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()