Merge pull request #48577 from Dr15Jones/fixHarvesterDependencies

Add needed dependencies between some DQMEDHarvesters

Author: cmsbuild

DQM/DTMonitorClient/python/dtCertificationSummary_cfi.py

@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from DQMServices.Core.DQMEDHarvester import DQMEDHarvester
 
-dtCertificationSummary = DQMEDHarvester('DTCertificationSummary')
+dtCertificationSummary = DQMEDHarvester('DTCertificationSummary',
+                                        inputMEs = cms.untracked.VInputTag(("dtChamberEfficiencyClient"), ("dtResolutionAnalysisTest"), ("segmentTest")))
 
 

DQM/DTMonitorClient/src/DTCertificationSummary.cc

@@ -18,10 +18,17 @@
 using namespace std;
 using namespace edm;
 
-DTCertificationSummary::DTCertificationSummary(const ParameterSet& pset) {}
+DTCertificationSummary::DTCertificationSummary(const ParameterSet& pset) : DQMEDHarvester(pset) {}
 
 DTCertificationSummary::~DTCertificationSummary() {}
 
+void DTCertificationSummary::fillDescriptions(edm::ConfigurationDescriptions& iConfig) {
+  edm::ParameterSetDescription pset;
+  DQMEDHarvester::fillDescription(pset);
+
+  iConfig.addDefault(pset);
+}
+
 void DTCertificationSummary::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker,
                                                    DQMStore::IGetter& igetter,
                                                    edm::LuminosityBlock const& lumiSeg,

DQM/DTMonitorClient/src/DTCertificationSummary.h

@@ -8,6 +8,7 @@
  */
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 
@@ -22,6 +23,7 @@ class DTCertificationSummary : public DQMEDHarvester {
   ~DTCertificationSummary() override;
 
   // Operations
+  static void fillDescriptions(edm::ConfigurationDescriptions&);
 
 protected:
 private:

DQM/EcalMonitorClient/plugins/EcalDQMonitorClient.cc

@@ -20,7 +20,7 @@
 #include <fstream>
 
 EcalDQMonitorClient::EcalDQMonitorClient(edm::ParameterSet const& _ps)
-    : DQMEDHarvester(),
+    : DQMEDHarvester(_ps),
       ecaldqm::EcalDQMonitor(_ps),
       iEvt_(0),
       cStHndl(esConsumes<edm::Transition::BeginRun>()),
@@ -52,6 +52,7 @@ EcalDQMonitorClient::~EcalDQMonitorClient() {}
 /*static*/
 void EcalDQMonitorClient::fillDescriptions(edm::ConfigurationDescriptions& _descs) {
   edm::ParameterSetDescription desc;
+  DQMEDHarvester::fillDescription(desc);
   ecaldqm::EcalDQMonitor::fillDescriptions(desc);
 
   edm::ParameterSetDescription clientParameters;

DQM/EcalMonitorClient/python/EcalCertification_cfi.py

@@ -16,5 +16,6 @@
         CertificationClient = ecalCertificationClient.clone()
     ),
     commonParameters = ecalCommonParams.clone(willConvertToEDM = False),
+    inputMEs = cms.untracked.VInputTag(("ecalDaqInfoTask"), ("ecalMonitorClient"), ("ecalDcsInfoTask"), ("ecalSummaryClient")),
     verbosity = cms.untracked.int32(0)
 )

DQMServices/Core/interface/DQMEDHarvester.h

@@ -13,6 +13,7 @@
 #include "FWCore/Framework/interface/GetterOfProducts.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/EDPutToken.h"
 
 #include "DataFormats/Histograms/interface/DQMToken.h"
@@ -63,6 +64,15 @@ class DQMEDHarvester
   edm::EDPutTokenT<DQMToken> runToken_;
   edm::EDPutTokenT<DQMToken> jobToken_;
 
+  static void fillDescription(edm::ParameterSetDescription &iDesc) {
+    iDesc.addUntracked<std::string>("inputGeneration", "DQMGenerationReco");
+    iDesc.addUntracked<std::string>("outputGeneration", "DQMGenerationHarvesting");
+    iDesc.addUntracked<std::vector<edm::InputTag>>("inputMEs", std::vector<edm::InputTag>())
+        ->setComment(
+            "DQM tokens to read from other modules. Used to form dependencies between MonitorElements created by other "
+            "modules.");
+  }
+
 public:
   DQMEDHarvester(edm::ParameterSet const &iConfig) {
     usesResource("DQMStore");

DQMServices/Core/src/DQMStore.cc

@@ -89,7 +89,7 @@ namespace dqm::implementation {
     // However, it is easier to do that in putME().
 
     MonitorElement* me = store_->findME(path);
-    store_->printTrace("Booking " + std::string(name) + (me ? " (existing)" : " (new)"));
+    store_->printTrace("Booking " + fullpath + (me ? " (existing)" : " (new)"));
 
     if (me == nullptr) {
       // no existing global ME found. We need to instantiate one, and put it