lstosa 0.10.19__tar.gz → 0.11.0__tar.gz

{lstosa-0.10.19 → lstosa-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.19
+Version: 0.11.0
 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>
@@ -18,8 +18,8 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy~=5.0
-Requires-Dist: lstchain>=0.10.15
+Requires-Dist: astropy<8,>=6.1
+Requires-Dist: lstchain>=0.11.0
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -31,9 +31,8 @@ Requires-Dist: psutil
 Requires-Dist: click
 Requires-Dist: toml
 Requires-Dist: pymongo
-Requires-Dist: gammapy~=1.1
+Requires-Dist: gammapy~=1.3
 Requires-Dist: tenacity
-Requires-Dist: lstcam_calib
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

lstosa-0.11.0/environment-lstcam.yml

@@ -0,0 +1,8 @@
+name: lstcam-env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.11
+  - pip
+  - pip:
+      - lstcam_calib

{lstosa-0.10.19 → lstosa-0.11.0}/environment.yml

@@ -6,8 +6,8 @@ dependencies:
   - python=3.11
   - numpy
   - pip
-  - astropy~=5.0
-  - ctapipe~=0.19.2
+  - astropy>=6.1,<8
+  - ctapipe>=0.25.0
   - matplotlib
   - pyparsing
   - prov
@@ -15,19 +15,18 @@ dependencies:
   - pydot
   - pydotplus
   - psutil
-  - gammapy=1.1
+  - gammapy=1.3
   - h5py
   - joblib~=1.2.0
   - click
   - pymongo
-  - scikit-learn=1.2
-  - ctapipe_io_lst >=0.25.1,<0.26a0
+  - scikit-learn=1.6
+  - ctapipe_io_lst>=0.26.0,<0.28.0a0
   - ctaplot~=0.6.4
-  - pyirf~=0.10
-  - lstchain>=0.10.15
+  - pyirf~=0.12.0
   - tenacity
   - pip:
-      - lstcam_calib
+      - lstchain>=0.11.0
   # dev dependencies
   - pytest
   - pytest-cov

lstosa-0.11.0/extra/history_files/sequence_LST1_04183.history

@@ -0,0 +1,2 @@
+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

{lstosa-0.10.19 → lstosa-0.11.0}/pyproject.toml

@@ -32,8 +32,8 @@ classifiers = [
 
 requires-python = ">=3.10"
 dependencies = [
-    "astropy~=5.0",
-    "lstchain>=0.10.15",
+    "astropy>=6.1,<8",
+    "lstchain>=0.11.0",
     "matplotlib",
     "numpy",
     "pandas",
@@ -45,9 +45,8 @@ dependencies = [
     "click",
     "toml",
     "pymongo",
-    "gammapy~=1.1",
+    "gammapy~=1.3",
     "tenacity",
-    "lstcam_calib",
 ]
 
 dynamic = ["version"]

{lstosa-0.10.19 → lstosa-0.11.0}/src/lstosa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.19
+Version: 0.11.0
 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>
@@ -18,8 +18,8 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy~=5.0
-Requires-Dist: lstchain>=0.10.15
+Requires-Dist: astropy<8,>=6.1
+Requires-Dist: lstchain>=0.11.0
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -31,9 +31,8 @@ Requires-Dist: psutil
 Requires-Dist: click
 Requires-Dist: toml
 Requires-Dist: pymongo
-Requires-Dist: gammapy~=1.1
+Requires-Dist: gammapy~=1.3
 Requires-Dist: tenacity
-Requires-Dist: lstcam_calib
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

{lstosa-0.10.19 → lstosa-0.11.0}/src/lstosa.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ LICENSE
 MANIFEST.in
 README.md
 codemeta.json
+environment-lstcam.yml
 environment.yml
 pyproject.toml
 crontab/crontab.txt

{lstosa-0.10.19 → lstosa-0.11.0}/src/lstosa.egg-info/requires.txt

@@ -1,5 +1,5 @@
-astropy~=5.0
-lstchain>=0.10.15
+astropy<8,>=6.1
+lstchain>=0.11.0
 matplotlib
 numpy
 pandas
@@ -11,9 +11,8 @@ psutil
 click
 toml
 pymongo
-gammapy~=1.1
+gammapy~=1.3
 tenacity
-lstcam_calib
 
 [all]
 lstosa[dev,doc,test]

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.10.19'
-__version_tuple__ = version_tuple = (0, 10, 19)
+__version__ = version = '0.11.0'
+__version_tuple__ = version_tuple = (0, 11, 0)

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/configs/sequencer.cfg

@@ -9,7 +9,8 @@
 BASE: test_osa/test_files0
 # The directories below can be left untouched.
 MONITORING: %(BASE)s/monitoring
-R0_DIR: %(BASE)s/R0
+R0_DIR: %(BASE)s/R0G
+RAW_R0_DIR: %(BASE)s/R0
 DRIVE_DIR: %(MONITORING)s/DrivePositioning
 RUN_SUMMARY_DIR: %(MONITORING)s/RunSummary
 RUN_CATALOG: %(MONITORING)s/RunCatalog
@@ -31,9 +32,11 @@ CLOSER_DIR: %(OSA_DIR)s/Closer
 HIGH_LEVEL_DIR: %(OSA_DIR)s/HighLevel
 LONGTERM_DIR: %(OSA_DIR)s/DL1DataCheck_LongTerm
 MERGED_SUMMARY: %(OSA_DIR)s/Catalog/merged_RunSummary.ecsv
+SOURCE_CATALOG: %(OSA_DIR)s/Catalog
 SEQUENCER_WEB_DIR: %(OSA_DIR)s/SequencerWeb
 GAIN_SELECTION_FLAG_DIR: %(OSA_DIR)s/GainSel
 GAIN_SELECTION_WEB_DIR: %(OSA_DIR)s/GainSelWeb
+CALIB_ENV: /fefs/aswg/software/conda/envs/lstcam-env
 
 # To be set by the user. Using PROD-ID will overcome the automatic
 # fetching of lstchain version. Otherwise leave it empty (and without the colon symbol).
@@ -47,8 +50,8 @@ DL2_PROD_ID: model2
 # Calibration steps in calibration pipeline script
 #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
+drs4_baseline: onsite_create_drs4_pedestal_file
+charge_calibration: onsite_create_calibration_file
 catB_calibration: onsite_create_cat_B_calibration_file
 use_ff_heuristic_id: False
 
@@ -66,11 +69,14 @@ merge_dl1_datacheck: True
 apply_catB_calibration: False
 apply_standard_dl1b_config: False
 use_ff_heuristic_gain_selection: False
+create_longterm_symlink: True
 dl1b_config: /software/lstchain/data/lstchain_standard_config.json
 dl2_config: /software/lstchain/data/lstchain_standard_config.json
 mc_prod: 20240918_v0.10.12_allsky_
 dl3_config: /software/lstchain/data/dl3_std_config.json
 max_tries: 3
+use_lstcam_env_for_CatA_calib: False
+use_lstcam_env_for_CatB_calib: False
 
 [MC]
 IRF_file: /path/to/irf.fits

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/conftest.py

@@ -26,7 +26,6 @@ from osa.nightsummary.nightsummary import run_summary_table
 from osa.scripts.tests.test_osa_scripts import run_program
 from osa.utils.utils import date_to_dir
 from datetime import datetime
-import lstchain
 
 date = datetime.fromisoformat("2020-01-17")
 nightdir = date_to_dir(date)
@@ -87,14 +86,14 @@ def drive_log(monitoring_dir):
 
 @pytest.fixture(scope="session")
 def calibration_dir(calibration_base_dir):
-    directory = calibration_base_dir / "calibration" / nightdir / f"v{lstchain.__version__}"
+    directory = calibration_base_dir / "calibration" / nightdir / "v0.1.1"
     directory.mkdir(parents=True, exist_ok=True)
     return directory
 
 
 @pytest.fixture(scope="session")
 def drs4_baseline_dir(calibration_base_dir):
-    directory = calibration_base_dir / "drs4_baseline" / nightdir / f"v{lstchain.__version__}"
+    directory = calibration_base_dir / "drs4_baseline" / nightdir / "v0.1.1"
     directory.mkdir(parents=True, exist_ok=True)
     return directory
 
@@ -146,6 +145,13 @@ def r0_dir(base_test_dir):
     return r0_directory
 
 
+@pytest.fixture(scope="session")
+def r0g_dir(base_test_dir):
+    r0_directory = base_test_dir / "R0G" / nightdir
+    r0_directory.mkdir(parents=True, exist_ok=True)
+    return r0_directory
+
+
 @pytest.fixture(scope="session")
 def r0_data(r0_dir):
     r0_files = []
@@ -156,6 +162,16 @@ def r0_data(r0_dir):
     return r0_files
 
 
+@pytest.fixture(scope="session")
+def r0g_data(r0g_dir):
+    r0g_files = []
+    for i in range(4, 8):
+        r0g_file = r0g_dir / f"LST-1.1.Run0180{i}.0000.fits.fz"
+        r0g_file.touch()
+        r0g_files.append(r0g_file)
+    return r0g_files
+
+
 @pytest.fixture(scope="session")
 def dl1b_subdir(running_analysis_dir):
     dl1ab_directory = running_analysis_dir / dl1_prod_id

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/high_level/significance.py

@@ -206,6 +206,8 @@ def main(
     log.debug(f"Config: {config.resolve()}")
 
     # Initial setup of global parameters
+    if simulate:
+        options.simulate = True
     options.date = date
     flat_date = date_to_dir(date)
     options.tel_id = telescope

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/job.py

@@ -515,7 +515,10 @@ def calibration_sequence_job_template(sequence):
     # Get the job header template.
     job_header = job_header_template(sequence)
 
-    commandargs = ["calibration_pipeline"]
+    if cfg.getboolean("lstchain", "use_lstcam_env_for_CatA_calib"):
+        commandargs = ["conda", "run", "-n", "lstcam-env", "calibration_pipeline"]
+    else:
+        commandargs = ["calibration_pipeline"]
 
     if options.verbose:
         commandargs.append("-v")

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/nightsummary/extract.py

@@ -309,7 +309,7 @@ def get_source_list(date: datetime) -> dict:
 
     # Create a dictionary of sources and their corresponding sequences
     source_dict = {
-        sequence.run: sequence.source_name
+        int(sequence.run): sequence.source_name
         for sequence in sequence_list
         if sequence.source_name is not None
     }

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/nightsummary/tests/test_extract.py

@@ -1,5 +1,7 @@
 from datetime import datetime
+from osa.configs import options
 
+options.test = True
 obs_date = datetime.fromisoformat("2020-01-17")
 
 

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/paths.py

@@ -9,7 +9,6 @@ from typing import List
 import subprocess
 import time
 import json
-import lstchain
 from astropy.table import Table
 from lstchain.onsite import (find_systematics_correction_file,
                              find_time_calibration_file)
@@ -103,10 +102,12 @@ def get_drs4_pedestal_filename(run_id: int, prod_id: str) -> Path:
         return files[-1]  # Get the latest production among the major lstchain version
 
     date = utils.date_to_dir(get_run_date(run_id))
+    lstcam_env = Path(cfg.get("LST1", "CALIB_ENV"))
+    lstcam_calib_version = utils.get_lstcam_calib_version(lstcam_env)
     return (
         DRS4_PEDESTAL_BASEDIR
         / date
-        / f"v{lstchain.__version__}/drs4_pedestal.Run{run_id:05d}.0000.h5"
+        / f"v{lstcam_calib_version}/drs4_pedestal.Run{run_id:05d}.0000.h5"
     ).resolve()
 
 
@@ -138,10 +139,12 @@ def get_calibration_filename(run_id: int, prod_id: str) -> Path:
     date = utils.date_to_dir(get_run_date(run_id))
     options.filters = utils.get_calib_filters(run_id)
 
+    lstcam_env = Path(cfg.get("LST1", "CALIB_ENV"))
+    lstcam_calib_version = utils.get_lstcam_calib_version(lstcam_env)
     return (
         CALIB_BASEDIR
         / date
-        / f"v{lstchain.__version__}/calibration_filters_{options.filters}.Run{run_id:05d}.0000.h5"
+        / f"v{lstcam_calib_version}/calibration_filters_{options.filters}.Run{run_id:05d}.0000.h5"
     ).resolve()
 
 
@@ -263,7 +266,7 @@ def get_datacheck_files(pattern: str, directory: Path) -> list:
 def datacheck_directory(data_type: str, date: str) -> Path:
     """Returns the path to the datacheck directory given the data type."""
     if data_type in {"PEDESTAL", "CALIB"}:
-        directory = Path(cfg.get("LST1", f"{data_type}_DIR")) / date / "pro/log"
+        directory = Path(cfg.get("LST1", f"CAT_A_{data_type}_DIR")) / date / "pro/log"
     elif data_type == "DL1AB":
         directory = Path(cfg.get("LST1", f"{data_type}_DIR")) / date / options.prod_id
     elif data_type == "LONGTERM":
@@ -358,7 +361,8 @@ def get_latest_version_file(longterm_files: List[str]) -> Path:
     return max(
         longterm_files,
         key=lambda path: int(path.parents[1].name.split(".")[1])
-        if path.parents[1].name.startswith("v")
+        if path.parents[1].name.startswith("v") and 
+            re.match(r'^\d+\.\d+(\.\d+)?$', path.parents[1].name[1:])
         else "",
     )
 

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/calibration_pipeline.py

@@ -19,6 +19,7 @@ from osa.paths import drs4_pedestal_exists, calibration_file_exists
 from osa.provenance.capture import trace
 from osa.utils.cliopts import calibration_pipeline_cliparsing
 from osa.utils.logging import myLogger
+from osa.utils import utils
 from osa.workflow.stages import DRS4PedestalStage, ChargeCalibrationStage
 
 __all__ = [
@@ -37,8 +38,10 @@ def is_calibration_produced(drs4_pedestal_run_id: int, pedcal_run_id: int) -> bo
     Check if both daily calibration (DRS4 baseline and
     charge calibration) files are already produced.
     """
-    return drs4_pedestal_exists(drs4_pedestal_run_id, options.prod_id) \
-        and calibration_file_exists(pedcal_run_id, options.prod_id)
+    lstcam_env = Path(cfg.get("LST1", "CALIB_ENV"))
+    lstcam_calib_version = utils.get_lstcam_calib_version(lstcam_env)
+    return drs4_pedestal_exists(drs4_pedestal_run_id, f"v{lstcam_calib_version}") \
+        and calibration_file_exists(pedcal_run_id, f"v{lstcam_calib_version}")
 
 
 def drs4_pedestal_command(drs4_pedestal_run_id: int) -> list:

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/closer.py

@@ -160,7 +160,8 @@ def post_process(seq_tuple):
     seq_list = seq_tuple[1]
     
     if dl1_datacheck_longterm_file_exits() and not options.test:
-        create_longterm_symlink()
+        if cfg.getboolean("lstchain", "create_longterm_symlink"):
+            create_longterm_symlink()
 
     else:
         # Close the sequences
@@ -185,7 +186,8 @@ def post_process(seq_tuple):
             list_job_id = merge_dl1_datacheck(seq_list)
             longterm_job_id = daily_datacheck(daily_longterm_cmd(list_job_id))
             cherenkov_job_id = cherenkov_transparency(cherenkov_transparency_cmd(longterm_job_id))
-            create_longterm_symlink(cherenkov_job_id)
+            if cfg.getboolean("lstchain", "create_longterm_symlink"):
+                create_longterm_symlink(cherenkov_job_id)
 
         time.sleep(600)
 

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/gain_selection.py

@@ -276,11 +276,10 @@ def apply_gain_selection(date: datetime, start: int, end: int, tool: str = None,
     data_runs = summary_table[summary_table["run_type"] == "DATA"]
     log.info(f"Found {len(data_runs)} DATA runs to which apply the gain selection")
 
-    base_dir = Path(cfg.get("LST1", "BASE"))
     date_str = date_to_dir(date)
-    r0_dir = base_dir / "R0" / date_str
-    output_dir = base_dir / f"R0G/{date_str}"
-    log_dir = base_dir / f"R0G/log/{date_str}"
+    r0_dir = Path(cfg.get("LST1", "RAW_R0_DIR")) / date_str
+    output_dir = Path(cfg.get("LST1", "R0_DIR")) / date_str
+    log_dir = Path(cfg.get("LST1", "R0_DIR")) / f"log/{date_str}"
     if not simulate:
         output_dir.mkdir(parents=True, exist_ok=True)
         log_dir.mkdir(parents=True, exist_ok=True)
@@ -356,9 +355,10 @@ def update_history_file(run_id: str, subrun: str, log_dir: Path, history_file: P
 
 def is_run_already_copied(date: datetime, run_id: int) -> bool:
     """Check if the R0 files of a given run have already been copied to the R0G directory."""
-    base_dir = Path(cfg.get("LST1", "BASE"))
-    r0_files = glob.glob(f"{base_dir}/R0/{date_to_dir(date)}/LST-1.?.Run{run_id:05d}.????.fits.fz")
-    r0g_files = glob.glob(f"{base_dir}/R0G/{date_to_dir(date)}/LST-1.?.Run{run_id:05d}.????.fits.fz")
+    r0_dir = Path(cfg.get("LST1", "RAW_R0_DIR"))
+    r0g_dir = Path(cfg.get("LST1", "R0_DIR"))
+    r0_files = glob.glob(f"{r0_dir}/{date_to_dir(date)}/LST-1.?.Run{run_id:05d}.????.fits.fz")
+    r0g_files = glob.glob(f"{r0g_dir}/{date_to_dir(date)}/LST-1.?.Run{run_id:05d}.????.fits.fz")
     return len(r0_files)==len(r0g_files)
 
 
@@ -465,9 +465,10 @@ def check_failed_jobs(date: datetime):
     missing_runs = []
 
     date_str = date_to_dir(date)
-    base_dir = Path(cfg.get("LST1", "BASE"))
-    r0_files = glob.glob(f"{base_dir}/R0/{date_str}/LST-1.?.Run?????.????.fits.fz")
-    r0g_files = glob.glob(f"{base_dir}/R0G/{date_str}/LST-1.?.Run?????.????.fits.fz")
+    r0_dir = Path(cfg.get("LST1", "RAW_R0_DIR")) / date_str
+    r0g_dir = Path(cfg.get("LST1", "R0_DIR")) / date_str
+    r0_files = glob.glob(f"{r0_dir}/LST-1.?.Run?????.????.fits.fz")
+    r0g_files = glob.glob(f"{r0g_dir}/LST-1.?.Run?????.????.fits.fz")
     all_r0_runs = [parse_r0_filename(i).run for i in r0_files]
     all_r0g_runs = [parse_r0_filename(i).run for i in r0g_files]
 
@@ -478,17 +479,15 @@ def check_failed_jobs(date: datetime):
 
     missing_runs.sort()
     if missing_runs:
-        output_dir = base_dir / f"R0G/{date_str}/"
         log.info(
             f"Some runs are missing. Copying R0 files of runs {pd.Series(missing_runs).unique()} "
-            f"directly to {output_dir}"
+            f"directly to {r0g_dir}"
         )
 
         for run in missing_runs:
-            
-            files = base_dir.glob(f"R0/{date_str}/LST-1.?.Run{run:05d}.????.fits.fz")
+            files = r0_dir.glob(f"LST-1.?.Run{run:05d}.????.fits.fz")
             for file in files:
-                sp.run(["cp", file, output_dir])
+                sp.run(["cp", file, r0g_dir])
 
     GainSel_dir = Path(cfg.get("LST1", "GAIN_SELECTION_FLAG_DIR"))
     flagfile_dir = GainSel_dir / date_str

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/sequencer.py

@@ -5,6 +5,7 @@ Orchestrator script that creates and execute the calibration sequence and
 prepares a SLURM job array which launches the data sequences for every subrun.
 """
 
+import warnings
 import logging
 import os
 import sys
@@ -14,7 +15,15 @@ import datetime
 from osa import osadb
 from osa.configs import options
 from osa.configs.config import cfg
-from osa.job import (
+from osa.veto import get_closed_list, get_veto_list
+from osa.utils.logging import myLogger
+
+warnings.filterwarnings(
+    "ignore",
+    message="pkg_resources is deprecated as an API.*",
+    category=UserWarning
+)
+from osa.job import ( # noqa: E402
     set_queue_values,
     prepare_jobs,
     submit_jobs,
@@ -24,19 +33,17 @@ from osa.job import (
     run_squeue,
     are_all_jobs_correctly_finished,
 )
-from osa.nightsummary.extract import (
+from osa.nightsummary.extract import ( # noqa: E402
     build_sequences,
     extract_runs,
     extract_sequences
 )
-from osa.nightsummary.nightsummary import run_summary_table
-from osa.paths import analysis_path, destination_dir
-from osa.report import start
-from osa.utils.cliopts import sequencer_cli_parsing
-from osa.utils.logging import myLogger
-from osa.utils.utils import is_day_closed, gettag, date_to_iso
-from osa.veto import get_closed_list, get_veto_list
-from osa.scripts.gain_selection import GainSel_finished
+from osa.nightsummary.nightsummary import run_summary_table # noqa: E402
+from osa.paths import analysis_path, destination_dir # noqa: E402
+from osa.report import start # noqa: E402
+from osa.utils.cliopts import sequencer_cli_parsing # noqa: E402
+from osa.utils.utils import is_day_closed, gettag, date_to_iso # noqa: E402
+from osa.scripts.gain_selection import GainSel_finished # noqa: E402
 
 __all__ = [
     "single_process",

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/sequencer_catB_tailcuts.py

@@ -12,8 +12,13 @@ from osa.nightsummary.extract import get_last_pedcalib
 from osa.utils.cliopts import valid_date, set_default_date_if_needed
 from osa.utils.logging import myLogger
 from osa.job import run_sacct, get_sacct_output
-from osa.utils.utils import date_to_dir, get_calib_filters
-from osa.paths import catB_closed_file_exists, catB_calibration_file_exists, analysis_path
+from osa.utils.utils import date_to_dir, get_calib_filters, get_lstchain_version
+from osa.paths import (
+    catB_closed_file_exists,
+    catB_calibration_file_exists,
+    analysis_path,
+    get_major_version
+)
 
 log = myLogger(logging.getLogger())
 
@@ -122,24 +127,35 @@ def launch_catB_calibration(run_id: int):
             return 
 
         command = cfg.get("lstchain", "catB_calibration")
+        if cfg.getboolean("lstchain", "use_lstcam_env_for_CatB_calib"):
+            env_command = f"conda run -n lstcam-env {command}"
+        else:
+            env_command = command
         options.filters = get_calib_filters(run_id) 
         base_dir = Path(cfg.get(options.tel_id, "BASE")).resolve()
         r0_dir = Path(cfg.get(options.tel_id, "R0_DIR")).resolve()
-        interleaved_dir = Path(options.directory) / "interleaved"
         log_dir = Path(options.directory) / "log"
         catA_calib_run = get_last_pedcalib(options.date)
         slurm_account = cfg.get("SLURM", "ACCOUNT")
+        lstchain_version = get_major_version(get_lstchain_version())
+        analysis_dir = cfg.get("LST1", "ANALYSIS_DIR")
         cmd = ["sbatch", f"--account={slurm_account}", "--parsable",
             "-o", f"{log_dir}/catB_calibration_{run_id:05d}_%j.out",
             "-e", f"{log_dir}/catB_calibration_{run_id:05d}_%j.err",
-            command,
-            f"--run_number={run_id}",
+            env_command,
+            f"-r {run_id:05d}",
             f"--catA_calibration_run={catA_calib_run}",
-            f"--base_dir={base_dir}",
+            "-b", base_dir,
             f"--r0-dir={r0_dir}",
-            f"--interleaved-dir={interleaved_dir}",
             f"--filters={options.filters}",
         ]
+        
+        if command=="onsite_create_cat_B_calibration_file":
+            cmd.append(f"--interleaved-dir={analysis_dir}")
+        elif command=="lstcam_calib_onsite_create_cat_B_calibration_file":
+            cmd.append(f"--dl1-dir={analysis_dir}")
+            cmd.append(f"--lstchain-version={lstchain_version[1:]}")
+
         if not options.simulate:
             job = sp.run(cmd, encoding="utf-8", capture_output=True, text=True, check=True)
             job_id = job.stdout.strip()

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/show_run_summary.py

@@ -26,8 +26,8 @@ parser.add_argument(
 parser.add_argument(
     "--r0-path",
     type=Path,
-    help="Path to the R0 files. Default is /fefs/aswg/data/real/R0",
-    default=Path("/fefs/aswg/data/real/R0"),
+    help="Path to the R0 files. Default is /fefs/onsite/data/R0/LSTN-01/lst-arraydaq/events",
+    default=Path("/fefs/onsite/data/R0/LSTN-01/lst-arraydaq/events"),
 )
 
 parser.add_argument(

{lstosa-0.10.19 → lstosa-0.11.0}/src/osa/scripts/tests/test_osa_scripts.py

@@ -107,14 +107,14 @@ def test_simulate_processing(
 
     with open(json_file_dl1) as file:
         dl1 = yaml.safe_load(file)
-    assert len(dl1["entity"]) == 42
+    assert len(dl1["entity"]) == 44
     assert len(dl1["activity"]) == 5
     assert len(dl1["used"]) == 15
     assert len(dl1["wasGeneratedBy"]) == 10
 
     with open(json_file_dl2) as file:
         dl2 = yaml.safe_load(file)
-    assert len(dl2["entity"]) == 42
+    assert len(dl2["entity"]) == 44
     assert len(dl2["activity"]) == 5
     assert len(dl2["used"]) == 15
     assert len(dl2["wasGeneratedBy"]) == 10
@@ -189,7 +189,8 @@ def test_autocloser(running_analysis_dir):
 
 
 def test_closer(
-    r0_data,
+    r0g_data,
+    run_catalog,
     running_analysis_dir,
     test_observed_data,
     run_summary_file,
@@ -210,7 +211,7 @@ def test_closer(
     if night_finished_flag.exists():
         night_finished_flag.unlink()
 
-    for r0_file in r0_data:
+    for r0_file in r0g_data:
         assert r0_file.exists()
     for file in drs4_time_calibration_files:
         assert file.exists()
@@ -340,7 +341,7 @@ def test_drs4_pedestal_cmd(base_test_dir):
     from osa.scripts.calibration_pipeline import drs4_pedestal_command
 
     cmd = drs4_pedestal_command(drs4_pedestal_run_id="01804")
-    r0_dir = base_test_dir / "R0"
+    r0_dir = base_test_dir / "R0G"
     expected_command = [
         cfg.get("lstchain", "drs4_baseline"),
         "-r",
@@ -357,7 +358,7 @@ def test_calibration_file_cmd(base_test_dir):
     from osa.scripts.calibration_pipeline import calibration_file_command
 
     cmd = calibration_file_command(drs4_pedestal_run_id="01804", pedcal_run_id="01809")
-    r0_dir = base_test_dir / "R0"
+    r0_dir = base_test_dir / "R0G"
     expected_command = [
         cfg.get("lstchain", "charge_calibration"),
         "-p",