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
[DQM] esConsumes migration for Validation package leftovers #34604
Merged
Merged
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
30fdc43
Not building changes to JetCorrector
jfernan2 ae14ab3
Buils but I don't know if problem is fixed
jfernan2 33db642
Revert comment
jfernan2 0d84b83
Fixed esConsumes in getJetCorrector
jfernan2 265b517
Fixed esConsumes for MuonTrackValidator module
jfernan2 05b5120
Fixed esConsumes for BDHadronTrackMonitoringAnalyzer module
jfernan2 1ef638e
Code format
jfernan2 7d0c451
Changes in JetCorrector to inherited classes
jfernan2 68188fd
Last fix to JetCorrector
jfernan2 283ec8d
Code format
jfernan2 9e53f92
Comments from git PR
jfernan2 3a1f829
Comments from git PR
jfernan2 a64422a
Additional protection
jfernan2 16b1bf0
Code format
jfernan2 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -505,39 +505,38 @@ namespace SingleTopTChannelLepton { | |
return; | ||
} | ||
|
||
edm::Handle<reco::JetCorrector> corrector; | ||
/*edm::Handle<reco::JetCorrector> corrector; | ||
event.getByToken(mJetCorrector, corrector); | ||
if (!event.getByToken(mJetCorrector, corrector)) | ||
return; | ||
return;*/ | ||
// load jet | ||
// corrector if configured such | ||
// const JetCorrector* corrector = 0; | ||
// if (!jetCorrector_.empty()) { | ||
|
||
// check whether a jet correcto is in the event setup or not | ||
// if (setup.find(edm::eventsetup::EventSetupRecordKey::makeKey< | ||
// JetCorrectionsRecord>())) { | ||
// corrector = JetCorrector::getJetCorrector(jetCorrector_, setup); | ||
// } else { | ||
// edm::LogVerbatim("SingleTopTChannelLeptonDQM") | ||
// << "\n" | ||
// << "-----------------------------------------------------------------" | ||
// "-------------------- \n" | ||
// << " No JetCorrectionsRecord available from EventSetup:\n" | ||
// << " - Jets will not be corrected.\n" | ||
// << " - If you want to change this add the following lines to your " | ||
// "cfg file:\n" | ||
// << "\n" | ||
// << " ## load jet corrections\n" | ||
// << " " | ||
// "process.load(\"JetMETCorrections.Configuration." | ||
// "JetCorrectionServicesAllAlgos_cff\") \n" | ||
// << " process.prefer(\"ak5CaloL2L3\")\n" | ||
// << "\n" | ||
// << "-----------------------------------------------------------------" | ||
// "-------------------- \n"; | ||
// } | ||
//} | ||
const JetCorrector* corrector = nullptr; | ||
if (!jetCorrector_.isInitialized()) { | ||
// check whether a jet correcto is in the event setup or not | ||
if (setup.find(edm::eventsetup::EventSetupRecordKey::makeKey<JetCorrectionsRecord>())) { | ||
corrector = &setup.getData(jetCorrector_); | ||
; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ??? |
||
} else { | ||
edm::LogVerbatim("SingleTopTChannelLeptonDQM") | ||
<< "\n" | ||
<< "-----------------------------------------------------------------" | ||
"-------------------- \n" | ||
<< " No JetCorrectionsRecord available from EventSetup:\n" | ||
<< " - Jets will not be corrected.\n" | ||
<< " - If you want to change this add the following lines to your " | ||
"cfg file:\n" | ||
<< "\n" | ||
<< " ## load jet corrections\n" | ||
<< " " | ||
"process.load(\"JetMETCorrections.Configuration." | ||
"JetCorrectionServicesAllAlgos_cff\") \n" | ||
<< " process.prefer(\"ak5CaloL2L3\")\n" | ||
<< "\n" | ||
<< "-----------------------------------------------------------------" | ||
"-------------------- \n"; | ||
} | ||
} | ||
// loop jet collection | ||
std::vector<reco::Jet> correctedJets; | ||
std::vector<double> JetTagValues; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove this commented out code, as it is not needed any more