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.

Sign up for GitHub

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

Use lstcam_calib instead of lstchain for the calibration #310

Merged
merged 12 commits into from
Dec 2, 2024
Merged

Use lstcam_calib instead of lstchain for the calibration #310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
67b9060
Use lstcam_calib instead of lstchain for the calibration
marialainez Oct 25, 2024
6f46f5e
get the scripts names from the cfg also for the tests
marialainez Oct 28, 2024
ec222eb
add lstcam_calib to the environment
marialainez Oct 28, 2024
2821b53
lstcam_calib installable with pip
morcuended Oct 28, 2024
0ae3b2c
require python>=3.10
marialainez Oct 28, 2024
2de1289
require lstchain>=0.10.13 to use lstcam_calib
marialainez Nov 11, 2024
28bb52a
adapt the arguments to the lstcam_calib scripts
marialainez Nov 13, 2024
cbc5a58
allow the calibration_pipeline to work also for the lstchain scripts
marialainez Nov 13, 2024
df125d7
Update ctapipe_io_lst version in environment.yml
morcuended Nov 26, 2024
c609be3
Remove unneeded protobuf pin in environment.yml
morcuended Nov 26, 2024
4c81add
adapt tests
marialainez Nov 26, 2024
f865da4
transform run numbers to string in cmd
marialainez Nov 26, 2024
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
10 changes: 5 additions & 5 deletions src/osa/scripts/calibration_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def drs4_pedestal_command(drs4_pedestal_run_id: int) -> list:
command = cfg.get("lstchain", "drs4_baseline")
return [
command,
f"--run_number={drs4_pedestal_run_id}",
f"--base_dir={base_dir}",
f"--run-number={drs4_pedestal_run_id}",
f"--base-dir={base_dir}",
"--no-progress",
]

Expand All @@ -59,9 +59,9 @@ def calibration_file_command(drs4_pedestal_run_id: int, pedcal_run_id: int) -> l
command = cfg.get("lstchain", "charge_calibration")
cmd = [
command,
f"--pedestal_run={drs4_pedestal_run_id}",
morcuended marked this conversation as resolved.
Show resolved Hide resolved
f"--run_number={pedcal_run_id}",
f"--base_dir={base_dir}",
f"--pedestal-run={drs4_pedestal_run_id}",
f"--run-number={pedcal_run_id}",
f"--base-dir={base_dir}",
]
# In case of problems with trigger tagging:
if cfg.getboolean("lstchain", "use_ff_heuristic_id"):
Expand Down
10 changes: 5 additions & 5 deletions src/osa/scripts/tests/test_osa_scripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ def test_drs4_pedestal_cmd(base_test_dir):
cmd = drs4_pedestal_command(drs4_pedestal_run_id="01804")
expected_command = [
cfg.get("lstchain", "drs4_baseline"),
"--run_number=01804",
f"--base_dir={base_test_dir}",
"--run-number=01804",
f"--base-dir={base_test_dir}",
"--no-progress",
]
assert cmd == expected_command
Expand All @@ -315,9 +315,9 @@ def test_calibration_file_cmd(base_test_dir):
cmd = calibration_file_command(drs4_pedestal_run_id="01804", pedcal_run_id="01809")
expected_command = [
cfg.get("lstchain", "charge_calibration"),
"--pedestal_run=01804",
"--run_number=01809",
f"--base_dir={base_test_dir}",
"--pedestal-run=01804",
"--run-number=01809",
f"--base-dir={base_test_dir}",
]
assert cmd == expected_command

Expand Down
Loading