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

CTPPS update HLTPPSJetComparisonFilter to use LHCInfoCombined #43951

Merged
merged 1 commit into from
Feb 14, 2024

Conversation

Glitchmin
Copy link
Contributor

this PR updates HLTPPSJetComparisonFilter to be able to use both old LHCInfo (for Run 2 & Direct Simulation calculations) and new LHCInfoPer* records (Run 3).
record types. The update is a follow-up to #42515 and #42890

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 13, 2024

cms-bot internal usage

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43951/38828

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Glitchmin (Adam Kulczycki) for master.

It involves the following packages:

  • HLTrigger/special (hlt)

@Martin-Grunewald, @cmsbuild, @mmusich can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @missirol, @silviodonato this is something you requested to watch as well.
@rappoccio, @sextonkennedy, @antoniovilela you are the release manager for this.

cms-bot commands are listed here

run3_common.toModify(HLTPPSJetComparisonFilter, useNewLHCInfo = True)

from Configuration.Eras.Modifier_ctpps_directSim_cff import ctpps_directSim
ctpps_directSim.toModify(HLTPPSJetComparisonFilter, useNewLHCInfo = False)
Copy link
Contributor

Choose a reason for hiding this comment

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

what's the purpose of this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

To set useLHCInfo to true but only for Run3 not-DirectSimulation runs

Copy link
Contributor

Choose a reason for hiding this comment

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

sorry, where is this file referenced elsewhere in cmssw?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know, but if hltppsJetComparisonFilter_cfi.py is used anywhere in the code the one I created should override it

desc.add<std::string>("lhcInfoLabel", "")->setComment("label used for LHCInfo");
desc.add<std::string>("lhcInfoPerLSLabel", "")->setComment("label of the LHCInfoPerLS record");
desc.add<std::string>("lhcInfoPerFillLabel", "")->setComment("label of the LHCInfoPerFill record");
desc.add<bool>("useNewLHCInfo", false)->setComment("flag whether to use new LHCInfoPer* records or old LHCInfo");
Copy link
Contributor

Choose a reason for hiding this comment

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

as this module is not already in use, why not setting the default to true (as meant for production in 2024)?

Copy link
Contributor

@mmusich mmusich Feb 13, 2024

Choose a reason for hiding this comment

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

is the DirectSimulation exercised anywhere? I think you should put there the false, via modifier.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This code will never be used with Run 2 data, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see how it can be used for Run2 data, given that the HLT for past data has already run.
The only remote use case I can see is if we want to use this filter in Run2 HLT simulation, but it makes little sense to me since the trigger using it was not active during data-taking.

@@ -83,7 +86,7 @@ void HLTPPSJetComparisonFilter::fillDescriptions(edm::ConfigurationDescriptions
desc.add<bool>("do_xi", true)->setComment("flag to require xi matching");
desc.add<bool>("do_my", false)->setComment("flag to require m,y matching");

descriptions.addWithDefaultLabel(desc);
descriptions.add("hltppsJetComparisonFilterDefault", desc);
Copy link
Contributor

Choose a reason for hiding this comment

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

Revert, addWithDefaultLabel is preferred.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, it's not the same. With .add I'm creating a file hltppsJetComparisonFilterDefault_cfi.py, and addWithDefaultLabel would create a file hltppsJetComparisonFilter_cfi.py. This is needed so that hltppsJetComparisonFilter_cfi.py I added in this could override and import params from hltppsJetComparisonFilterDefault_cfi.py.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted cause overriding hltppsJetComparisonFilter_cfi.py turned out to be unnecessary

@@ -0,0 +1,8 @@
from Validation.CTPPS.hltppsJetComparisonFilterDefault_cfi import HLTPPSJetComparisonFilterDefault as _HLTPPSJetComparisonFilterDefault
Copy link
Contributor

Choose a reason for hiding this comment

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

in any case from Validation.CTPPS.... doens't look right if you are planning to making it derive from the fillDescriptions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right, fixing it rn

Copy link
Contributor

Choose a reason for hiding this comment

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

this file has no reason to be, please remove it.

@Glitchmin
Copy link
Contributor Author

Ok, I didn't know this filter would use only Run 3 data. Therefore useNewLHCInfo can be set only to true and the _cfi file is not needed

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43951/38831

  • This PR adds an extra 20KB to repository

@cmsbuild
Copy link
Contributor

Pull request #43951 was updated. @cmsbuild, @mmusich, @Martin-Grunewald can you please check and sign again.

@Glitchmin Glitchmin changed the title CTPPS update HLTPPSJetComparisonFilter to use LHCInfoCombiend CTPPS update HLTPPSJetComparisonFilter to use LHCInfoCombined Feb 13, 2024
@Glitchmin
Copy link
Contributor Author

Please look at the updates again. This time I updated the module so that it only uses new LHCInfoPer* records

@mmusich
Copy link
Contributor

mmusich commented Feb 13, 2024

Please look at the updates again. This time I updated the module so that it only uses new LHCInfoPer* records

looks good. Will run tests here and also TSG integration tests.

@mmusich
Copy link
Contributor

mmusich commented Feb 13, 2024

@cmsbuild, please test

@Martin-Grunewald
Copy link
Contributor

Please prepare a backport PR for 14_0.

@mmusich
Copy link
Contributor

mmusich commented Feb 13, 2024

type ctpps

@mmusich
Copy link
Contributor

mmusich commented Feb 13, 2024

Please prepare a backport PR for 14_0.

@Glitchmin, to speed up integration (deadline tomorrow) I took the liberty of opening #43954

@mmusich
Copy link
Contributor

mmusich commented Feb 13, 2024

This PR has been tested successfully with the trigger path proposal at https://its.cern.ch/jira/browse/CMSHLT-3030 with:

cmsrel CMSSW_14_0_0_pre3
cd CMSSW_14_0_0_pre3/src/
cmsenv
git cms-addpkg HLTrigger/special
git remote add CTPPS git@github.com:CTPPS/cmssw.git
git fetch CTPPS
git cherry-pick 6e4e6b85c48d7734d7b25788980243e38b6424b8
scram b -j 20
hltIntegrationTests /users/musich/tests/dev/CMSSW_14_0_0/CMSHLT-3030/HLT/V2 --setup /users/musich/tests/dev/CMSSW_14_0_0/CMSHLT-3030/GRun/V1 -n -1 --input /store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root -x "--globaltag 140X_dataRun3_HLT_Candidate_2024_02_12_21_27_47" -x "--no-output" -x "--eras Run3 --l1-emu uGT --l1 L1Menu_Collisions2023_v1_3_0_xml" -d hltIntegTest4 

without this PR the test failed.

@Glitchmin
Copy link
Contributor Author

Please prepare a backport PR for 14_0.

@Glitchmin, to speed up integration (deadline tomorrow) I took the liberty of opening #43954

Ok, thank you very much. Is there something more that needs to be done before the deadline?

@mmusich
Copy link
Contributor

mmusich commented Feb 13, 2024

Is there something more that needs to be done before the deadline?

I think we should be OK with this for the time being.

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-74b7bd/37429/summary.html
COMMIT: 6e4e6b8
CMSSW: CMSSW_14_1_X_2024-02-13-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/43951/37429/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@mmusich
Copy link
Contributor

mmusich commented Feb 14, 2024

+hlt

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @sextonkennedy, @antoniovilela, @rappoccio (and backports should be raised in the release meeting by the corresponding L2)

@antoniovilela
Copy link
Contributor

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants