Merge pull request #19247 from Dr15Jones/useDQMToken

Finish conversion of DQMEDHarvester to EDProducers
cms-sw · Jul 4, 2017 · 89319f9 · 89319f9
2 parents d3b3564 + 08aa7e7
commit 89319f9
Show file tree

Hide file tree

Showing 58 changed files with 285 additions and 246 deletions.
diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_harvesting_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OfflineDQM_harvesting_cff.py
@@ -12,12 +12,12 @@
                                                 + SiPixelPhase1TrackEfficiencyHarvester
                                                 + SiPixelPhase1RawDataHarvester
                                                 + RunQTests_offline
-                                                + SiPixelPhase1Summary_Offline
+                                                + SiPixelPhase1SummaryOffline
                                                   )
 
 siPixelPhase1OfflineDQM_harvesting_cosmics = siPixelPhase1OfflineDQM_harvesting.copyAndExclude([
    SiPixelPhase1TrackEfficiencyHarvester,
 ])
 
 siPixelPhase1OfflineDQM_harvesting_cosmics.replace(RunQTests_offline, RunQTests_cosmics)
-siPixelPhase1OfflineDQM_harvesting_cosmics.replace(SiPixelPhase1Summary_Offline, SiPixelPhase1Summary_Cosmics)
+siPixelPhase1OfflineDQM_harvesting_cosmics.replace(SiPixelPhase1SummaryOffline, SiPixelPhase1SummaryCosmics)
diff --git a/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py b/DQM/SiPixelPhase1Config/python/SiPixelPhase1OnlineDQM_cff.py
@@ -106,11 +106,11 @@
  + SiPixelPhase1ClustersHarvester
  + SiPixelPhase1RawDataHarvester
  + RunQTests_online
- + SiPixelPhase1Summary_Online
+ + SiPixelPhase1SummaryOnline
 # + SiPixelPhase1GeometryDebugHarvester
 )
 
 siPixelPhase1OnlineDQM_timing_harvesting = siPixelPhase1OnlineDQM_harvesting.copyAndExclude([
  RunQTests_online,
- SiPixelPhase1Summary_Online,
+ SiPixelPhase1SummaryOnline,
 ])
diff --git a/DQM/SiPixelPhase1Summary/python/SiPixelPhase1Summary_cfi.py b/DQM/SiPixelPhase1Summary/python/SiPixelPhase1Summary_cfi.py
@@ -5,7 +5,7 @@
 # This object is used to make changes for different running scenarios
 #
 
-SiPixelPhase1Summary_Online = DQMEDHarvester("SiPixelPhase1Summary",
+SiPixelPhase1SummaryOnline = DQMEDHarvester("SiPixelPhase1Summary",
     TopFolderName = cms.string('PixelPhase1/Phase1_MechanicalView/'),
     RunOnEndLumi = cms.bool(True),
     RunOnEndJob = cms.bool(True),
@@ -33,7 +33,7 @@
         )
 )
 
-SiPixelPhase1Summary_Offline = DQMEDHarvester("SiPixelPhase1Summary",
+SiPixelPhase1SummaryOffline = DQMEDHarvester("SiPixelPhase1Summary",
     TopFolderName = cms.string('PixelPhase1/Phase1_MechanicalView/'),
     RunOnEndLumi = cms.bool(False),
     RunOnEndJob = cms.bool(True),
@@ -61,7 +61,7 @@
         )
 )
 
-SiPixelPhase1Summary_Cosmics = DQMEDHarvester("SiPixelPhase1Summary",
+SiPixelPhase1SummaryCosmics = DQMEDHarvester("SiPixelPhase1Summary",
     TopFolderName = cms.string('PixelPhase1/Phase1_MechanicalView/'),
     RunOnEndLumi = cms.bool(False),
     RunOnEndJob = cms.bool(True),

diff --git a/DQMOffline/L1Trigger/python/L1TEfficiencyHarvesting_cfi.py b/DQMOffline/L1Trigger/python/L1TEfficiencyHarvesting_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 
-l1tEfficiencyMuons_Harvesting = DQMEDHarvester("L1TEfficiency_Harvesting",
+l1tEfficiencyMuonsHarvesting = DQMEDHarvester("L1TEfficiency_Harvesting",
     verbose  = cms.untracked.bool(False),
     plotCfgs = cms.untracked.VPSet(
         cms.untracked.PSet( dqmBaseDir = cms.untracked.string("L1T/Efficiency/Muons"),

diff --git a/DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py b/DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py
@@ -354,7 +354,7 @@
                                 l1tStage2EmulatorMonitorClient *
                                 l1tStage2MonitorClient *
                                 DQMHarvestL1Trigger *
-                                l1tEfficiencyMuons_Harvesting
+                                l1tEfficiencyMuonsHarvesting
                                 )
 
 

diff --git a/DQMOffline/L1Trigger/test/runDQMOffline_step2_L1TStage2CaloLayer2_cfg.py b/DQMOffline/L1Trigger/test/runDQMOffline_step2_L1TStage2CaloLayer2_cfg.py
@@ -47,7 +47,7 @@
 
 
 # Path and EndPath definitions
-process.myHarvesting = cms.Path(process.DQMExample_Step2)
+process.myHarvesting = cms.Path(process.DQMExampleStep2)
 process.myEff = cms.Path(
     process.l1tStage2CaloLayer2Efficiency * process.l1tStage2CaloLayer2EmuDiff +
     process. l1tEGammaEfficiency * process.l1tEGammaEmuDiff

diff --git a/DQMOffline/Muon/python/EfficencyPlotter_cfi.py b/DQMOffline/Muon/python/EfficencyPlotter_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 
-effPlotter_Loose = DQMEDHarvester("EfficiencyPlotter",
+effPlotterLoose = DQMEDHarvester("EfficiencyPlotter",
                                   folder = cms.string("Muons/EfficiencyAnalyzer"),
                                   phiMin = cms.double(-3.2),
                                   etaMin = cms.double(-2.5),
@@ -19,7 +19,7 @@
                                   )
 
 
-effPlotter_Medium = DQMEDHarvester("EfficiencyPlotter",
+effPlotterMedium = DQMEDHarvester("EfficiencyPlotter",
                                    folder = cms.string("Muons/EfficiencyAnalyzer"),
                                    phiMin = cms.double(-3.2),
                                    etaMin = cms.double(-2.5),
@@ -37,7 +37,7 @@
                                    )
 
 
-effPlotter_Tight = DQMEDHarvester("EfficiencyPlotter",
+effPlotterTight = DQMEDHarvester("EfficiencyPlotter",
                                   folder = cms.string("Muons/EfficiencyAnalyzer"),
                                   phiMin = cms.double(-3.2),
                                   etaMin = cms.double(-2.5),
@@ -53,7 +53,7 @@
                                   vtxMax = cms.double(40.5),
                                   MuonID = cms.string("Tight")
                                   )
-effPlotter_Loose_miniAOD = DQMEDHarvester("EfficiencyPlotter",
+effPlotterLooseMiniAOD = DQMEDHarvester("EfficiencyPlotter",
                                           folder = cms.string("Muons_miniAOD/EfficiencyAnalyzer"),
                                           phiMin = cms.double(-3.2),
                                           etaMin = cms.double(-2.5),
@@ -71,7 +71,7 @@
                                           )
 
 
-effPlotter_Medium_miniAOD = DQMEDHarvester("EfficiencyPlotter",
+effPlotterMediumMiniAOD = DQMEDHarvester("EfficiencyPlotter",
                                            folder = cms.string("Muons_miniAOD/EfficiencyAnalyzer"),
                                            phiMin = cms.double(-3.2),
                                            etaMin = cms.double(-2.5),
@@ -89,7 +89,7 @@
                                            )
 
 
-effPlotter_Tight_miniAOD = DQMEDHarvester("EfficiencyPlotter",
+effPlotterTightMiniAOD = DQMEDHarvester("EfficiencyPlotter",
                                           folder = cms.string("Muons_miniAOD/EfficiencyAnalyzer"),
                                           phiMin = cms.double(-3.2),
                                           etaMin = cms.double(-2.5),

diff --git a/DQMOffline/Muon/python/muonQualityTests_cff.py b/DQMOffline/Muon/python/muonQualityTests_cff.py
@@ -39,9 +39,9 @@
 
 muonQualityTests = cms.Sequence(muonSourcesQualityTests*
                                 muTrackResidualsTest*
-                                effPlotter_Loose*
-                                effPlotter_Medium*
-                                effPlotter_Tight*
+                                effPlotterLoose*
+                                effPlotterMedium*
+                                effPlotterTight*
                                 muRecoTest*
                                 muonClientsQualityTests*
                                 muonComp2RefQualityTests*
@@ -50,9 +50,9 @@
 
 muonQualityTests_miniAOD = cms.Sequence(muonSourcesQualityTests*
                                         muTrackResidualsTest*
-                                        effPlotter_Loose_miniAOD*
-                                        effPlotter_Medium_miniAOD*
-                                        effPlotter_Tight_miniAOD*
+                                        effPlotterLooseMiniAOD*
+                                        effPlotterMediumMiniAOD*
+                                        effPlotterTightMiniAOD*
                                         muRecoTest*
                                         muonClientsQualityTests*
                                         muonComp2RefQualityTests*

diff --git a/DQMOffline/PFTau/python/PFClient_cfi.py b/DQMOffline/PFTau/python/PFClient_cfi.py
@@ -12,7 +12,7 @@
                           )
 
 # need a different Client to store the slices  
-pfClient_JetRes = DQMEDHarvester("PFClient_JetRes",
+pfClientJetRes = DQMEDHarvester("PFClient_JetRes",
                                   FolderNames = cms.vstring("PFJet/CompWithGenJet","PFJet/CompWithCaloJet"),
                                   HistogramNames = cms.vstring( "delta_et_Over_et_VS_et_"),
                                   CreateEfficiencyPlots = cms.bool(False),

diff --git a/DQMOffline/Trigger/python/HLTTauPostProcessor_cfi.py b/DQMOffline/Trigger/python/HLTTauPostProcessor_cfi.py
@@ -70,12 +70,12 @@ def _addEfficiencies(level, quantities, nameFormat, titleObject="#tau", postfix=
     return (m1, m2)
 
 
-(HLTTauPostAnalysis_Inclusive, HLTTauPostAnalysis_Inclusive2) = makeInclusiveAnalyzer(hltTauOfflineMonitor_Inclusive)
-(HLTTauPostAnalysis_PFTaus, HLTTauPostAnalysis_PFTaus2) = makePFTauAnalyzer(hltTauOfflineMonitor_PFTaus)
-(HLTTauPostAnalysis_TP, HLTTauPostAnalysis_TP2) = makePFTauAnalyzer(hltTauOfflineMonitor_TagAndProbe)
+(HLTTauPostAnalysisInclusive, HLTTauPostAnalysisInclusive2) = makeInclusiveAnalyzer(hltTauOfflineMonitor_Inclusive)
+(HLTTauPostAnalysisPFTaus, HLTTauPostAnalysisPFTaus2) = makePFTauAnalyzer(hltTauOfflineMonitor_PFTaus)
+(HLTTauPostAnalysisTP, HLTTauPostAnalysisTP2) = makePFTauAnalyzer(hltTauOfflineMonitor_TagAndProbe)
 
 HLTTauPostSeq = cms.Sequence(
-    HLTTauPostAnalysis_Inclusive+HLTTauPostAnalysis_Inclusive2+
-    HLTTauPostAnalysis_PFTaus+HLTTauPostAnalysis_PFTaus2+
-    HLTTauPostAnalysis_TP+HLTTauPostAnalysis_TP2
+    HLTTauPostAnalysisInclusive+HLTTauPostAnalysisInclusive2+
+    HLTTauPostAnalysisPFTaus+HLTTauPostAnalysisPFTaus2+
+    HLTTauPostAnalysisTP+HLTTauPostAnalysisTP2
 )
diff --git a/DQMServices/Components/plugins/MEtoEDMConverter.cc b/DQMServices/Components/plugins/MEtoEDMConverter.cc
@@ -12,6 +12,7 @@
 #include "DQMServices/Components/plugins/MEtoEDMConverter.h"
 #include "classlib/utils/StringList.h"
 #include "classlib/utils/StringOps.h"
+#include "DataFormats/Histograms/interface/DQMToken.h"
 
 using namespace lat;
 
@@ -78,9 +79,9 @@ MEtoEDMConverter::MEtoEDMConverter(const edm::ParameterSet & iPSet) :
   produces<MEtoEDM<long long>, edm::Transition::EndLuminosityBlock>(sName);
   produces<MEtoEDM<TString>, edm::Transition::EndLuminosityBlock>(sName);
 
-  iCount.clear();
+  consumesMany<DQMToken>();
 
-  assert(sizeof(int64_t) == sizeof(long long));
+  static_assert(sizeof(int64_t) == sizeof(long long),"type int64_t is not the same length as long long");
 
 }
 

diff --git a/DQMServices/Core/interface/DQMEDHarvester.h b/DQMServices/Core/interface/DQMEDHarvester.h
@@ -2,7 +2,6 @@
 #define CORE_DQMED_HARVESTER_H
 
 //<<<<<< INCLUDES                                                       >>>>>>
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/one/EDProducer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
@@ -19,23 +18,22 @@ edm::EndLuminosityBlockProducer>
 {
 public:
   DQMEDHarvester(void);
-#ifdef __INTEL_COMPILER
   virtual ~DQMEDHarvester() = default;
-#endif
+
   // implicit copy constructor
   // implicit assignment operator
   // implicit destructor
   virtual void beginRun(edm::Run const&, edm::EventSetup const&) override {};
   virtual void produce(edm::Event&, edm::EventSetup const&) override final {};
   virtual void endRun(edm::Run const&, edm::EventSetup const&) override {};
-  virtual void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const&) final {};
-  virtual void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const&) final;
-  virtual void endJob() final;
+  virtual void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const&) override final {};
+  virtual void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const&) override final;
+  virtual void endJob() override final;
   virtual void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&) {};
   virtual void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) = 0;
-  void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override final;
 
 private:
+  virtual void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override final;
 
 };
 

diff --git a/DQMServices/Core/src/DQMEDHarvester.cc b/DQMServices/Core/src/DQMEDHarvester.cc
@@ -1,9 +1,14 @@
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "DataFormats/Histograms/interface/DQMToken.h"
+
+#include <memory>
 
 DQMEDHarvester::DQMEDHarvester() {
   usesResource("DQMStore");
+  produces<DQMToken,edm::Transition::EndLuminosityBlock>();
 }
 
 void DQMEDHarvester::endJob() {
@@ -21,5 +26,6 @@ void DQMEDHarvester::endLuminosityBlock(edm::LuminosityBlock const& iLumi,
     });
 }
 
-void DQMEDHarvester::endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) {}
-
+void DQMEDHarvester::endLuminosityBlockProduce(edm::LuminosityBlock& iLumi, edm::EventSetup const&) {
+  iLumi.put(std::make_unique<DQMToken>());
+}
diff --git a/DQMServices/Examples/python/test/DQMExample_GenericClient_cfi.py b/DQMServices/Examples/python/test/DQMExample_GenericClient_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 
-DQMExample_GenericClient = DQMEDHarvester("DQMGenericClient",
+DQMExampleGenericClient = DQMEDHarvester("DQMGenericClient",
                                           subDirs = cms.untracked.vstring("Physics/TopTest"),
                                           efficiency = cms.vstring(
                                               "myEfficiencyEta 'Efficiency vs Eta' EleEta_leading_HLT_matched EleEta_leading",

diff --git a/DQMServices/Examples/python/test/DQMExample_Step2_cfg.py b/DQMServices/Examples/python/test/DQMExample_Step2_cfg.py
@@ -37,8 +37,8 @@
 
 
 # Path and EndPath definitions
-process.myHarvesting = cms.Path(process.DQMExample_Step2)
-process.myEff = cms.Path(process.DQMExample_GenericClient)
+process.myHarvesting = cms.Path(process.DQMExampleStep2)
+process.myEff = cms.Path(process.DQMExampleGenericClient)
 process.myTest = cms.Path(process.DQMExample_qTester)
 process.dqmsave_step = cms.Path(process.DQMSaver)
 

diff --git a/DQMServices/Examples/python/test/DQMExample_Step2_cfi.py b/DQMServices/Examples/python/test/DQMExample_Step2_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 
-DQMExample_Step2 = DQMEDHarvester("DQMExample_Step2",
+DQMExampleStep2 = DQMEDHarvester("DQMExample_Step2",
                                   numMonitorName = cms.string("Physics/TopTest/ElePt_leading_HLT_matched"),
                                   denMonitorName = cms.string("Physics/TopTest/ElePt_leading")
                                   )
diff --git a/DQMServices/FwkIO/plugins/DQMRootOutputModule.cc b/DQMServices/FwkIO/plugins/DQMRootOutputModule.cc
@@ -586,7 +586,8 @@ DQMRootOutputModule::fillDescriptions(edm::ConfigurationDescriptions& descriptio
     ->setComment("Only write the run with this run number. 0 means write all runs.");
   desc.addOptionalUntracked<int>("splitLevel", 99)
     ->setComment("UNUSED Only here to allow older configurations written for PoolOutputModule to work.");
-  edm::OutputModule::fillDescription(desc, std::vector<std::string>(1U, std::string("drop *")));
+  const std::vector<std::string> keep = {"drop *", "keep DQMToken_*_*_*"};
+  edm::OutputModule::fillDescription(desc, keep);
 
   edm::ParameterSetDescription dataSet;
   dataSet.setAllowAnything();

diff --git a/DataFormats/Histograms/interface/DQMToken.h b/DataFormats/Histograms/interface/DQMToken.h
@@ -0,0 +1,29 @@
+#ifndef DataFormats_Histograms_DQMToken_h
+#define DataFormats_Histograms_DQMToken_h
+// -*- C++ -*-
+//
+// Package:     DataFormats/Histograms
+// Class  :     DQMToken
+// 
+/**\class DQMToken DQMToken.h "DataFormats/Histograms/interface/DQMToken.h"
+
+ Description: Token to put in Run or LuminosityBlock to designate that a EDProducer fills DQM MonitorElements
+
+ Usage:
+    
+
+*/
+//
+// Original Author:  Christopher Jones
+//         Created:  Wed, 14 Jun 2017 13:48:54 GMT
+//
+
+class DQMToken
+{
+
+   public:
+      DQMToken() {}
+};
+
+
+#endif
diff --git a/DataFormats/Histograms/src/classes.h b/DataFormats/Histograms/src/classes.h
@@ -18,6 +18,7 @@
 #include "TProfile2D.h"
 #include "TProfile3D.h"
 #include "DataFormats/Histograms/interface/MEtoEDMFormat.h"
+#include "DataFormats/Histograms/interface/DQMToken.h"
 #include "TString.h"
 #include <stdint.h>
 

diff --git a/DataFormats/Histograms/src/classes_def.xml b/DataFormats/Histograms/src/classes_def.xml
@@ -70,4 +70,7 @@
  <class name="edm::Wrapper<MEtoEDM<int> >"/>
  <class name="edm::Wrapper<MEtoEDM<long long> >"/>
  <class name="edm::Wrapper<MEtoEDM<TString> >"/>
+
+ <class name="DQMToken" ClassVersion="0"/>
+ <class name="edm::Wrapper<DQMToken>" persistent="false"/>
 </lcgdict>
diff --git a/GeneratorInterface/RivetInterface/python/PostProcessor_cff.py b/GeneratorInterface/RivetInterface/python/PostProcessor_cff.py
@@ -294,7 +294,7 @@
 ###################
 #CMS_2011_S9088458
 ###################
-postCMS_2011_S9088458 = DQMEDHarvester(
+postCMSo2011oS9088458 = DQMEDHarvester(
     "DQMGenericClient",
     subDirs = cms.untracked.vstring("Rivet/CMS_2011_S9088458"),
     efficiencyProfile = cms.untracked.vstring("d01-x01-y01 d01-x01-y01 trijet dijet"),
@@ -312,5 +312,5 @@
                                       postCMS_2011_S8957746 + 
                                       postCMS_2011_S8968497 +
                                       postCMS_2011_S9086218 +
-                                      postCMS_2011_S9088458 )
+                                      postCMSo2011oS9088458 )