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

Change name of the longterm script #98

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Conversation

marialainez
Copy link
Collaborator

longterm_dl1_check.py script renamed to lstchain_longterm_dl1_check.py

@morcuended
Copy link
Member

morcuended commented Feb 1, 2022

Thanks, @marialainez! This would work. However, once lstchain PR cta-observatory/cta-lstchain#881 is merged it would be possible to simply use the command lstchain_longterm_dl1_check without giving the entire path.

Then there is no need to include it in the cfg, but directly in closer.py (daily_longterm_cmd function).

You have also to adapt the test to make it pass:

expected_cmd = [
"sbatch",
"-D",
options.directory,
"-o",
"log/longterm_daily_%j.log",
"--dependency=afterok:12345,54321",
"/fefs/aswg/software/virtual_env/ctasoft/cta-lstchain/lstchain/scripts/longterm_dl1_check.py",
"--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",
"--batch"
]

Line 323 should simply be "lstchain_longterm_dl1_check", the same change goes in closer.py where this command is issued.

@@ -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: /fefs/aswg/software/virtual_env/ctasoft/cta-lstchain/lstchain/scripts/lstchain_longterm_dl1_check.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove this path from here and directly use the lstchain entry point lstchain_longterm_dl1_check in closer.py

@codecov
Copy link

codecov bot commented Feb 2, 2022

Codecov Report

Merging #98 (38f0aa4) into main (c3a92d8) will decrease coverage by 0.09%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main      #98      +/-   ##
==========================================
- Coverage   81.93%   81.83%   -0.10%     
==========================================
  Files          43       43              
  Lines        4450     4449       -1     
==========================================
- Hits         3646     3641       -5     
- Misses        804      808       +4     
Impacted Files Coverage Δ
osa/scripts/closer.py 75.53% <ø> (-0.13%) ⬇️
osa/scripts/tests/test_osa_scripts.py 98.82% <ø> (ø)
osa/utils/utils.py 67.28% <0.00%> (-1.41%) ⬇️
osa/utils/tests/test_utils.py 97.72% <0.00%> (-1.14%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c3a92d8...38f0aa4. Read the comment docs.

@morcuended morcuended merged commit c00365b into main Feb 2, 2022
@morcuended morcuended deleted the longterm_script_name branch February 2, 2022 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants