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

Adding common PRW and mc23 PRW #1666

Merged
merged 9 commits into from
Feb 23, 2024
Merged

Adding common PRW and mc23 PRW #1666

merged 9 commits into from
Feb 23, 2024

Conversation

mdhank
Copy link
Contributor

@mdhank mdhank commented Dec 19, 2023

Adding mc23a and mc23c cases for PRW auto-configuration. Also adding the option to use common PRW files for each MC campaign instead of DSID-specific files.

prwConfigFiles.push_back(PathResolverFindCalibFile(m_prwActualMu2018File));
if( !m_prwActualMu2022File.empty() && mcCampaign == "mc23a" )
prwConfigFiles.push_back(PathResolverFindCalibFile(m_prwActualMu2022File));
if( !m_prwActualMu2023File.empty() && mcCampaign == "mc23c" || mcCampaign == "mc23d" )
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this needs to be changed to (mcCampaign == "mc23c" || mcCampaign == "mc23d") otherwise the code crashed it the user doesn't specify a actual PRW file for 2023

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for catching this! I've fixed this, and allowed metadata to detect the campaign directly (note this should give a warning but still work if you use an out-of-date PRW such as mc23c).

Copy link
Contributor

Choose a reason for hiding this comment

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

If I understand correctly, you can use the autoconfiguration of PRW files for mc23c if you manually specify the campaign as property via m_mcCampaign, otherwise you will run over mc23c but apply the PRW as it would be a mc23 file?

Copy link
Contributor Author

@mdhank mdhank Feb 7, 2024

Choose a reason for hiding this comment

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

My apologies, some of my commits didn't make it in - I've added them now. It should now detect mcCampaign from both run number and metadata- if it disagrees, it will use the latter, but with a warning.

@mdhank mdhank changed the title Draft: Adding common PRW and mc23 PRW Adding common PRW and mc23 PRW Feb 23, 2024
@mdhank mdhank merged commit 3ea6bae into UCATLAS:main Feb 23, 2024
4 of 5 checks passed
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.

None yet

2 participants