lstosa 0.10.16__tar.gz → 0.10.18__tar.gz

{lstosa-0.10.16 → lstosa-0.10.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.16
+Version: 0.10.18
 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>
@@ -13,14 +13,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy~=5.0
-Requires-Dist: lstchain>=0.10.7
+Requires-Dist: lstchain>=0.10.13
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -34,6 +33,7 @@ Requires-Dist: toml
 Requires-Dist: pymongo
 Requires-Dist: gammapy~=1.1
 Requires-Dist: tenacity
+Requires-Dist: lstcam_calib
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

{lstosa-0.10.16 → lstosa-0.10.18}/environment.yml

@@ -21,12 +21,13 @@ dependencies:
   - click
   - pymongo
   - scikit-learn=1.2
-  - protobuf=3.20
-  - ctapipe_io_lst=0.22
+  - ctapipe_io_lst=0.24
   - ctaplot~=0.6.4
   - pyirf~=0.10
-  - lstchain>=0.10.7
+  - lstchain>=0.10.13
   - tenacity
+  - pip:
+      - lstcam_calib
   # dev dependencies
   - pytest
   - pytest-cov

lstosa-0.10.18/extra/history_files/sequence_LST1_04183.history

@@ -0,0 +1,2 @@
+04179 lstcam_calib_onsite_create_drs4_pedestal_file v0.7.0 2021-12-19 22:11 None None 0
+04183 lstcam_calib_onsite_create_calibration_file v0.7.0 2021-12-19 22:11 None None 0

{lstosa-0.10.16 → lstosa-0.10.18}/pyproject.toml

@@ -26,15 +26,14 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Astronomy",
     "Topic :: Scientific/Engineering :: Physics",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
 ]
 
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "astropy~=5.0",
-    "lstchain>=0.10.7",
+    "lstchain>=0.10.13",
     "matplotlib",
     "numpy",
     "pandas",
@@ -48,6 +47,7 @@ dependencies = [
     "pymongo",
     "gammapy~=1.1",
     "tenacity",
+    "lstcam_calib",
 ]
 
 dynamic = ["version"]

{lstosa-0.10.16 → lstosa-0.10.18}/src/lstosa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.16
+Version: 0.10.18
 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>
@@ -13,14 +13,13 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: astropy~=5.0
-Requires-Dist: lstchain>=0.10.7
+Requires-Dist: lstchain>=0.10.13
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -34,6 +33,7 @@ Requires-Dist: toml
 Requires-Dist: pymongo
 Requires-Dist: gammapy~=1.1
 Requires-Dist: tenacity
+Requires-Dist: lstcam_calib
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

{lstosa-0.10.16 → lstosa-0.10.18}/src/lstosa.egg-info/requires.txt

@@ -1,5 +1,5 @@
 astropy~=5.0
-lstchain>=0.10.7
+lstchain>=0.10.13
 matplotlib
 numpy
 pandas
@@ -13,6 +13,7 @@ toml
 pymongo
 gammapy~=1.1
 tenacity
+lstcam_calib
 
 [all]
 lstosa[dev,doc,test]

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.10.16'
-__version_tuple__ = version_tuple = (0, 10, 16)
+__version__ = version = '0.10.18'
+__version_tuple__ = version_tuple = (0, 10, 18)

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/configs/sequencer.cfg

@@ -41,8 +41,10 @@ DL2_PROD_ID: model2
 
 [lstchain]
 # Calibration steps in calibration pipeline script
-drs4_baseline: onsite_create_drs4_pedestal_file
-charge_calibration: onsite_create_calibration_file
+#drs4_baseline: onsite_create_drs4_pedestal_file
+#charge_calibration: onsite_create_calibration_file
+drs4_baseline: lstcam_calib_onsite_create_drs4_pedestal_file
+charge_calibration: lstcam_calib_onsite_create_calibration_file
 use_ff_heuristic_id: False
 
 # Data processing steps in datasequence script

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/scripts/calibration_pipeline.py

@@ -44,22 +44,23 @@ def is_calibration_produced(drs4_pedestal_run_id: int, pedcal_run_id: int) -> bo
 def drs4_pedestal_command(drs4_pedestal_run_id: int) -> list:
     """Build the create_drs4_pedestal command."""
     base_dir = Path(cfg.get("LST1", "BASE")).resolve()
+    command = cfg.get("lstchain", "drs4_baseline")
     return [
-        "onsite_create_drs4_pedestal_file",
-        f"--run_number={drs4_pedestal_run_id}",
-        f"--base_dir={base_dir}",
+        command,
+        "-r", str(drs4_pedestal_run_id),
+        "-b", base_dir,
         "--no-progress",
     ]
 
-
 def calibration_file_command(drs4_pedestal_run_id: int, pedcal_run_id: int) -> list:
     """Build the create_calibration_file command."""
     base_dir = Path(cfg.get("LST1", "BASE")).resolve()
+    command = cfg.get("lstchain", "charge_calibration")
     cmd = [
-        "onsite_create_calibration_file",
-        f"--pedestal_run={drs4_pedestal_run_id}",
-        f"--run_number={pedcal_run_id}",
-        f"--base_dir={base_dir}",
+        command,
+        "-p", str(drs4_pedestal_run_id),
+        "-r", str(pedcal_run_id),
+        "-b", base_dir,
     ]
     # In case of problems with trigger tagging:
     if cfg.getboolean("lstchain", "use_ff_heuristic_id"):

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/scripts/closer.py

@@ -336,6 +336,7 @@ def merge_dl1_datacheck(seq_list) -> List[str]:
 
     muons_dir = destination_dir("MUON", create_dir=False)
     datacheck_dir = destination_dir("DATACHECK", create_dir=False)
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     list_job_id = []
 
@@ -344,6 +345,7 @@ def merge_dl1_datacheck(seq_list) -> List[str]:
             cmd = [
                 "sbatch",
                 "--parsable",
+                f"--account={slurm_account}",
                 "-D",
                 options.directory,
                 "-o",
@@ -386,6 +388,7 @@ def extract_provenance(seq_list):
     log.info("Extract provenance run wise")
 
     nightdir = date_to_dir(options.date)
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     for sequence in seq_list:
         if sequence.type == "DATA":
@@ -393,6 +396,7 @@ def extract_provenance(seq_list):
             pedcal_run_id = str(sequence.pedcal_run)
             cmd = [
                 "sbatch",
+                f"--account={slurm_account}",
                 "-D",
                 options.directory,
                 "-o",
@@ -433,6 +437,7 @@ def merge_files(sequence_list, data_level="DL2"):
 
     data_dir = destination_dir(data_level, create_dir=False)
     pattern, prefix = get_pattern(data_level)
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     for sequence in sequence_list:
         if sequence.type == "DATA":
@@ -440,6 +445,7 @@ def merge_files(sequence_list, data_level="DL2"):
 
             cmd = [
                 "sbatch",
+                f"--account={slurm_account}",
                 "-D",
                 options.directory,
                 "-o",
@@ -467,12 +473,14 @@ def merge_muon_files(sequence_list):
 
     data_dir = destination_dir("MUON", create_dir=False)
     pattern, prefix = get_pattern("MUON")
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     for sequence in sequence_list:
         merged_file = Path(data_dir) / f"muons_LST-1.Run{sequence.run:05d}.fits"
 
         cmd = [
             "sbatch",
+            f"--account={slurm_account}",
             "-D",
             options.directory,
             "-o",
@@ -499,10 +507,12 @@ def daily_longterm_cmd(parent_job_ids: List[str]) -> List[str]:
     muons_dir = destination_dir("MUON", create_dir=False)
     longterm_dir = Path(cfg.get("LST1", "LONGTERM_DIR")) / options.prod_id / nightdir
     longterm_output_file = longterm_dir / f"DL1_datacheck_{nightdir}.h5"
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     return [
         "sbatch",
         "--parsable",
+        f"--account={slurm_account}",
         "-D",
         options.directory,
         "-o",
@@ -541,10 +551,12 @@ def cherenkov_transparency_cmd(longterm_job_id: str) -> List[str]:
     datacheck_dir = destination_dir("DATACHECK", create_dir=False)
     longterm_dir = Path(cfg.get("LST1", "LONGTERM_DIR")) / options.prod_id / nightdir
     longterm_datacheck_file = longterm_dir / f"DL1_datacheck_{nightdir}.h5"
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     return [
         "sbatch",
         "--parsable",
+        f"--account={slurm_account}",
         "-D",
         options.directory,
         "-o",

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/scripts/gain_selection.py

@@ -114,6 +114,7 @@ def get_sbatch_script(
 ):
     """Build the sbatch job pilot script for running the gain selection."""
     mem_per_job = cfg.get("SLURM", "MEMSIZE_GAINSEL")
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
     sbatch_script = dedent(
             f"""\
         #!/bin/bash
@@ -123,6 +124,7 @@ def get_sbatch_script(
         #SBATCH --job-name "gain_selection_{run_id:05d}"
         #SBATCH --partition=short,long
         #SBATCH --mem={mem_per_job}
+        #SBATCH --account={slurm_account}
         """
         )
     

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/scripts/tests/test_osa_scripts.py

@@ -8,6 +8,7 @@ import pytest
 import yaml
 
 from osa.configs import options
+from osa.configs.config import cfg
 from osa.scripts.closer import is_sequencer_successful, is_finished_check
 
 ALL_SCRIPTS = [
@@ -300,9 +301,11 @@ def test_drs4_pedestal_cmd(base_test_dir):
 
     cmd = drs4_pedestal_command(drs4_pedestal_run_id="01804")
     expected_command = [
-        "onsite_create_drs4_pedestal_file",
-        "--run_number=01804",
-        f"--base_dir={base_test_dir}",
+        cfg.get("lstchain", "drs4_baseline"),
+        "-r",
+        "01804",
+        "-b",
+        base_test_dir,
         "--no-progress",
     ]
     assert cmd == expected_command
@@ -313,10 +316,13 @@ def test_calibration_file_cmd(base_test_dir):
 
     cmd = calibration_file_command(drs4_pedestal_run_id="01804", pedcal_run_id="01809")
     expected_command = [
-        "onsite_create_calibration_file",
-        "--pedestal_run=01804",
-        "--run_number=01809",
-        f"--base_dir={base_test_dir}",
+        cfg.get("lstchain", "charge_calibration"),
+        "-p",
+        "01804",
+        "-r",
+        "01809",
+        "-b",
+        base_test_dir,
     ]
     assert cmd == expected_command
 
@@ -326,10 +332,12 @@ def test_daily_longterm_cmd():
 
     job_ids = ["12345", "54321"]
     cmd = daily_longterm_cmd(parent_job_ids=job_ids)
+    slurm_account = cfg.get("SLURM", "ACCOUNT")
 
     expected_cmd = [
         "sbatch",
         "--parsable",
+        f"--account={slurm_account}",
         "-D",
         options.directory,
         "-o",

{lstosa-0.10.16 → lstosa-0.10.18}/src/osa/tests/test_jobs.py

@@ -395,7 +395,7 @@ def test_set_cache_dirs():
 def test_calibration_history_level():
     from osa.job import check_history_level
 
-    levels = {"onsite_create_drs4_pedestal_file": 1, "onsite_create_calibration_file": 0}
+    levels = {cfg.get("lstchain", "drs4_baseline"): 1, cfg.get("lstchain", "charge_calibration"): 0}
     level, exit_status = check_history_level(calibration_history_file, levels)
     assert level == 0
     assert exit_status == 0

lstosa-0.10.16/extra/history_files/sequence_LST1_04183.history

@@ -1,2 +0,0 @@
-04179 onsite_create_drs4_pedestal_file v0.7.0 2021-12-19 22:11 None None 0
-04183 onsite_create_calibration_file v0.7.0 2021-12-19 22:11 None None 0