-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
added hep17 folder, 2d eff plots for egammaHLT DQM and Validation #19699
Merged
cmsbuild
merged 6 commits into
cms-sw:master
from
sushilchauhan:egammaHLTOffDQM_HEP17_2DEffPlots
Oct 17, 2017
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8b49fd1
added hep17 folder, 2d eff plots for egammaHLT DQM and Validation
sushilchauhan d1016aa
removed std:cout from EmDQMPostProcessor
sushilchauhan efd95ef
minor fix
sushilchauhan 8f658da
minor changes
sushilchauhan 74ab5b6
applied patch to resolve code style issue
sushilchauhan c8fbfae
minor fix for if() condition in EmDQMPostProcessor.cc
sushilchauhan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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 |
---|---|---|
|
@@ -13,6 +13,7 @@ | |
#include "DQMOffline/Trigger/interface/EgHLTOffPho.h" | ||
#include "DQMOffline/Trigger/interface/EgHLTMonElemWithCut.h" | ||
#include "DQMOffline/Trigger/interface/EgHLTMonElemMgrEBEE.h" | ||
#include "DQMOffline/Trigger/interface/EgHLTMonElemMgrHEP.h" | ||
#include "DQMOffline/Trigger/interface/EgHLTDQMCut.h" | ||
#include "DQMOffline/Trigger/interface/EgHLTMonElemContainer.h" | ||
#include "DQMOffline/Trigger/interface/EgHLTBinData.h" | ||
|
@@ -44,6 +45,9 @@ namespace egHLT { | |
void initStdEffHists(std::vector<MonElemWithCutBase<OffPho>*>& histVec,const std::string& filterName,const std::string& baseName,int nrBins,double xMin,double xMax,float (OffPho::*vsVarFunc)()const,const CutMasks& masks); | ||
void initStdEffHists(std::vector<MonElemWithCutBase<OffPho>*>& histVec,const std::string& filterName,const std::string& baseName,const BinData::Data1D& bins,float (OffPho::*vsVarFunc)()const,const CutMasks& masks); | ||
|
||
//for hep region plots | ||
void initStdEleHistsHEP(std::vector<MonElemManagerBase<OffEle>*>& histVec,const std::string& filterName,const std::string& baseName,const BinData& bins); | ||
void initStdPhoHistsHEP(std::vector<MonElemManagerBase<OffPho>*>& histVec,const std::string& filterName,const std::string& baseName,const BinData& bins); | ||
//we own the passed in pointer | ||
void initStdEleCutHists(std::vector<MonElemWithCutBase<OffEle>*>& histVec,const std::string& filterName,const std::string& baseName,const BinData& bins,EgHLTDQMCut<OffEle>* cut=nullptr); | ||
void initStdPhoCutHists(std::vector<MonElemWithCutBase<OffPho>*>& histVec,const std::string& filterName,const std::string& baseName,const BinData& bins,EgHLTDQMCut<OffPho>* cut=nullptr); | ||
|
@@ -84,6 +88,10 @@ namespace egHLT { | |
histVec.push_back(new MonElemMgrEBEE<T,varType>(iBooker, name,title,binData.nr,binData.min,binData.max,varFunc)); | ||
} | ||
|
||
template<class T,typename varType> void addStdHistHEP( std::vector<MonElemManagerBase<T>*>& histVec,const std::string& name,const std::string& title, | ||
const BinData::Data1D& binData,varType (T::*varFunc)()const){ | ||
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. the new template looks to be the exact same thing as the old one? 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. ah - its a MonELemMgrHEP..:( got it |
||
histVec.push_back(new MonElemMgrHEP<T,varType>(iBooker, name,title,binData.nr,binData.min,binData.max,varFunc)); | ||
} | ||
//this function is special in that it figures out the Et cut from the trigger name | ||
//it then passes the cut as normal into the other addTightLooseTrigHist functions | ||
//it also makes an uncut et distribution | ||
|
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 |
---|---|---|
@@ -0,0 +1,59 @@ | ||
#ifndef DQMOFFLINE_TRIGGER_EGHLTMONELEMMGRHEP | ||
#define DQMOFFLINE_TRIGGER_EGHLTMONELEMMGRHEP | ||
|
||
|
||
#include "DQMOffline/Trigger/interface/EgHLTMonElemManager.h" | ||
|
||
namespace egHLT { | ||
template<class T,typename varType> class MonElemMgrHEP : public MonElemManagerBase<T>{ | ||
private: | ||
MonElemManager<T,varType> hep17_; | ||
MonElemManager<T,varType> hem17_; | ||
|
||
public: | ||
MonElemMgrHEP(DQMStore::IBooker &iBooker, const std::string& name,const std::string& title,int nrBins,float min,float max,varType (T::*varFunc)()const): | ||
hep17_(iBooker, name+"_hep17","hep "+title,nrBins,min,max,varFunc), | ||
hem17_(iBooker, name+"_hem17","hem "+title,nrBins,min,max,varFunc){} | ||
|
||
~MonElemMgrHEP() override{} | ||
|
||
void fill(const T& obj,float weight) override; | ||
|
||
}; | ||
|
||
template<class T,typename varType> void MonElemMgrHEP<T,varType>::fill(const T& obj,float weight) | ||
{ | ||
if(obj.detEta()<3.0 && obj.detEta()>1.3 && obj.phi()< -0.52 && obj.phi()>-0.87) hep17_.fill(obj,weight); | ||
if(obj.detEta()>-3.0 && obj.detEta()<-1.3 && obj.phi()< -0.52 && obj.phi() >-0.87) hem17_.fill(obj,weight); | ||
} | ||
|
||
|
||
|
||
|
||
|
||
template<class T,typename varTypeX,typename varTypeY> class MonElemMgr2DHEP : public MonElemManagerBase<T>{ | ||
|
||
private: | ||
MonElemManager2D<T,varTypeX,varTypeY> hep17_; | ||
MonElemManager2D<T,varTypeX,varTypeY> hem17_; | ||
|
||
public: | ||
MonElemMgr2DHEP(DQMStore::IBooker &iBooker, const std::string& name,const std::string& title,int nrBinsX,double xMin,double xMax,int nrBinsY,double yMin,double yMax, | ||
varTypeX (T::*varFuncX)()const,varTypeY (T::*varFuncY)()const): | ||
hep17_(iBooker, name+"_hep17","Hep17 "+title,nrBinsX,xMin,xMax,nrBinsY,yMin,yMax,varFuncX,varFuncY), | ||
hem17_(iBooker, name+"_hem17","Hem17 "+title,nrBinsX,xMin,xMax,nrBinsY,yMin,yMax,varFuncX,varFuncY){} | ||
|
||
~MonElemMgr2DHEP(){} | ||
|
||
void fill(const T& obj,float weight); | ||
|
||
}; | ||
|
||
template<class T,typename varTypeX,typename varTypeY> void MonElemMgr2DHEP<T,varTypeX,varTypeY>::fill(const T& obj,float weight) | ||
{ | ||
if(obj.detEta()<3.0 && obj.detEta()>1.3 && obj.phi()< -0.52 && obj.phi()>-0.87) hep17_.fill(obj,weight); | ||
if(obj.detEta()>-3.0 && obj.detEta()<-1.3 && obj.phi()< -0.52 && obj.phi() >-0.87) hem17_.fill(obj,weight); | ||
} | ||
} | ||
#endif | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import FWCore.ParameterSet.Config as cms | ||
from DQMServices.Core.DQMEDHarvester import DQMEDHarvester | ||
|
||
hep17Efficiency = DQMEDHarvester("DQMGenericClient", | ||
subDirs = cms.untracked.vstring("HLT/EgOffline/HEP17/*"), | ||
verbose = cms.untracked.uint32(0), # Set to 2 for all messages | ||
resolution = cms.vstring(), | ||
efficiency = cms.vstring( | ||
"ratio_et 'HEP17/HEM17; Et [GeV]; ratio' egamma_passFilter_et_hep17 egamma_passFilter_et_hem17", | ||
"ratio_hOverE 'HEP17/HEM17; hOverE; ratio' egamma_passFilter_hOverE_hep17 egamma_passFilter_hOverE_hem17", | ||
# "ratio_isolEM 'HEP17/HEM17; isolEM [GeV]; ratio' egamma_passFilter_isolEM_hep17 egamma_passFilter_isolEM_hem17", | ||
# "ratio_isolHad 'HEP17/HEM17; isolHad [GeV]; ratio' egamma_passFilter_isolHad_hep17 egamma_passFilter_isolHad_hem17", | ||
"ratio_sigmaIEtaIEta 'HEP17/HEM17; sigmaIEtaIEta; ratio' egamma_passFilter_sigmaIEtaIEta_hep17 egamma_passFilter_sigmaIEtaIEta_hem17", | ||
"ratio_energy 'HEP17/HEM17; energy [GeV]; ratio' egamma_passFilter_energy_hep17 egamma_passFilter_energy_hem17", | ||
"ratio_r9 'HEP17/HEM17; r9 ;ratio' egamma_passFilter_maxr9_hep17 egamma_passFilter_maxr9_hem17", | ||
|
||
"ratio_phi 'HEP17/HEM17; phi [rad] ;ratio' egamma_passFilter_phi_hep17 egamma_passFilter_phi_hem17", | ||
# "ratio_isolNrTrks 'HEP17/HEM17; isolNrTrks [GeV]; ratio' egamma_passFilter_isolNrTrks_hep17 egamma_passFilter_isolNrTrks_hem17", | ||
"ratio_etSC 'HEP17/HEM17; etSC [GeV]; ratio' egamma_passFilter_etSC_hep17 egamma_passFilter_etSC_hem17", | ||
"ratio_HLTenergy HEP17/HEM17; HLTenergy [GeV]; ratio' egamma_passFilter_HLTenergy_hep17 egamma_passFilter_HLTenergy_hem17", | ||
"ratio_HLTphi 'HEP17/HEM17; HLTphi [rad]; ratio' egamma_passFilter_HLTphi_hep17 egamma_passFilter_HLTphi_hem17", | ||
), | ||
efficiencyProfile = cms.untracked.vstring( | ||
), | ||
|
||
) |
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
Oops, something went wrong.
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.
are you sure ?
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.
otherwise they were similar to:
HLTISOLTRKSPHO=0x00020000,
HLTISOLHAD =0x00040000,
HLTISOLEM =0x00080000
I ask Gabi and she also thinks its a bug.