Backport of PRs cms-sw#41196 and cms-sw#41375

Ming-Yan · Nov 29, 2023 · 88c5af5 · 88c5af5
1 parent ed93324
commit 88c5af5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 34 deletions.
diff --git a/DQMServices/Core/interface/DQMStore.h b/DQMServices/Core/interface/DQMStore.h
@@ -753,8 +753,6 @@ namespace dqm {
       void debugTrackME(const char* message, MonitorElement* me_local, MonitorElement* me_global) const;
       // accesor to keep MEsToSave_ private
       const auto& getMEsToSave() const { return MEsToSave_; }
-      // accesor to keep onlineMode_ private
-      const bool& getMode() const { return onlineMode_; }
 
     private:
       // MEComparison is a name-only comparison on MEs and Paths, allowing

diff --git a/DQMServices/Core/python/nanoDQMIO_perLSoutput_cff.py b/DQMServices/Core/python/nanoDQMIO_perLSoutput_cff.py
@@ -55,36 +55,6 @@
     "PixelPhase1/Tracks/PXForward/size_PXDisk_-2",
     "PixelPhase1/Tracks/PXForward/size_PXDisk_-3",
     "HLT/Vertexing/hltPixelVertices/hltPixelVertices/goodvtxNbr",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_eta",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_hits",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_phi",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_pt",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_unMatched_eta",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_unMatched_hits",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_unMatched_phi",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/mon_unMatched_pt",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_eta",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_hits",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_matched_eta",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_matched_hits",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_matched_phi",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_matched_pt",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_phi",
-    "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurityPV/ref_pt",
-    "HLT/Tracking/pixelTracks/GeneralProperties/Chi2Prob_GenTk",
-    "HLT/Tracking/pixelTracks/GeneralProperties/Chi2oNDFVsEta_ImpactPoint_GenTk",
-    "HLT/Tracking/pixelTracks/GeneralProperties/DeltaZToPVZoom_GenTk",
-    "HLT/Tracking/pixelTracks/GeneralProperties/DistanceOfClosestApproachToPVVsPhi_GenTk",
-    "HLT/Tracking/pixelTracks/GeneralProperties/DistanceOfClosestApproachToPVZoom_GenTk",
-    "HLT/Tracking/pixelTracks/GeneralProperties/NumberOfTracks_GenTk",
-    "HLT/Tracking/tracks/GeneralProperties/Chi2Prob_GenTk",
-    "HLT/Tracking/tracks/GeneralProperties/Chi2oNDFVsEta_ImpactPoint_GenTk",
-    "HLT/Tracking/tracks/GeneralProperties/DeltaZToPVZoom_GenTk",
-    "HLT/Tracking/tracks/GeneralProperties/DistanceOfClosestApproachToPVVsPhi_GenTk",
-    "HLT/Tracking/tracks/GeneralProperties/DistanceOfClosestApproachToPVZoom_GenTk",
-    "HLT/Tracking/tracks/GeneralProperties/NumberOfTracks_GenTk",
-    "HLT/Tracking/tracks/LUMIanalysis/NumberEventsVsLUMI",
-    "HLT/Tracking/tracks/PUmonitoring/NumberEventsVsGoodPVtx",
     "PixelPhase1/Tracks/num_clusters_ontrack_PXBarrel",
     "PixelPhase1/Tracks/num_clusters_ontrack_PXForward",
     "PixelPhase1/Tracks/clusterposition_zphi_ontrack",

diff --git a/DQMServices/Core/src/DQMStore.cc b/DQMServices/Core/src/DQMStore.cc
@@ -102,7 +102,7 @@ namespace dqm::implementation {
 
       const auto& MEs = store_->getMEsToSave();
 
-      if (not MEs.empty() && not store_->getMode()) {
+      if (not MEs.empty()) {
         bool pathInList = false;
         for (const auto& thepath : MEs) {
           if (fullpath == thepath) {
@@ -684,7 +684,7 @@ namespace dqm::implementation {
         for (std::vector<std::string>::const_iterator ipath = store_->MEsToSave_.begin();
              ipath != store_->MEsToSave_.end();
              ++ipath) {
-          const std::string& nameToSave = *ipath;
+          std::string nameToSave = *ipath;
           // option 1 (used in the past): inclusive selection
           // (store all MEs that contain any of the requested patterns)
           // if (name.find(nameToSave) != std::string::npos) {