lstosa 0.10.5__py3-none-any.whl → 0.10.6__py3-none-any.whl

{lstosa-0.10.5.dist-info → lstosa-0.10.6.dist-info}/METADATA

@@ -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.dist-info → lstosa-0.10.6.dist-info}/RECORD

@@ -1,9 +1,9 @@
 osa/__init__.py,sha256=crotf1NMTfNdZuCua_5T_jk3kvZrAAwVw4FPrfxv994,193
-osa/_version.py,sha256=JrZYbNAlpJOYXO5cv0MZXjpyEhQ6EOMM22X9FTSLwks,413
+osa/_version.py,sha256=0ek8_w_jF04UB6FpW1K7d1RgH0zQMd77H5TbKzdthjI,413
 osa/conftest.py,sha256=b_26FciV8NZAdHj2S10E8cE4bettinLJY83Roe1a5L4,19358
 osa/job.py,sha256=acdiaRlHsc2GLyz2Oz_RBiawJo9QKK-tsajYdM7X0_Q,25393
 osa/osadb.py,sha256=pkCuYbEG-moHG0uQHxwB7giQAv2XTld4HJ5gdn1F1hA,2422
-osa/paths.py,sha256=PwH_mQ4PHSCQ2YLwCXG2IrGezey4w7pzhkuR25oRXfs,11902
+osa/paths.py,sha256=nkXPUdQAzIlvB71lOERiPjgET58fj5DEbWazWqKbIJw,11869
 osa/raw.py,sha256=ZNIsuqfx5ljoz_hwhSuafdKf-wr8-cxRJmel-A2endg,1337
 osa/report.py,sha256=sL2V7n8Y_UUaSDbWJY2o4UxDb4FU5AaFIRR8R25DB8o,4634
 osa/version.py,sha256=9T2TtuGBQeOy5PJDxMCeGlqx5baxLaq47VmFTDc09z8,796
@@ -36,11 +36,11 @@ osa/provenance/config/logger.yaml,sha256=hy_lH3DfbRFh2VM_iawI-c-3wE0cjTRHy465C2e
 osa/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osa/scripts/autocloser.py,sha256=j7nRvglIv_Ol_GJzbcfqPHquBIWwQU515GkDRfc6_ho,14540
 osa/scripts/calibration_pipeline.py,sha256=g9o1chqCRRSo7GNuQZRABjGnJYjZyfhkPgRLPmuV994,5703
-osa/scripts/closer.py,sha256=n0GRxQ6DHYykyL4FvT24Qar80-FbX6b0ymJOEez-r3c,15091
+osa/scripts/closer.py,sha256=eZLUlqot4EXwL9IlU21tKRZ2GvZ4i8ill0c2QdEkoDY,15219
 osa/scripts/copy_datacheck.py,sha256=tfDs6oTdPbii4BOXp6bTHuED0xNJeqaPFrv6Ed7ZnWc,3104
 osa/scripts/datasequence.py,sha256=gXAp8arbLPEK-sca9VnME6-2XfUzBFIoEFchlUZYrXI,9260
-osa/scripts/gain_selection.py,sha256=KcyxRJrsy4vOHYGukDGKFXRm6FV1TGu8n_nvmCIfyrw,7990
-osa/scripts/provprocess.py,sha256=02vJmQvl7W3e4oAzzzSwOVo9okXLCwYPNqe6jKeaoLA,18480
+osa/scripts/gain_selection.py,sha256=BmNjtfeCFw5OGymaLG1PFPDcn8-yDOG6fWaifOCOHLM,8095
+osa/scripts/provprocess.py,sha256=pKR3wf3krAGmeHen_au2RmqJJtNBcX29J3XPQYKrHRE,18536
 osa/scripts/reprocess_longterm.py,sha256=wMfc3UVwickkGFiviIhOlB9ebMIqQPWoUrgg8hQ78Lg,2138
 osa/scripts/reprocessing.py,sha256=D-J8Rl3GrkWpxYkk6ci79oJOMewgGdxLkQgaHCAZuqs,3417
 osa/scripts/sequencer.py,sha256=6Cg-eIExk0eN8-HXkO6DBeFEWOI-FznDueqJEpbEzos,8163
@@ -60,7 +60,7 @@ osa/tests/test_raw.py,sha256=WkgwEc_vY0D6nREo-BSm6F-5xDpqidMC0DkS86pXlRU,1058
 osa/tests/test_report.py,sha256=OY-EsrXytoS6esfjUeLnIAmCMIw9EzoGD-elySafyhE,1365
 osa/tests/test_veto.py,sha256=UIsooji_5Z8TtAhc0UlD2VqheVd9DBufuMxinJ3e0w8,1066
 osa/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osa/utils/cliopts.py,sha256=5J-dIzavSOhw0i5VHyJRN-Pri7ipXHKP8omYzB61Ptg,13506
+osa/utils/cliopts.py,sha256=Xqh-9w2o1iSHfwO0jHEW0AXQ9VeEw6X6IGLNAPKoNyc,13699
 osa/utils/iofile.py,sha256=kJ7KB1suynhS2cTf7EeHwhMXq3delC_ls2HFpCzvsZo,2021
 osa/utils/logging.py,sha256=1WcNPjjslo3y25jcEY_fe0yXOeJ6frZrGLAy1GJpu_k,1491
 osa/utils/mail.py,sha256=uQfqPQdiOVHTvEAXr9H15a7-g9DtYVNKjMEb9GnI0oY,554
@@ -75,9 +75,9 @@ osa/workflow/dl3.py,sha256=kz7L5jcKHFJ--UdQ8HQKLzWO6nxc2LLOTz42ExcqzTk,9921
 osa/workflow/stages.py,sha256=WYgUM2XDIaUjCc4_Zs_VSGW6gk73EaKcHk6ZMnPds74,6692
 osa/workflow/tests/test_dl3.py,sha256=aY5bb-8OcZGAXG3JPCZihChzkA_GsWjRIa31BHZn3Dg,299
 osa/workflow/tests/test_stages.py,sha256=TmC00XFACWZp740TQeFaokWi3C50ovj_XGiySWrrdZk,3944
-lstosa-0.10.5.dist-info/LICENSE,sha256=h6iWot11EtMvaDaS_AvCHKLTNByO5wEbMyNj1c90y1c,1519
-lstosa-0.10.5.dist-info/METADATA,sha256=84gLrevLiO4mmPjC9P-sIFCw_qLR02ehCQv71TqPxcw,7354
-lstosa-0.10.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-lstosa-0.10.5.dist-info/entry_points.txt,sha256=e5x7xddaqZhfdZPsErhHInqR4UGHsxXIlylEbTie0_8,928
-lstosa-0.10.5.dist-info/top_level.txt,sha256=_Tj8zVHdrOoWZuuWTHbDpNofxW0imUmKdlXhnxsXJek,4
-lstosa-0.10.5.dist-info/RECORD,,
+lstosa-0.10.6.dist-info/LICENSE,sha256=h6iWot11EtMvaDaS_AvCHKLTNByO5wEbMyNj1c90y1c,1519
+lstosa-0.10.6.dist-info/METADATA,sha256=Z1GxQGKizr5McPZEq-mhPLuYRmNjzLV8teV87W62kdA,7354
+lstosa-0.10.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+lstosa-0.10.6.dist-info/entry_points.txt,sha256=e5x7xddaqZhfdZPsErhHInqR4UGHsxXIlylEbTie0_8,928
+lstosa-0.10.6.dist-info/top_level.txt,sha256=_Tj8zVHdrOoWZuuWTHbDpNofxW0imUmKdlXhnxsXJek,4
+lstosa-0.10.6.dist-info/RECORD,,

{lstosa-0.10.5.dist-info → lstosa-0.10.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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)

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

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:

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, 

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():

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()