Merge pull request #9 from cms-sw/CMSSW_7_5_X

PRToFixMess_GEMCSCSegment_PR_v3
cms-sw · May 28, 2015 · 3a1cd22 · 3a1cd22
2 parents e8cf787 + 204a5d4
commit 3a1cd22
Show file tree

Hide file tree

Showing 166 changed files with 5,462 additions and 1,021 deletions.
diff --git a/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_runPede_rfcp_template.sh b/Alignment/MillePedeAlignmentAlgorithm/scripts/mps_runPede_rfcp_template.sh
@@ -178,10 +178,18 @@ gzip -f millepede.eve
 #list IOVs
 cmscond_list_iov -c sqlite_file:alignments_MP.db -t Alignments
 cmscond_list_iov -c sqlite_file:alignments_MP.db -t Deformations
+cmscond_list_iov -c sqlite_file:alignments_MP.db -t SiStripLorentzAngle_deco
+cmscond_list_iov -c sqlite_file:alignments_MP.db -t SiStripLorentzAngle_peak
+cmscond_list_iov -c sqlite_file:alignments_MP.db -t SiPixelLorentzAngle
+cmscond_list_iov -c sqlite_file:alignments_MP.db -t SiStripBackPlaneCorrection
 
 #split the IOVs
 aligncond_split_iov -s sqlite_file:alignments_MP.db -i Alignments -d sqlite_file:alignments_split_MP.db -t Alignments
 aligncond_split_iov -s sqlite_file:alignments_MP.db -i Deformations -d sqlite_file:alignments_split_MP.db -t Deformations
+aligncond_split_iov -s sqlite_file:alignments_MP.db -i SiStripLorentzAngle_deco -d sqlite_file:alignments_split_MP.db -t SiStripLorentzAngle_deco
+aligncond_split_iov -s sqlite_file:alignments_MP.db -i SiStripLorentzAngle_peak -d sqlite_file:alignments_split_MP.db -t SiStripLorentzAngle_peak
+aligncond_split_iov -s sqlite_file:alignments_MP.db -i SiPixelLorentzAngle -d sqlite_file:alignments_split_MP.db -t SiPixelLorentzAngle
+aligncond_split_iov -s sqlite_file:alignments_MP.db -i SiStripBackPlaneCorrection -d sqlite_file:alignments_split_MP.db -t SiStripBackPlaneCorrection
 
 echo "\nDirectory content after running cmsRun, zipping log file and merging histogram files:"
 ls -lh

diff --git a/CommonTools/Utils/src/returnType.cc b/CommonTools/Utils/src/returnType.cc
@@ -43,9 +43,9 @@ namespace reco {
 
   TypeCode typeCode(const edm::TypeWithDict& t) {
     typedef std::pair<const char* const, method::TypeCode> Values;
-    const char* name = t.name().c_str();
+    std::string name = t.name();
     auto f = std::equal_range(retTypeVec.begin(), retTypeVec.end(),
-      Values{name, enumType},
+      Values{name.c_str(), enumType},
       [](const Values& iLHS, const Values& iRHS) -> bool {
         return std::strcmp(iLHS.first, iRHS.first) < 0;
       });

diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py
@@ -39,7 +39,7 @@
 
 workflows[4.17] = ['', ['RunMinBias2011A','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT','MINIAODDreHLT']]
 workflows[4.18] = ['', ['RunMu2011A','RECOD','HARVESTD','MINIAODDATAs2']]
-workflows[4.19] = ['', ['RunElectron2011A','RECOD','HARVESTD','MINIAODDATAs2']]
+workflows[4.19] = ['', ['RunElectron2011A','RECODAlCaEle','HARVESTD','MINIAODDATAs2']]
 workflows[4.20] = ['', ['RunPhoton2011A','RECOD','HARVESTD','MINIAODDATAs2']]
 workflows[4.21] = ['', ['RunJet2011A','RECOD','HARVESTD','MINIAODDATAs2']]
 
@@ -54,7 +54,7 @@
 workflows[4.29] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','SKIMDreHLT','MINIAODDreHLT']]
 #workflows[4.291] = ['', ['RunMinBias2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.30] = ['', ['RunMu2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.31] = ['', ['RunElectron2011B','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.32] = ['', ['RunPhoton2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.33] = ['', ['RunJet2011B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 
@@ -69,13 +69,13 @@
 workflows[4.41] = ['',['RunTau2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.42] = ['',['RunMET2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.43] = ['',['RunMu2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.44] = ['',['RunElectron2012A','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.45] = ['',['RunJet2012A','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 
 workflows[4.51] = ['',['RunMinBias2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.52] = ['',['RunMu2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.53] = ['',['RunPhoton2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.54] = ['',['RunEl2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.54] = ['',['RunEl2012B','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.55] = ['',['RunJet2012B','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.56] = ['',['ZMuSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.57] = ['',['ZElSkim2012B','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
@@ -84,7 +84,7 @@
 workflows[4.61] = ['',['RunMinBias2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.62] = ['',['RunMu2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.63] = ['',['RunPhoton2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.64] = ['',['RunEl2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.64] = ['',['RunEl2012C','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.65] = ['',['RunJet2012C','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 
 workflows[4.66] = ['',['ZMuSkim2012C','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
@@ -94,7 +94,7 @@
 workflows[4.71] = ['',['RunMinBias2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.72] = ['',['RunMu2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.73] = ['',['RunPhoton2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
-workflows[4.74] = ['',['RunEl2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
+workflows[4.74] = ['',['RunEl2012D','HLTD','RECODreHLTAlCaEle','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.75] = ['',['RunJet2012D','HLTD','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.76] = ['',['ZMuSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]
 workflows[4.77] = ['',['ZElSkim2012D','HLTDSKIM','RECODreHLT','HARVESTDreHLT','MINIAODDreHLT']]

diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -906,6 +906,9 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
           '--scenario':'pp',
           }
 
+dataRecoAlCaEle=merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,ALCA:SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias+EcalCalZElectron+EcalCalWElectron+EcalUncalZElectron+EcalUncalWElectron,DQM'}, dataReco])
+
+
 hltKey='fake'
 from Configuration.HLT.autoHLT import autoHLT
 menu = autoHLT[hltKey]
@@ -918,6 +921,8 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
 steps['HLTDSKIM']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'},steps['HLTD']])
 
 steps['RECOD']=merge([{'--scenario':'pp',},dataReco])
+steps['RECODAlCaEle']=merge([{'--scenario':'pp',},dataRecoAlCaEle])
+
 steps['RECODSplit']=steps['RECOD'] # finer job splitting  
 steps['RECOSKIMALCA']=merge([{'--inputCommands':'"keep *","drop *_*_*_RECO"'
                               },steps['RECOD']])
@@ -1004,6 +1009,7 @@ def genvalid(fragment,d,suffix='all',fi='',dataSet=''):
 #steps['RECOUP15PROD1']=merge([{ '-s' : 'RAW2DIGI,L1Reco,RECO,EI,DQM:DQMOfflinePOGMC', '--datatier' : 'AODSIM,DQMIO', '--eventcontent' : 'AODSIM,DQM'},step3Up2015Defaults])
 
 steps['RECODreHLT']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECOD']])
+steps['RECODreHLTAlCaEle']=merge([{'--hltProcess':'reHLT','--conditions':'auto:run1_data_%s'%menu},steps['RECODAlCaEle']])
 
 steps['RECO']=merge([step3Defaults])
 steps['RECODBG']=merge([{'--eventcontent':'RECODEBUG,DQM'},steps['RECO']])

diff --git a/Configuration/StandardSequences/python/Harvesting_cff.py b/Configuration/StandardSequences/python/Harvesting_cff.py
@@ -9,6 +9,8 @@
 from FastSimulation.Configuration.Harvesting_cff import *
 
 from Validation.RecoHI.HarvestingHI_cff import *
+from Validation.RecoJets.JetPostProcessor_cff import *
+from Validation.RecoMET.METPostProcessor_cff import *
 
 
 dqmHarvesting = cms.Path(DQMOffline_SecondStep*DQMOffline_Certification)
@@ -31,4 +33,4 @@
 
 alcaHarvesting = cms.Path()
 
-validationHarvestingMiniAOD = cms.Path()
+validationHarvestingMiniAOD = cms.Path(JetPostProcessor*METPostProcessorHarvesting)
diff --git a/Configuration/StandardSequences/python/Validation_cff.py b/Configuration/StandardSequences/python/Validation_cff.py
@@ -31,7 +31,7 @@
 prevalidation = cms.Sequence( globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq )
 prevalidationLiteTracking = cms.Sequence( prevalidation )
 prevalidationLiteTracking.replace(globalPrevalidation,globalPrevalidationLiteTracking)
-prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence )
+prevalidationMiniAOD = cms.Sequence( genParticles1 * miniAODValidationSequence * JetValidationMiniAOD )
 
 
 validation = cms.Sequence(cms.SequencePlaceholder("mix")
@@ -46,7 +46,7 @@
 validationLiteTracking.replace(globalValidation,globalValidationLiteTracking)
 validationLiteTracking.remove(condDataValidation)
 
-validationMiniAOD = cms.Sequence( )
+validationMiniAOD = cms.Sequence()
 
 prevalidation_preprod = cms.Sequence( preprodPrevalidation )
 

diff --git a/DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h b/DQM/DTMonitorClient/src/DTChamberEfficiencyClient.h
@@ -39,7 +39,6 @@ class DTGeometry;
 class DTChamberId;
 class DTLayerId;
 
-//-class DTChamberEfficiencyClient: public edm::EDAnalyzer{
 class DTChamberEfficiencyClient: public DQMEDHarvester{
 
 public:

diff --git a/DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h b/DQM/DTMonitorClient/src/DTChamberEfficiencyTest.h
@@ -41,7 +41,6 @@ class DTChamberId;
 class DTSuperLayerId;
 class DTLayerId;
 
-//-class DTChamberEfficiencyTest: public edm::EDAnalyzer{
 class DTChamberEfficiencyTest: public DQMEDHarvester{
 
 public:

diff --git a/DQM/DTMonitorClient/src/DTDAQInfo.h b/DQM/DTMonitorClient/src/DTDAQInfo.h
@@ -22,7 +22,6 @@ class DQMStore;
 class MonitorElement;
 class DTReadOutMapping;
 
-//-class DTDAQInfo : public edm::EDAnalyzer {
 class DTDAQInfo : public DQMEDHarvester {
 public:
   /// Constructor

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.cc
@@ -63,10 +63,7 @@ void DTLocalTriggerEfficiencyTest::beginRun(const edm::Run& r, const edm::EventS
 
 
 
-void DTLocalTriggerEfficiencyTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter,
-                         edm::LuminosityBlock const & lumiSeg, edm::EventSetup const & context) {
-
-  if (bookingdone) return;
+void DTLocalTriggerEfficiencyTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
   vector<string>::const_iterator iTr   = trigSources.begin();
   vector<string>::const_iterator trEnd = trigSources.end();
@@ -119,6 +116,7 @@ void DTLocalTriggerEfficiencyTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibo
 
 void DTLocalTriggerEfficiencyTest::runClientDiagnostic(DQMStore::IBooker & ibooker,
                                                                   DQMStore::IGetter & igetter) {
+ if (!bookingdone) Bookings(ibooker,igetter);
 
   // Loop over Trig & Hw sources
   for (vector<string>::const_iterator iTr = trigSources.begin(); iTr != trigSources.end(); ++iTr){
@@ -394,6 +392,3 @@ void DTLocalTriggerEfficiencyTest::bookChambHistos(DQMStore::IBooker & ibooker,D
 }
 
 
-
-void DTLocalTriggerEfficiencyTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {}
-
diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.h b/DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.h
@@ -47,11 +47,7 @@ class DTLocalTriggerEfficiencyTest: public DTLocalTriggerBaseTest{
   /// DQM Client Diagnostic
 
   void runClientDiagnostic(DQMStore::IBooker &, DQMStore::IGetter &);
-
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &);
-
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, 
-                               edm::LuminosityBlock const &, edm::EventSetup const &);
+  void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
  private:
 

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.cc
@@ -55,10 +55,7 @@ DTLocalTriggerLutTest::~DTLocalTriggerLutTest(){
 }
 
 
-void DTLocalTriggerLutTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter,
-                         edm::LuminosityBlock const & lumiSeg, edm::EventSetup const & context) {
-
-  if (bookingdone) return;
+void DTLocalTriggerLutTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
   vector<string>::const_iterator iTr   = trigSources.begin();
   vector<string>::const_iterator trEnd = trigSources.end();
@@ -119,6 +116,8 @@ void DTLocalTriggerLutTest::beginRun(const edm::Run& r, const edm::EventSetup& c
 
 void DTLocalTriggerLutTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
+  if (!bookingdone) Bookings(ibooker,igetter);
+
   // Loop over Trig & Hw sources
   for (vector<string>::const_iterator iTr = trigSources.begin(); iTr != trigSources.end(); ++iTr){
     trigSource = (*iTr);
@@ -346,5 +345,3 @@ void DTLocalTriggerLutTest::fillWhPlot(MonitorElement *plot, int sect, int stat,
 
 }
 
-
-void DTLocalTriggerLutTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {}
diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.h b/DQM/DTMonitorClient/src/DTLocalTriggerLutTest.h
@@ -36,11 +36,7 @@ class DTLocalTriggerLutTest: public DTLocalTriggerBaseTest{
   /// Run client analysis
 
   void runClientDiagnostic(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter);
-
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &);
-
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, 
-                               edm::LuminosityBlock const &, edm::EventSetup const &);
+  void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
  private:
 

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTPTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerTPTest.cc
@@ -50,10 +50,7 @@ DTLocalTriggerTPTest::~DTLocalTriggerTPTest(){
 }
 
 
-void DTLocalTriggerTPTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter,
-                         edm::LuminosityBlock const & lumiSeg, edm::EventSetup const & context) {
-
-  if (bookingdone) return;
+void DTLocalTriggerTPTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
   vector<string>::const_iterator iTr   = trigSources.begin();
   vector<string>::const_iterator trEnd = trigSources.end();
@@ -89,6 +86,7 @@ void DTLocalTriggerTPTest::beginRun(const edm::Run& r, const edm::EventSetup& c)
 
 void DTLocalTriggerTPTest::runClientDiagnostic(DQMStore::IBooker & ibooker,
                                                             DQMStore::IGetter & igetter) {
+  if (!bookingdone) Bookings(ibooker,igetter);
 
   // Loop over Trig & Hw sources
   for (vector<string>::const_iterator iTr = trigSources.begin(); iTr != trigSources.end(); ++iTr){
@@ -133,5 +131,3 @@ void DTLocalTriggerTPTest::runClientDiagnostic(DQMStore::IBooker & ibooker,
 }
 
 
-void DTLocalTriggerTPTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {}
-
diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTPTest.h b/DQM/DTMonitorClient/src/DTLocalTriggerTPTest.h
@@ -36,10 +36,7 @@ class DTLocalTriggerTPTest: public DTLocalTriggerBaseTest{
   /// Run client analysis
 
   void runClientDiagnostic(DQMStore::IBooker &, DQMStore::IGetter &);
-
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &);
-
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
+  void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
  private:
 

diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc b/DQM/DTMonitorClient/src/DTLocalTriggerTest.cc
@@ -51,10 +51,7 @@ DTLocalTriggerTest::~DTLocalTriggerTest(){
 }
 
 
-void DTLocalTriggerTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter,
-                         edm::LuminosityBlock const & lumiSeg, edm::EventSetup const & context) {
-
-  if (bookingdone) return;
+void DTLocalTriggerTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
   vector<string>::const_iterator iTr   = trigSources.begin();
   vector<string>::const_iterator trEnd = trigSources.end();
@@ -142,6 +139,8 @@ void DTLocalTriggerTest::beginRun(const edm::Run& r, const edm::EventSetup& c){
 
 void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
+  if (!bookingdone) Bookings(ibooker,igetter);
+
   // Loop over Trig & Hw sources
   for (vector<string>::const_iterator iTr = trigSources.begin(); iTr != trigSources.end(); ++iTr){
     trigSource = (*iTr);
@@ -441,6 +440,4 @@ void DTLocalTriggerTest::fillGlobalSummary(DQMStore::IGetter & igetter) {
 }
 
 
-void DTLocalTriggerTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {}
-
 
diff --git a/DQM/DTMonitorClient/src/DTLocalTriggerTest.h b/DQM/DTMonitorClient/src/DTLocalTriggerTest.h
@@ -30,16 +30,14 @@ class DTLocalTriggerTest: public DTLocalTriggerBaseTest{
   /// BeginRun
   void beginRun(const edm::Run& r, const edm::EventSetup& c);
 
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
+  void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
   /// Run client analysis
 
   void runClientDiagnostic(DQMStore::IBooker &,DQMStore::IGetter &);
 
   void fillGlobalSummary(DQMStore::IGetter &);
 
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &);
-
  private:
 
   int nMinEvts;

diff --git a/DQM/DTMonitorClient/src/DTTriggerEfficiencyTest.cc b/DQM/DTMonitorClient/src/DTTriggerEfficiencyTest.cc
@@ -60,12 +60,10 @@ void DTTriggerEfficiencyTest::beginRun(const edm::Run& r,const edm::EventSetup&
 
 }
 
-void DTTriggerEfficiencyTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter,
-                         edm::LuminosityBlock const & lumiSeg, edm::EventSetup const & c) {
-}
-
 void DTTriggerEfficiencyTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
+  if (!bookingdone) Bookings(ibooker,igetter);
+
   // Loop over Trig & Hw sources
   for (vector<string>::const_iterator iTr = trigSources.begin(); iTr != trigSources.end(); ++iTr){
     trigSource = (*iTr);
@@ -324,7 +322,7 @@ void DTTriggerEfficiencyTest::bookChambHistos(DQMStore::IBooker & ibooker,DTCham
 }
 
 
-void DTTriggerEfficiencyTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
+void DTTriggerEfficiencyTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
 
   vector<string>::const_iterator iTr   = trigSources.begin();

diff --git a/DQM/DTMonitorClient/src/DTTriggerEfficiencyTest.h b/DQM/DTMonitorClient/src/DTTriggerEfficiencyTest.h
@@ -53,12 +53,9 @@ class DTTriggerEfficiencyTest: public DTLocalTriggerBaseTest{
   /// BeginRun
   void beginRun(const edm::Run& r, const edm::EventSetup& c);
 
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const &);
-
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &);
-
   /// DQM Client Diagnostic
   void runClientDiagnostic(DQMStore::IBooker &, DQMStore::IGetter &);
+  void Bookings(DQMStore::IBooker &, DQMStore::IGetter &);
 
  private:
 

diff --git a/DQM/DTMonitorClient/src/DTTriggerLutTest.cc b/DQM/DTMonitorClient/src/DTTriggerLutTest.cc
@@ -56,9 +56,8 @@ DTTriggerLutTest::~DTTriggerLutTest(){
 }
 
 
-void DTTriggerLutTest::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter,
-                         edm::LuminosityBlock const & lumiSeg, edm::EventSetup const & context) {
-  if (bookingdone) return;
+void DTTriggerLutTest::Bookings(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
+
   bookingdone = 1;  
 
   vector<string>::const_iterator iTr   = trigSources.begin();
@@ -117,6 +116,8 @@ void DTTriggerLutTest::beginRun(const edm::Run& r, const edm::EventSetup& c){
 
 void DTTriggerLutTest::runClientDiagnostic(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
 
+   if (!bookingdone) Bookings(ibooker,igetter);
+
   // Reset lut percentage 1D summaries
   if (detailedAnalysis){
     cmsME.find(fullName("PhiPercentageSummary"))->second->Reset();
@@ -358,5 +359,3 @@ void DTTriggerLutTest::fillWhPlot(MonitorElement *plot, int sect, int stat, floa
 }
 
 
-void DTTriggerLutTest::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {}
-