lstosa 0.10.5__tar.gz → 0.10.6__tar.gz

{lstosa-0.10.5 → lstosa-0.10.6}/PKG-INFO

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

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

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.10.5'
-__version_tuple__ = version_tuple = (0, 10, 5)
+__version__ = version = '0.10.6'
+__version_tuple__ = version_tuple = (0, 10, 6)

{lstosa-0.10.5 → lstosa-0.10.6}/src/osa/paths.py

@@ -9,9 +9,8 @@ from typing import List
 import lstchain
 from astropy.table import Table
 from lstchain.onsite import (find_systematics_correction_file,
-                             find_time_calibration_file)
-from lstchain.scripts.onsite.onsite_create_calibration_file import \
-    search_filter
+                             find_time_calibration_file,
+                             find_filter_wheels)
 
 from osa.configs import options
 from osa.configs.config import DEFAULT_CFG, cfg
@@ -142,7 +141,7 @@ def get_calibration_filename(run_id: int, prod_id: str) -> Path:
         mongodb = cfg.get("database", "caco_db")
         try:
             # Cast run_id to int to avoid problems with numpy int64 encoding in MongoDB
-            options.filters = search_filter(int(run_id), mongodb)
+            options.filters = find_filter_wheels(int(run_id), mongodb)
         except IOError:
             log.warning("No filter information found in database. Assuming positions 52.")
             options.filters = 52

{lstosa-0.10.5 → lstosa-0.10.6}/src/osa/scripts/closer.py

@@ -193,7 +193,6 @@ def post_process_files(seq_list: list):
     output_files_set = set(Path(options.directory).rglob("*Run*"))
 
     DL1AB_RE = re.compile(rf"{options.dl1_prod_id}/dl1.*.(?:h5|hdf5|hdf)")
-    DL2_RE = re.compile(f"{options.dl2_prod_id}/dl2.*.(?:h5|hdf5|hdf)")
     MUONS_RE = re.compile(r"muons.*.fits")
     DATACHECK_RE = re.compile(r"datacheck_dl1.*.(?:h5|hdf5|hdf)")
     INTERLEAVED_RE = re.compile(r"interleaved.*.(?:h5|hdf5|hdf)")
@@ -201,13 +200,16 @@ def post_process_files(seq_list: list):
     pattern_files = dict(
         [
             ("DL1AB", DL1AB_RE),
-            ("DL2", DL2_RE),
             ("MUON", MUONS_RE),
             ("DATACHECK", DATACHECK_RE),
             ("INTERLEAVED", INTERLEAVED_RE),
         ]
     )
 
+    if not options.no_dl2:
+        DL2_RE = re.compile(f"{options.dl2_prod_id}/dl2.*.(?:h5|hdf5|hdf)")
+        pattern_files["DL2"] = DL2_RE
+
     for concept, pattern_re in pattern_files.items():
         log.info(f"Post processing {concept} files, {len(output_files_set)} files left")
 
@@ -368,6 +370,9 @@ def extract_provenance(seq_list):
                 nightdir,
                 options.prod_id,
             ]
+            if options.no_dl2:
+                cmd.append("--no-dl2")
+                
             if not options.simulate and not options.test and shutil.which("sbatch") is not None:
                 subprocess.run(cmd, check=True)
             else:

{lstosa-0.10.5 → lstosa-0.10.6}/src/osa/scripts/gain_selection.py

@@ -206,8 +206,8 @@ def check_failed_jobs(date: str, output_basedir: Path = None):
 @click.option("--check", is_flag=True, default=False, help="Check for failed jobs.")
 @click.argument("dates-file", type=click.Path(exists=True, path_type=Path))
 @click.argument("output-basedir", type=click.Path(path_type=Path))
-@click.option("-s", "--start-time", type=int, default=10)
-@click.option("-e", "--end-time", type=int, default=18)
+@click.option("-s", "--start-time", type=int, default=10, help="Time to (re)start gain selection in HH format.")
+@click.option("-e", "--end-time", type=int, default=18, help="Time to stop gain selection in HH format.")
 def main(
     dates_file: Path = None, 
     output_basedir: Path = None, 

{lstosa-0.10.5 → lstosa-0.10.6}/src/osa/scripts/provprocess.py

@@ -442,15 +442,17 @@ def produce_provenance(session_log_filename, base_filename):
         calibration_to_dl1 = define_paths(
             "calibration_to_dl1", PATH_DL1, options.dl1_prod_id, base_filename
         )
-        calibration_to_dl2 = define_paths(
-            "calibration_to_dl2", PATH_DL2, options.dl2_prod_id, base_filename
-        )
         calibration_to_dl1_lines = calibration_lines + dl1_lines[1:]
         lines_dl1 = copy.deepcopy(calibration_to_dl1_lines)
-        calibration_to_dl2_lines = calibration_to_dl1_lines + dl1_dl2_lines[1:]
-        lines_dl2 = copy.deepcopy(calibration_to_dl2_lines)
         produce_provenance_files(lines_dl1, calibration_to_dl1)
-        produce_provenance_files(lines_dl2, calibration_to_dl2)
+
+        if not options.no_dl2:
+            calibration_to_dl2 = define_paths(
+                "calibration_to_dl2", PATH_DL2, options.dl2_prod_id, base_filename
+            )
+            calibration_to_dl2_lines = calibration_to_dl1_lines + dl1_dl2_lines[1:]
+            lines_dl2 = copy.deepcopy(calibration_to_dl2_lines)
+            produce_provenance_files(lines_dl2, calibration_to_dl2)
 
 
 def main():

{lstosa-0.10.5 → lstosa-0.10.6}/src/osa/utils/cliopts.py

@@ -326,6 +326,12 @@ def provprocess_argparser():
         dest="quit",
         help="use this flag to reset session and remove log file",
     )
+    parser.add_argument(
+        "--no-dl2",
+        action="store_true",
+        default=False,
+        help="Do not produce DL2 files (default False)",
+    )
     parser.add_argument(
         "drs4_pedestal_run_id", help="Number of the drs4_pedestal used in the calibration"
     )
@@ -354,6 +360,7 @@ def provprocessparsing():
     options.configfile = opts.config.resolve()
     options.filter = opts.filter
     options.quit = opts.quit
+    options.no_dl2 = opts.no_dl2
     set_prod_ids()