backport HLT DQM for menu v2.1 to CMSSW 9.2.x

This PR includes a backport of the following PRs: - cms-sw#18172 - cms-sw#18950 - cms-sw#18959 - cms-sw#18968 - cms-sw#18971 - cms-sw#19023 - cms-sw#19046 - cms-sw#19078 - cms-sw#19119 - cms-sw#19178 - cms-sw#19290 - cms-sw#19293 - cms-sw#19294 - cms-sw#19490 - cms-sw#19499 - cms-sw#19577 - cms-sw#19585 - cms-sw#19596 - cms-sw#19599 - cms-sw#19627 - cms-sw#19689 - cms-sw#19694 - cms-sw#19703 - cms-sw#19781 - cms-sw#19794 plus the older ones, contained in DQMOffline/Trigger and HLTriggerOffline. It synchronises with CMSSW_9_3_X - DQMServices/ClientConfig - DQMOffline/Configuration - DQMOffline/Trigger - HLTriggerOffline/Btag - HLTriggerOffline/Higgs - HLTriggerOffline/SUSYBSM - HLTriggerOffline/Tau - HLTriggerOffline/Top
fwyzard · Sep 1, 2017 · 20188a1 · 20188a1
1 parent f8281c3
commit 20188a1
Show file tree

Hide file tree

Showing 234 changed files with 15,817 additions and 2,048 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
@@ -86,10 +86,10 @@
 hltResults.RecHitsEETag = cms.untracked.InputTag("ecalRecHit", "EcalRecHitsEE")
 
 
-globalAnalyzer.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
-trackerAnalyzer.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
-tightAnalyzer.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
-looseAnalyzer.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
+globalAnalyzerTnP.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
+trackerAnalyzerTnP.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
+tightAnalyzerTnP.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
+looseAnalyzerTnP.inputTags.offlinePVs = cms.InputTag("hiSelectedVertex")
 
 pvMonitor.vertexLabel = cms.InputTag("hiSelectedVertex")
 

diff --git a/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py b/DQMOffline/Configuration/python/DQMOffline_Certification_cff.py
@@ -6,8 +6,6 @@
 from DQMOffline.Configuration.DQMOffline_DCS_cff import *
 from DQMOffline.Configuration.DQMOffline_CRT_cff import *
 
-from Configuration.StandardSequences.Eras import eras
-
 DQMOffline_Certification = cms.Sequence(daq_dqmoffline*dcs_dqmoffline*crt_dqmoffline)
 
 DQMCertCommon = cms.Sequence(siStripDaqInfo * sipixelDaqInfo * 

diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py
@@ -61,7 +61,7 @@
                                          DQMMessageLoggerClientSeq )
 
 
-HLTMonitoringClient = cms.Sequence(trackingMonitorClientHLT)
+HLTMonitoringClient = cms.Sequence(trackingMonitorClientHLT * trackingForDisplacedJetMonitorClientHLT) 
 HLTMonitoringClientPA= cms.Sequence(trackingMonitorClientHLT * PAtrackingMonitorClientHLT)
 DQMOffline_SecondStep = cms.Sequence( dqmRefHistoRootFileGetter *
                                       DQMOffline_SecondStep_PreDPG *

diff --git a/DQMOffline/Trigger/BuildFile.xml b/DQMOffline/Trigger/BuildFile.xml
@@ -1,32 +1,33 @@
+<use   name="CommonTools/TriggerUtils"/>
+<use   name="CommonTools/Utils"/>
+<use   name="CondFormats/DataRecord"/>
 <use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/RecoCandidate"/>
+<use   name="DataFormats/BTauReco"/>
+<use   name="DataFormats/CaloTowers"/>
+<use   name="DataFormats/EgammaCandidates"/>
+<use   name="DataFormats/EgammaReco"/>
 <use   name="DataFormats/HLTReco"/>
+<use   name="DataFormats/HeavyIonEvent"/>
+<use   name="DataFormats/JetReco"/>
+<use   name="DataFormats/METReco"/>
 <use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/EgammaReco"/>
+<use   name="DataFormats/RecoCandidate"/>
+<use   name="DataFormats/TauReco"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/BTauReco"/>
-<use   name="DataFormats/TauReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/HeavyIonEvent"/>
-<use   name="CommonTools/Utils"/>
-<use   name="CommonTools/TriggerUtils"/>
+<use   name="FWCore/Framework"/>
+<use   name="FWCore/ParameterSet"/>
+<use   name="FWCore/PluginManager"/>
+<use   name="FWCore/ServiceRegistry"/>
+<use   name="FWCore/Utilities"/>
+<use   name="HLTrigger/HLTcore"/>
+<use   name="JetMETCorrections/Objects"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
 <use   name="RecoEgamma/EgammaHLTAlgos"/>
 <use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="RecoJets/JetAssociationAlgorithms"/>
 <use   name="RecoJets/JetAlgorithms"/>
+<use   name="RecoJets/JetAssociationAlgorithms"/>
 <use   name="RecoJets/JetProducers"/>
-<use   name="JetMETCorrections/Objects"/>
 
 <use   name="root"/>
 <use   name="boost"/>

diff --git a/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h b/DQMOffline/Trigger/interface/BTVHLTOfflineSource.h
@@ -10,49 +10,44 @@
 
 
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 #include <unistd.h>
 
 // user include files
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
+#include "DataFormats/BTauReco/interface/JetTag.h"
+#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
+#include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
 #include "FWCore/Common/interface/TriggerNames.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerEvent.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
-#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
-
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-#include "DataFormats/BTauReco/interface/JetTag.h"
-#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
-
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <string>
-#include <sstream>
-
 class BTVHLTOfflineSource : public DQMEDAnalyzer {
  public:
   explicit BTVHLTOfflineSource(const edm::ParameterSet&);
-  ~BTVHLTOfflineSource();
+  ~BTVHLTOfflineSource() override;
 
  private:
-  virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
-  virtual void bookHistograms(DQMStore::IBooker &, edm::Run const & run, edm::EventSetup const & c) override;
-  virtual void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const & run, edm::EventSetup const & c) override;
+  void dqmBeginRun(edm::Run const& run, edm::EventSetup const& c) override;
 
   bool verbose_;
   std::string dirname_;
@@ -109,19 +104,21 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
     };
 
 
-    ~PathInfo() {};
+    ~PathInfo() = default;;
     PathInfo(int prescaleUsed,
 	     std::string pathName,
 	     std::string filterName,
 	     std::string processName,
 	     size_t type,
 	     std::string triggerType):
       prescaleUsed_(prescaleUsed),
-      pathName_(pathName),
-      filterName_(filterName),
-      processName_(processName),
+      pathName_(std::move(pathName)),
+      filterName_(std::move(filterName)),
+      processName_(std::move(processName)),
       objectType_(type),
-      triggerType_(triggerType){};
+      triggerType_(std::move(triggerType))
+    {
+    }
 
       MonitorElement * getMEhisto_CSV()               { return CSV_;}
       MonitorElement * getMEhisto_Pt()                { return Pt_; }
@@ -132,33 +129,33 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
       MonitorElement * getMEhisto_PVz_HLTMinusRECO()      { return PVz_HLTMinusRECO_;}
       MonitorElement * getMEhisto_fastPVz_HLTMinusRECO()  { return fastPVz_HLTMinusRECO_;}
 
-      const std::string getLabel(void ) const {
+      const std::string getLabel( ) const {
 	return filterName_;
       }
       void setLabel(std::string labelName){
-	filterName_ = labelName;
+	filterName_ = std::move(labelName);
 	return;
       }
-      const std::string getPath(void ) const {
+      const std::string getPath( ) const {
 	return pathName_;
       }
-      const int getprescaleUsed(void) const {
+      const int getprescaleUsed() const {
 	return prescaleUsed_;
       }
-      const std::string getProcess(void ) const {
+      const std::string getProcess( ) const {
 	return processName_;
       }
-      const int getObjectType(void ) const {
+      const int getObjectType( ) const {
 	return objectType_;
       }
-      const std::string getTriggerType(void ) const {
+      const std::string getTriggerType( ) const {
 	return triggerType_;
       }
-      const edm::InputTag getTag(void) const{
+      const edm::InputTag getTag() const{
 	edm::InputTag tagName(filterName_,"",processName_);
 	return tagName;
       }
-      bool operator==(const std::string v)
+      bool operator==(const std::string& v)
       {
 	return v==pathName_;
       }
@@ -187,7 +184,7 @@ class BTVHLTOfflineSource : public DQMEDAnalyzer {
   public:
     PathInfoCollection(): std::vector<PathInfo>()
       {};
-      std::vector<PathInfo>::iterator find(std::string pathName) {
+      std::vector<PathInfo>::iterator find(const std::string& pathName) {
         return std::find(begin(), end(), pathName);
       }
   };

diff --git a/DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h b/DQMOffline/Trigger/interface/DQMOfflineHLTEventInfoClient.h
@@ -26,31 +26,31 @@ class DQMOfflineHLTEventInfoClient: public edm::EDAnalyzer {
   DQMOfflineHLTEventInfoClient(const edm::ParameterSet& ps);
 
   /// Destructor
-  virtual ~DQMOfflineHLTEventInfoClient();
+  ~DQMOfflineHLTEventInfoClient() override;
 
 protected:
 
   /// BeginJob
-  void beginJob();
+  void beginJob() override;
 
   /// BeginRun
-  void beginRun(const edm::Run& r, const edm::EventSetup& c);
+  void beginRun(const edm::Run& r, const edm::EventSetup& c) override;
 
   /// Fake Analyze
-  void analyze(const edm::Event& e, const edm::EventSetup& c) ;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
 
   void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-                            const edm::EventSetup& context) ;
+                            const edm::EventSetup& context) override ;
 
   /// DQM Client Diagnostic
   void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-                          const edm::EventSetup& c);
+                          const edm::EventSetup& c) override;
 
   /// EndRun
-  void endRun(const edm::Run& r, const edm::EventSetup& c);
+  void endRun(const edm::Run& r, const edm::EventSetup& c) override;
 
   /// Endjob
-  void endJob();
+  void endJob() override;
 
 private:
 

diff --git a/DQMOffline/Trigger/interface/EgHLTBinData.h b/DQMOffline/Trigger/interface/EgHLTBinData.h
@@ -28,7 +28,7 @@ namespace egHLT {
     };
 
 
-    BinData(){}
+    BinData()= default;
     explicit BinData(const edm::ParameterSet& conf){setup(conf);}
     void setup(const edm::ParameterSet& conf);
 

diff --git a/DQMOffline/Trigger/interface/EgHLTComCodes.h b/DQMOffline/Trigger/interface/EgHLTComCodes.h
@@ -15,9 +15,9 @@ namespace egHLT {
     std::vector<std::pair<std::string,int> > _codeDefs;
 
   public:
-    ComCodes(){} 
-    ComCodes(const ComCodes& rhs):_codeDefs(rhs._codeDefs){}
-    ~ComCodes(){} 
+    ComCodes()= default; 
+    ComCodes(const ComCodes& rhs)= default;
+    ~ComCodes()= default; 
 
     //accessors
     int getCode(const char *descript)const;