Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 74605
b: "refs/heads/CMSSW_7_1_X"
c: 976ffd8
h: "refs/heads/CMSSW_7_1_X"
i:
  74603: 8387c4f
v: v3
  • Loading branch information
Jason Michael Slaunwhite committed Oct 2, 2009
1 parent ac8721e commit 8e57185
Show file tree
Hide file tree
Showing 12 changed files with 386 additions and 205 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
"refs/heads/CMSSW_7_1_X": e359c174529eb0c97007c2b4a59a0f1df3d3b7f0
"refs/heads/CMSSW_7_1_X": 976ffd82c1fd123eeb38931e901756815b10a980
33 changes: 22 additions & 11 deletions trunk/DQMOffline/Trigger/interface/HLTMuonMatchAndPlot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
* Documentation available on the CMS TWiki:
* https://twiki.cern.ch/twiki/bin/view/CMS/MuonHLTOfflinePerformance
*
* $Date: 2009/08/14 13:29:13 $
* $Revision: 1.6 $
* \author M. Vander Donckt, J. Klukas (copied from J. Alcaraz)
* \author J. Slaunwhite (modified from above
* $Date: 2009/08/25 10:03:25 $
* $Revision: 1.7 $
*
* \author J. Slaunwhite, based on code from Jeff Klukas
*/

// Base Class Headers
Expand Down Expand Up @@ -110,6 +110,7 @@ class HLTMuonMatchAndPlot {
virtual void begin ( );
virtual void analyze( const edm::Event & iEvent );
virtual void finish ( );
virtual void endRun (const edm::Run& r, const edm::EventSetup& c);
virtual MonitorElement* bookIt ( TString name, TString title, std::vector<double> );
virtual MonitorElement* bookIt ( TString name, TString title, int nbins, float* xBinLowEdges);

Expand Down Expand Up @@ -197,6 +198,14 @@ class HLTMuonMatchAndPlot {

bool virtual applyTriggerSelection (MuonSelectionStruct mySelection, const edm::Event & event);

// boolean to turn on/off overflow inclusion
// function to do the overflow
bool includeOverflow;
void moveOverflow (MonitorElement * myElement);

// keep track of the ME's you've booked,
// rebin them at job end.
std::vector<MonitorElement*> booked1DMonitorElements;

// Data members

Expand Down Expand Up @@ -259,7 +268,7 @@ class HLTMuonMatchAndPlot {
// to simplify charge plots

static const int POS_CHARGE = 1;
static const int NEG_CHARGE = 0;
static const int NEG_CHARGE = -1;
int getCharge (int pdgId);

// 1-D histogram paramters
Expand All @@ -280,13 +289,15 @@ class HLTMuonMatchAndPlot {
int numBinsInPtHisto;

// 2-D histogram parameters
std::vector<double> theMaxPtParameters2d;
std::vector<double> theEtaParameters2d;
std::vector<double> thePhiParameters2d;
std::vector<double> thePhiEtaParameters2d;
std::vector<double> theDeltaPhiVsPhiParameters;
std::vector<double> theDeltaPhiVsZ0Parameters;
std::vector<double> theDeltaPhiVsD0Parameters;

// std::vector<double> theMaxPtParameters2d;
// std::vector<double> theEtaParameters2d;
// std::vector<double> thePhiParameters2d;

// std::vector<double> theDeltaPhiVsPhiParameters;
// std::vector<double> theDeltaPhiVsZ0Parameters;
// std::vector<double> theDeltaPhiVsD0Parameters;


// Resolution hisotgram parameters
Expand Down
14 changes: 7 additions & 7 deletions trunk/DQMOffline/Trigger/python/BPAGTrigRateAnalyzer_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@

# Set the ranges and numbers of bins for histograms
# max pt is not very useful
MaxPtParameters = cms.vdouble(40,0.,80.),
MaxPtParameters = cms.untracked.vdouble(40,0.,80.),
# PtParmeters is the low bin edges, with size = nbins + 1
PtParameters = cms.vdouble(0.0, 3.0, 4.5, 6, 8, 20.0),
EtaParameters = cms.vdouble(4, -2.1,2.1),
PhiParameters = cms.vdouble(4, -3.15,3.15),
ResParameters = cms.vdouble(50, -0.15, 0.15),
DrParameters = cms.vdouble(50, 0.0, 0.05),
PtParameters = cms.untracked.vdouble(0.0, 3.0, 4.5, 6, 8, 20.0),
EtaParameters = cms.untracked.vdouble(4, -2.1,2.1),
PhiParameters = cms.untracked.vdouble(4, -3.15,3.15),
ResParameters = cms.untracked.vdouble(50, -0.15, 0.15),
DrParameters = cms.untracked.vdouble(50, 0.0, 0.05),

MassParameters = cms.untracked.vdouble(50, 2.6, 3.6),

Expand All @@ -83,7 +83,7 @@

# still used by overlap analyzer
# not included in meaningful output
CrossSection = cms.double(0.97),
#CrossSection = cms.double(0.97),
# ddd
#NSigmas90 = cms.untracked.vdouble(3.0, 3.0, 3.0, 3.0),

Expand Down
3 changes: 2 additions & 1 deletion trunk/DQMOffline/Trigger/python/MuonPostProcessor_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
verbose = cms.untracked.uint32(0), # Set to 2 for all messages
outputFileName = cms.untracked.string(''),
commands = cms.vstring(),
resolution = cms.vstring(),
resolution = cms.vstring(),

efficiency = cms.vstring(

#### Comma Checking --- check for trailing commas by searching
Expand Down
27 changes: 13 additions & 14 deletions trunk/DQMOffline/Trigger/python/MuonTrigRateAnalyzer_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,28 +57,27 @@

# Set the ranges and numbers of bins for histograms
# max pt is not very useful
MaxPtParameters = cms.vdouble(25,0.,100.),
#MaxPtParameters = cms.vdouble(25,0.,100.),
# PtParmeters is not currently used

EtaParameters = cms.vdouble(25, -3.5,3.5),
PhiParameters = cms.vdouble(25, -3.15,3.15),
ResParameters = cms.vdouble(25, -0.15, 0.15),
DrParameters = cms.vdouble(25, 0.0, 0.05),
EtaParameters = cms.untracked.vdouble(40, -2.1,2.1),
PhiParameters = cms.untracked.vdouble(40, -3.15,3.15),
ResParameters = cms.untracked.vdouble(25, -0.15, 0.15),
DrParameters = cms.untracked.vdouble(25, 0.0, 0.05),

# Use Pt Parameters to set bin edges

PtParameters = cms.vdouble(0.0, 2.0, 4.0,
PtParameters = cms.untracked.vdouble(0.0, 2.0, 4.0,
6.0, 8.0, 10.0,
12.0, 14.0, 16.0,
18.0, 20.0,
22.0, 24.0, 26.0, 28.0,
30.0, 32.0, 34.0, 36.0,
38.0, 40.0,
45.0, 50.0, 55.0, 60.0,
65.0, 70.0, 75.0, 80.0,
85.0, 90.0, 95.0, 100.0,
25.0, 30.0, 35.0, 40.0,
50.0, 60.0, 70, 80, 90, 100.0,
125.0, 150.0, 175.0, 200.0,
300.0),
400.0),

Z0Parameters = cms.untracked.vdouble(25, -25, 25),
D0Parameters = cms.untracked.vdouble(25, -1, 1),

# valid match types are dr and cosmic
# future update: make sure default is
Expand All @@ -97,7 +96,7 @@

# still used by overlap analyzer
# not included in meaningful output
CrossSection = cms.double(0.97),
#CrossSection = cms.double(0.97),
# ddd
#NSigmas90 = cms.untracked.vdouble(3.0, 3.0, 3.0, 3.0),

Expand Down
31 changes: 16 additions & 15 deletions trunk/DQMOffline/Trigger/python/MuonTrigRateAnalyzer_cosmics_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,28 +57,29 @@

# Set the ranges and numbers of bins for histograms
# max pt is not very useful
MaxPtParameters = cms.vdouble(25,0.,100.),
#MaxPtParameters = cms.vdouble(25,0.,100.),
# PtParmeters is not currently used

EtaParameters = cms.vdouble(25, -3.5,3.5),
PhiParameters = cms.vdouble(25, -3.15,3.15),
ResParameters = cms.vdouble(25, -0.15, 0.15),
DrParameters = cms.vdouble(25, 0.0, 0.05),
EtaParameters = cms.untracked.vdouble(40, -2.1,2.1),
PhiParameters = cms.untracked.vdouble(40, -3.15,3.15),
ResParameters = cms.untracked.vdouble(25, -0.15, 0.15),
DrParameters = cms.untracked.vdouble(25, 0.0, 0.05),

# Use Pt Parameters to set bin edges

PtParameters = cms.vdouble(0.0, 2.0, 4.0,
PtParameters = cms.untracked.vdouble(0.0, 2.0, 4.0,
6.0, 8.0, 10.0,
12.0, 14.0, 16.0,
18.0, 20.0,
22.0, 24.0, 26.0, 28.0,
30.0, 32.0, 34.0, 36.0,
38.0, 40.0,
45.0, 50.0, 55.0, 60.0,
65.0, 70.0, 75.0, 80.0,
85.0, 90.0, 95.0, 100.0,
25.0, 30.0, 35.0, 40.0,
50.0, 60.0, 70, 80, 90, 100.0,
125.0, 150.0, 175.0, 200.0,
300.0),
400.0),

Z0Parameters = cms.untracked.vdouble(25, -50, 50),
D0Parameters = cms.untracked.vdouble(25, -25, 25),



# valid match types are dr and cosmic
# future update: make sure default is
Expand All @@ -89,8 +90,8 @@
# you will ignore the delta R cuts

L1DrCut = cms.untracked.double(0.4),
L2DrCut = cms.untracked.double(0.25),
L3DrCut = cms.untracked.double(0.025),
L2DrCut = cms.untracked.double(0.4),
L3DrCut = cms.untracked.double(0.4),


DQMStore = cms.untracked.bool(True),
Expand Down
31 changes: 24 additions & 7 deletions trunk/DQMOffline/Trigger/python/TopTrigRateAnalyzer_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,30 @@

# Set the ranges and numbers of bins for histograms
# max pt is not very useful
MaxPtParameters = cms.vdouble(40,0.,80.),
# PtParmeters is not currently used
PtParameters = cms.vdouble(50,0.,80.),
EtaParameters = cms.vdouble(50, -3.5,3.5),
PhiParameters = cms.vdouble(50, -3.15,3.15),
ResParameters = cms.vdouble(50, -0.15, 0.15),
DrParameters = cms.vdouble(50, 0.0, 0.05),


#EtaParameters = cms.vdouble(50, -3.5,3.5),

EtaParameters = cms.untracked.vdouble(40, -2.1,2.1),
PhiParameters = cms.untracked.vdouble(40, -3.15,3.15),
ResParameters = cms.untracked.vdouble(25, -0.15, 0.15),
DrParameters = cms.untracked.vdouble(25, 0.0, 0.05),

# Use Pt Parameters to set bin edges

PtParameters = cms.untracked.vdouble(0.0, 2.0, 4.0,
6.0, 8.0, 10.0,
12.0, 14.0, 16.0,
18.0, 20.0,
25.0, 30.0, 35.0, 40.0,
50.0, 60.0, 70, 80, 90, 100.0,
125.0, 150.0, 175.0, 200.0,
400.0),

Z0Parameters = cms.untracked.vdouble(25, -25, 25),
D0Parameters = cms.untracked.vdouble(25, -1, 1),




# valid match types are dr and cosmic
Expand Down
32 changes: 21 additions & 11 deletions trunk/DQMOffline/Trigger/python/TopTrigRateAnalyzer_cosmics_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,25 @@

# Set the ranges and numbers of bins for histograms
# max pt is not very useful
MaxPtParameters = cms.vdouble(40,0.,80.),
# PtParmeters is not currently used
PtParameters = cms.vdouble(50,0.,80.),
EtaParameters = cms.vdouble(50, -3.5,3.5),
PhiParameters = cms.vdouble(50, -3.15,3.15),
ResParameters = cms.vdouble(50, -0.15, 0.15),
DrParameters = cms.vdouble(50, 0.0, 0.05),
EtaParameters = cms.untracked.vdouble(40, -2.1,2.1),
PhiParameters = cms.untracked.vdouble(40, -3.15,3.15),
ResParameters = cms.untracked.vdouble(25, -0.15, 0.15),
DrParameters = cms.untracked.vdouble(25, 0.0, 0.05),

# Use Pt Parameters to set bin edges

PtParameters = cms.untracked.vdouble(0.0, 2.0, 4.0,
6.0, 8.0, 10.0,
12.0, 14.0, 16.0,
18.0, 20.0,
25.0, 30.0, 35.0, 40.0,
50.0, 60.0, 70, 80, 90, 100.0,
125.0, 150.0, 175.0, 200.0,
400.0),

Z0Parameters = cms.untracked.vdouble(25, -50, 50),
D0Parameters = cms.untracked.vdouble(25, -25, 25),



# valid match types are dr and cosmic
Expand All @@ -86,10 +98,8 @@
# you will ignore the delta R cuts

L1DrCut = cms.untracked.double(0.4),
L2DrCut = cms.untracked.double(0.25),
L3DrCut = cms.untracked.double(0.025),


L2DrCut = cms.untracked.double(0.4),
L3DrCut = cms.untracked.double(0.4),
DQMStore = cms.untracked.bool(True),

# still used by overlap analyzer
Expand Down
23 changes: 20 additions & 3 deletions trunk/DQMOffline/Trigger/src/DQMOfflineMuonTrigAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
<Notes on implementation>
*/
//
// Original Author: Muriel Vander Donckt
// Created: Tue Jul 24 12:17:12 CEST 2007
// $Id: DQMOfflineMuonTrigAnalyzer.cc,v 1.9 2009/08/14 13:29:08 slaunwhj Exp $
// Jason Slaunwhite, based on code from Jeff Klukas
// $Id: DQMOfflineMuonTrigAnalyzer.cc,v 1.10 2009/08/25 10:03:15 slaunwhj Exp $
//
//

Expand Down Expand Up @@ -52,6 +51,7 @@ class OfflineDQMMuonTrigAnalyzer : public edm::EDAnalyzer {
private:
virtual void beginJob() ;
virtual void analyze(const edm::Event&, const edm::EventSetup&);
virtual void endRun (const edm::Run& r, const edm::EventSetup& c);
virtual void endJob() ;

int theNumberOfTriggers;
Expand Down Expand Up @@ -300,6 +300,23 @@ OfflineDQMMuonTrigAnalyzer::beginJob()
//theOverlapAnalyzer ->begin();
}

void
OfflineDQMMuonTrigAnalyzer::endRun ( const edm::Run& theRun, const edm::EventSetup& theEventSetup) {

LogTrace ("HLTMuonVal")
<< "Inside OfflineDQMMuonTrigAnalyzer endRun()" << endl;


vector<HLTMuonMatchAndPlot *>::iterator thisAnalyzer;
for ( thisAnalyzer = theTriggerAnalyzers.begin();
thisAnalyzer != theTriggerAnalyzers.end();
++thisAnalyzer )
{
(*thisAnalyzer)->endRun(theRun, theEventSetup);
}

}



void
Expand Down
8 changes: 5 additions & 3 deletions trunk/DQMOffline/Trigger/src/HLTMuonBPAG.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* 2. A trigger name
*
* $Author: slaunwhj $
* $Date: 2009/08/28 13:07:44 $
* $Revision: 1.2 $
* $Date: 2009/09/24 12:03:45 $
* $Revision: 1.3 $
*/


Expand Down Expand Up @@ -568,6 +568,8 @@ MonitorElement* HLTMuonBPAG::book2DVarBins (TString name, TString title, int nBi

TH2F *tempHist = new TH2F(name, title, nBinsX, xBinLowEdges, nBinsY, yMin, yMax);
tempHist->Sumw2();
return dbe_->book2D(name.Data(), tempHist);
MonitorElement * returnedME = dbe_->book2D(name.Data(), tempHist);
delete tempHist;
return returnedME;

}
Loading

0 comments on commit 8e57185

Please sign in to comment.