Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Launch lstchain_cherenkov_transparency.py script as a new step of closer #271

Merged
merged 6 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- ctapipe_io_lst=0.22
- ctaplot~=0.6.4
- pyirf~=0.10
- lstchain>=0.10.5
- lstchain>=0.10.7
- tenacity
# dev dependencies
- pytest
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ classifiers = [
requires-python = ">=3.9"
dependencies = [
"astropy~=5.0",
"lstchain>=0.10.5",
"lstchain>=0.10.7",
"matplotlib",
"numpy",
"pandas",
Expand Down
39 changes: 37 additions & 2 deletions src/osa/scripts/closer.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,12 @@
post_process_files(seq_list)

# Merge DL1 datacheck files and produce PDFs. It also produces
# the daily datacheck report using the longterm script.
# the daily datacheck report using the longterm script, and updates
# the longterm DL1 datacheck file with the cherenkov_transparency script.
if cfg.getboolean("lstchain", "merge_dl1_datacheck"):
list_job_id = merge_dl1_datacheck(seq_list)
daily_datacheck(daily_longterm_cmd(list_job_id))
longterm_job_id = daily_datacheck(daily_longterm_cmd(list_job_id))
cherenkov_transparency(cherenkov_transparency_cmd(longterm_job_id))

# Extract the provenance info
extract_provenance(seq_list)
Expand Down Expand Up @@ -484,6 +486,39 @@
log.info("Daily dl1 checks using longterm script.")
log.debug(f"Executing {stringify(cmd)}")

if not options.simulate and not options.test and shutil.which("sbatch") is not None:
job = subprocess.run(cmd, check=True)
morcuended marked this conversation as resolved.
Show resolved Hide resolved
job_id = job.stdout.strip()
return job_id

Check warning on line 492 in src/osa/scripts/closer.py

View check run for this annotation

Codecov / codecov/patch

src/osa/scripts/closer.py#L490-L492

Added lines #L490 - L492 were not covered by tests
else:
log.debug("Simulate launching scripts")


def cherenkov_transparency_cmd(longterm_job_id: str) -> List[str]:
"""Build the cherenkov transparency command."""
nightdir = date_to_dir(options.date)
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"

return [
"sbatch",
"-D",
options.directory,
"-o",
"log/cherenkov_transparency_%j.log",
f"--dependency=afterok:{longterm_job_id}",
"lstchain_cherenkov_transparency",
f"--update-datacheck-file={longterm_datacheck_file}",
f"--input-dir={datacheck_dir}",
]


def cherenkov_transparency(cmd: List[str]):
"""Update longterm dl1 check file with cherenkov transparency information."""
log.info("Update longterm dl1 check file with cherenkov_transparency script.")
log.debug(f"Executing {stringify(cmd)}")

if not options.simulate and not options.test and shutil.which("sbatch") is not None:
subprocess.run(cmd, check=True)
else:
Expand Down
Loading