lstosa 0.10.13__tar.gz → 0.10.14__tar.gz

{lstosa-0.10.13 → lstosa-0.10.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.13
+Version: 0.10.14
 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.10.13 → lstosa-0.10.14}/src/lstosa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.13
+Version: 0.10.14
 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.10.13 → lstosa-0.10.14}/src/osa/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.10.13'
-__version_tuple__ = version_tuple = (0, 10, 13)
+__version__ = version = '0.10.14'
+__version_tuple__ = version_tuple = (0, 10, 14)

{lstosa-0.10.13 → lstosa-0.10.14}/src/osa/scripts/gain_selection.py

@@ -24,7 +24,7 @@ log = myLogger(logging.getLogger(__name__))
 
 PATH = "PATH=/fefs/aswg/software/offline_dvr/bin:$PATH"
 
-parser = argparse.ArgumentParser(add_help=False)
+parser = argparse.ArgumentParser()
 parser.add_argument(
         "--check",                                                                                       
         action="store_true",
@@ -50,13 +50,14 @@ parser.add_argument(
         "--date",                                                                                        
         default=None,
         type=str,
-        help="Night to apply the gain selection",
+        help="Night to apply the gain selection in YYYYMMDD format",
 )                                                                                                        
 parser.add_argument(                                                                                     
         "-l",                                                                                            
         "--dates-file",
         default=None,
-        help="List of dates to apply the gain selection",
+        help="List of dates to apply the gain selection. The input file should list"
+        "the dates in the format YYYYMMDD, one date per line.",
 )
 parser.add_argument(                                                                                     
         "-o",                                                                                            
@@ -79,12 +80,20 @@ parser.add_argument(
         default=18,
         help="Time to stop gain selection in HH format. Default is 18.",
 )
+parser.add_argument(                                                                                     
+        "-t",                                                                                            
+        "--tool",
+        type=str,
+        default=None,
+        help="Choose tool to apply the gain selection regardless the date. Possible options are: lst_dvr (by default used for dates "
+        "previous to 20231205) and lstchain_r0_to_r0g (by default used for dates later than 20231205).",
+)
 
 def get_sbatch_script(
-    run_id, subrun, input_file, output_dir, log_dir, log_file, ref_time, ref_counter, module, ref_source, script
+    run_id, subrun, input_file, output_dir, log_dir, log_file, ref_time, ref_counter, module, ref_source, tool
 ):
     """Build the sbatch job pilot script for running the gain selection."""
-    if script=="old":
+    if tool == "lst_dvr":
         return dedent(
             f"""\
         #!/bin/bash
@@ -98,7 +107,7 @@ def get_sbatch_script(
         lst_dvr {input_file} {output_dir} {ref_time} {ref_counter} {module} {ref_source}
         """
         )
-    elif script=="new":
+    elif tool == "lstchain_r0_to_r0g":
         return dedent(
             f"""\
         #!/bin/bash
@@ -113,16 +122,17 @@ def get_sbatch_script(
         """
         )
 
-def apply_gain_selection(date: str, start: int, end: int, output_basedir: Path = None, no_queue_check: bool = False):
+def apply_gain_selection(date: str, start: int, end: int, output_basedir: Path = None, tool: str = None, no_queue_check: bool = False):
     """
     Submit the jobs to apply the gain selection to the data for a given date
     on a subrun-by-subrun basis.
     """
 
-    if date < "20231205":
-        script = "old"
-    else:
-        script = "new"
+    if not tool:
+        if date < "20231205":
+            tool = "lst_dvr"
+        else:
+            tool = "lstchain_r0_to_r0g"
 
     run_summary_dir = Path("/fefs/aswg/data/real/monitoring/RunSummary")
     run_summary_file = run_summary_dir / f"RunSummary_{date}.ecsv"
@@ -156,7 +166,7 @@ def apply_gain_selection(date: str, start: int, end: int, output_basedir: Path =
         subrun_numbers = [int(file[-12:-8]) for file in files]
         input_files = []
 
-        if date < "20231205" and ref_source not in ["UCTS", "TIB"]:
+        if tool == "lst_dvr" and ref_source not in ["UCTS", "TIB"]:
             input_files = r0_dir.glob(f"LST-1.?.Run{run_id:05d}.????.fits.fz")
             log.info(
                 f"Run {run_id} does not have UCTS or TIB info, so gain selection cannot"
@@ -199,7 +209,7 @@ def apply_gain_selection(date: str, start: int, end: int, output_basedir: Path =
                             ref_counter,
                             module,
                             ref_source,
-                            script,
+                            tool,
                         )
                     )
                 sp.run(["sbatch", job_file], check=True)
@@ -328,7 +338,14 @@ def main():
             check_failed_jobs(args.date, args.output_basedir)
         else:
             log.info(f"Applying gain selection to date {args.date}")
-            apply_gain_selection(args.date, args.start_time, args.end_time, args.output_basedir, no_queue_check=args.no_queue_check)
+            apply_gain_selection(
+                args.date, 
+                args.start_time, 
+                args.end_time, 
+                args.output_basedir,
+                args.tool,
+                no_queue_check=args.no_queue_check, 
+            )
 
 
     elif args.dates_file:
@@ -342,7 +359,14 @@ def main():
         else:
             for date in list_of_dates:
                 log.info(f"Applying gain selection to date {date}")
-                apply_gain_selection(date, args.start_time, args.end_time, args.output_basedir, no_queue_check=args.no_queue_check)
+                apply_gain_selection(
+                    date, 
+                    args.start_time, 
+                    args.end_time,
+                    args.output_basedir,
+                    args.tool,
+                    no_queue_check=args.no_queue_check,
+                )
             log.info("Done! No more dates to process.")
 
 

{lstosa-0.10.13 → lstosa-0.10.14}/src/osa/scripts/reprocessing.py

@@ -22,7 +22,7 @@ def number_of_pending_jobs():
 
 
 def run_script(
-    script: str, date, config: Path, no_dl2: bool, no_calib: bool, simulate: bool, force: bool
+    script: str, date, config: Path, no_dl2: bool, no_gainsel: bool, no_calib: bool, simulate: bool, force: bool
 ):
     """Run the sequencer for a given date."""
     osa_config = Path(config).resolve()
@@ -32,6 +32,9 @@ def run_script(
     if no_dl2:
         cmd.append("--no-dl2")
 
+    if no_gainsel:
+        cmd.append("--no-gainsel")
+
     if no_calib:
         cmd.append("--no-calib")
 
@@ -64,6 +67,7 @@ def get_list_of_dates(dates_file):
 
 @click.command()
 @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("-s", "--simulate", is_flag=True, help="Activate simulation mode.")
 @click.option("-f", "--force", is_flag=True, help="Force the autocloser to close the day.")
@@ -83,6 +87,7 @@ def main(
     dates_file: Path = None,
     config: Path = DEFAULT_CFG,
     no_dl2: bool = False,
+    no_gainsel: bool = False,
     no_calib: bool = False,
     simulate: bool = False,
     force: bool = False,
@@ -102,7 +107,7 @@ def main(
         # Avoid running jobs while it is still night time
         wait_for_daytime()
 
-        run_script(script, date, config, no_dl2, no_calib, simulate, force)
+        run_script(script, date, config, no_dl2, no_gainsel, no_calib, simulate, force)
         log.info("Waiting 1 minute to launch the process for the next date...\n")
         time.sleep(60)