lstosa 0.10.16__tar.gz → 0.10.17__tar.gz

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lstosa
-Version: 0.10.16
+Version: 0.10.17
 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.16 → lstosa-0.10.17}/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.17'
+__version_tuple__ = version_tuple = (0, 10, 17)

{lstosa-0.10.16 → lstosa-0.10.17}/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.17}/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.17}/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 = [
@@ -326,10 +327,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",