Fixed JetMET summary plot for HI DQM #25034
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
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 |
|---|---|---|
|
|
@@ -61,6 +61,8 @@ DataCertificationJetMET::DataCertificationJetMET(const edm::ParameterSet& iConfi | |
| metTests[1][1] = conf_.getUntrackedParameter<bool>("pfMETKSTest",false); | ||
| metTests[2][0] = conf_.getUntrackedParameter<bool>("tcMETMeanTest",true); | ||
| metTests[2][1] = conf_.getUntrackedParameter<bool>("tcMETKSTest",false); | ||
|
|
||
| isHI = conf_.getUntrackedParameter<bool>("isHI",false); | ||
|
|
||
| if (verbose_) std::cout << ">>> Constructor (DataCertificationJetMET) <<<" << std::endl; | ||
|
|
||
|
|
@@ -603,43 +605,84 @@ DataCertificationJetMET::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& | |
| MonitorElement *meJetEMFrac[4]; | ||
| MonitorElement *meJetConstituents[4]; | ||
| RunDir = ""; | ||
| if (RunDir.empty()) newHistoName = "JetMET/Jet/"; | ||
| else newHistoName = RunDir+"/JetMET/Runsummary/Jet/"; | ||
| std::string cleaningdir = ""; | ||
| cleaningdir = "Cleaned"; | ||
|
|
||
| // Read different histograms for PbPb and pp collisions | ||
|
|
||
| if(isHI){ // Histograms for heavy ions | ||
|
|
||
| newHistoName = "JetMET/HIJetValidation/"; | ||
| cleaningdir = ""; | ||
|
|
||
| //Jet Phi histos | ||
| meJetPhi[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Cs4PFJets/Phi"); | ||
| meJetPhi[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu3PFJets/Phi"); | ||
| meJetPhi[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4PFJets/Phi"); | ||
| meJetPhi[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4CaloJets/Phi"); | ||
|
|
||
| //Jet Eta histos | ||
| meJetEta[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Cs4PFJets/Eta"); | ||
| meJetEta[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu3PFJets/Eta"); | ||
| meJetEta[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4PFJets/Eta"); | ||
| meJetEta[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4CaloJets/Eta"); | ||
|
|
||
| //Jet Pt histos | ||
| meJetPt[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Cs4PFJets/Pt"); | ||
| meJetPt[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu3PFJets/Pt"); | ||
| meJetPt[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4PFJets/Pt"); | ||
| meJetPt[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4CaloJets/Pt"); | ||
|
|
||
| //Jet Constituents histos | ||
| meJetConstituents[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Cs4PFJets/Constituents"); | ||
| meJetConstituents[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu3PFJets/Constituents"); | ||
| meJetConstituents[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4PFJets/Constituents"); | ||
| meJetConstituents[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"Pu4CaloJets/Constituents"); | ||
|
|
||
| //There are no jet EMFrac histograms for HI. Dummy paths will pass the tests by default | ||
| meJetEMFrac[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"dummy/dummy"); | ||
| meJetEMFrac[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"dummy/dummy"); | ||
| meJetEMFrac[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"dummy/dummy"); | ||
| meJetEMFrac[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"dummy/dummy"); | ||
|
|
||
|
|
||
| } else { // Histograms for protons | ||
|
|
||
| //Jet Phi histos | ||
| meJetPhi[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Phi_Barrel"); | ||
| meJetPhi[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Phi_EndCap"); | ||
| meJetPhi[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Phi_Forward"); | ||
| meJetPhi[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"CaloJets/Phi"); | ||
| //meJetPhi[4] = iget_.get(newHistoName+cleaningdir+"JetPlusTrackZSPCorJetAntiKt5/Phi"); | ||
|
|
||
| //Jet Eta histos | ||
| meJetEta[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Eta"); | ||
| meJetEta[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Eta"); | ||
| meJetEta[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/EtaFirst"); | ||
| meJetEta[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"CaloJets/Eta"); | ||
| //meJetEta[4] = iget_.get(newHistoName+cleaningdir+"JetPlusTrackZSPCorJetAntiKt5/Eta"); | ||
|
There was a problem hiding this comment. I'd guess so. That is the pp part of the code that I did not touch in this commit (except by moving it inside the else block). There was a problem hiding this comment. As this is a backport of #24993 and that PR is already merged to master, I would prefer not to remove these commented out parts of code here either for consistency. |
||
|
|
||
| //Jet Pt histos | ||
| meJetPt[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Pt_Barrel"); | ||
| meJetPt[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Pt_EndCap"); | ||
| meJetPt[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Pt_Forward"); | ||
| meJetPt[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"CaloJets/Pt_2"); | ||
|
|
||
| //Jet Constituents histos | ||
| meJetConstituents[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Constituents_Barrel"); | ||
| meJetConstituents[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Constituents_EndCap"); | ||
| meJetConstituents[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/Constituents_Forward"); | ||
| meJetConstituents[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"CaloJets/Constituents"); | ||
|
|
||
| //Jet EMFrac histos | ||
| meJetEMFrac[0] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/EFrac_Barrel"); | ||
| meJetEMFrac[1] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/EFrac_EndCap"); | ||
| meJetEMFrac[2] = iget_.get(newHistoName+cleaningdir+jetAlgo+"PFJets/EFrac_Forward"); | ||
| meJetEMFrac[3] = iget_.get(newHistoName+cleaningdir+jetAlgo+"CaloJets/EFrac"); | ||
|
|
||
| } | ||
|
|
||
| //------------------------------------------------------------------------------ | ||
| //--- Extract quality test results and fill data certification results for Jets | ||
|
|
@@ -870,6 +913,12 @@ DataCertificationJetMET::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& | |
| reportSummaryMap->Fill(2, 4-jtyp, dc_Jet[jtyp]); | ||
| } | ||
|
|
||
| // There is nothing on the first row for HI, so mark the unfilled | ||
| if(isHI){ | ||
| CertificationSummaryMap->Fill(2, 0, -2); | ||
| reportSummaryMap->Fill(2, 0, -2); | ||
| } | ||
|
|
||
| //----------------------------- | ||
| // MET DQM Data Certification | ||
| //----------------------------- | ||
|
|
@@ -882,7 +931,7 @@ DataCertificationJetMET::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& | |
| MonitorElement *meMETPhi[2]; | ||
|
|
||
| RunDir = ""; | ||
| if (RunDir.empty()) newHistoName = "JetMET/MET/"; | ||
| else newHistoName = RunDir+"/JetMET/Runsummary/MET/"; | ||
|
|
||
| metFolder = "Cleaned"; | ||
|
|
@@ -1090,6 +1139,13 @@ DataCertificationJetMET::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& | |
| reportSummaryMap->Fill(1, 4-mtyp, dc_MET[mtyp]); | ||
| } | ||
|
|
||
| // There is nothing on the first three rows for HI, so mark them unfilled | ||
| if(isHI){ | ||
| for(int i = 0; i < 3; i++){ | ||
| CertificationSummaryMap->Fill(1, i, -2); | ||
| reportSummaryMap->Fill(1, i, -2); | ||
| } | ||
| } | ||
|
|
||
| //---------------------------------------------------------------------------- | ||
| //--- Extract quality test results and fill data certification results for MET | ||
|
|
||
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.
Is this removable?
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.
I'd guess so. That is the pp part of the code that I did not touch in this commit (except by moving it inside the else block).
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.
As this is a backport of #24993 and that PR is already merged to master, I would prefer not to remove these commented out parts of code here either for consistency.
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.
@vargasa Do you think it is better to keep the code consistent with #24993 or remove these two lines of commented code? It does no harm to remove them from the backport if necessary.
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.
@jusaviin Please double check nothing is broken in the repo history by removing them, and if so. I'd suggest to remove them. So we can keep the code cleaner :)
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.
I checked that those lines have been commented out sometime in 2014. Most likely not needed ever again. I removed the lines and committed the update.