diff --git a/cfg/sequencer.cfg b/cfg/sequencer.cfg index ddf8761c..524b9c0f 100644 --- a/cfg/sequencer.cfg +++ b/cfg/sequencer.cfg @@ -49,7 +49,7 @@ check_dl1: lstchain_check_dl1 dl1_to_dl2: lstchain_dl1_to_dl2 # Path to longterm dl1 script -longterm_check: /fefs/aswg/software/virtual_env/ctasoft/cta-lstchain/lstchain/scripts/longterm_dl1_check.py +longterm_check: lstchain_longterm_dl1_check # To be set by the user store_image_dl1ab: True diff --git a/osa/scripts/closer.py b/osa/scripts/closer.py index 34ac7395..18104527 100644 --- a/osa/scripts/closer.py +++ b/osa/scripts/closer.py @@ -424,7 +424,6 @@ 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" - longterm_script = cfg.get("lstchain", "longterm_check") return [ "sbatch", @@ -433,7 +432,7 @@ def daily_longterm_cmd(parent_job_ids: List[str]) -> List[str]: "-o", "log/longterm_daily_%j.log", f"--dependency=afterok:{','.join(parent_job_ids)}", - longterm_script, + "lstchain_longterm_dl1_check", f"--input-dir={dl1_dir}", f"--output-file={longterm_output_file}", f"--muons-dir={muons_dir}", diff --git a/osa/scripts/tests/test_osa_scripts.py b/osa/scripts/tests/test_osa_scripts.py index f8adcd7c..9a2baca9 100644 --- a/osa/scripts/tests/test_osa_scripts.py +++ b/osa/scripts/tests/test_osa_scripts.py @@ -320,7 +320,7 @@ def test_daily_longterm_cmd(): "-o", "log/longterm_daily_%j.log", "--dependency=afterok:12345,54321", - "/fefs/aswg/software/virtual_env/ctasoft/cta-lstchain/lstchain/scripts/longterm_dl1_check.py", + "lstchain_longterm_dl1_check", "--input-dir=test_osa/test_files0/DL1/20200117/v0.1.0/tailcut84", "--output-file=test_osa/test_files0/OSA/DL1DataCheck_LongTerm/v0.1.0/20200117/DL1_datacheck_20200117.h5", "--muons-dir=test_osa/test_files0/DL1/20200117/v0.1.0",