DT DQM: attempt to clean Legacy (Run1) DDU settings

DQM/DTMonitorClient/python/dtFineDelayCorr_cfi.py

@@ -6,7 +6,7 @@
     # run in online environment
     runOnline = cms.untracked.bool(True),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),                         
     # root folder for booking of histograms
@@ -22,8 +22,8 @@
     outputFile = cms.string("dtFineDelaysNew.txt"),
     # Tag for the t0Mean Histograms
     t0MeanHistoTag  = cms.string("TrackCrossingTimeAll"),
-    # Hardware Source (DDU or TM)
-    hwSource = cms.string("DDU"),
+    # Hardware Source (TM)
+    hwSource = cms.string("TM"),
     # Choose to use Hist Mean or Gaussian Fit Mean
     gaussMean = cms.bool(False),
     # Require Minimum Number Of Entries in the t0Mean Histogram
@@ -36,6 +36,3 @@
 )
 
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( dtFineDelayCorr, hwSources = cms.untracked.vstring('TM'))
-

DQM/DTMonitorClient/python/dtLocalTriggerEfficiencyTest_cfi.py

@@ -7,14 +7,11 @@
     # run in online environment
     runOnline = cms.untracked.bool(True),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),
     # root folder for booking of histograms
     folderRoot = cms.untracked.string('')
 )
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( triggerEfficiencyTest, hwSources = cms.untracked.vstring('TM'))
-
 

DQM/DTMonitorClient/python/dtLocalTriggerLutTest_cfi.py

@@ -7,7 +7,7 @@
     # run in online environment
     runOnline = cms.untracked.bool(True),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),
     # enable/disable correlation plot tests
@@ -16,6 +16,3 @@
     folderRoot = cms.untracked.string('')
 )
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( triggerLutTest, hwSources = cms.untracked.vstring('TM'))
-

DQM/DTMonitorClient/python/dtLocalTriggerSynchTest_cfi.py

@@ -7,7 +7,7 @@
     # run in online environment
     runOnline = cms.untracked.bool(True),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),                         
     # root folder for booking of histograms
@@ -28,6 +28,3 @@
 )
 
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( triggerSynchTest, hwSources = cms.untracked.vstring('TM'))
-

DQM/DTMonitorClient/python/dtLocalTriggerTest_TP_cfi.py

@@ -7,13 +7,11 @@
     # run in online environment
     runOnline = cms.untracked.bool(True),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),                         
     # root folder for booking of histograms
     folderRoot = cms.untracked.string(''),
 )
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( dtTPTriggerTest, hwSources = cms.untracked.vstring('TM'))
 

DQM/DTMonitorClient/python/dtLocalTriggerTest_cfi.py

@@ -7,7 +7,7 @@
     # run in online environment
     runOnline = cms.untracked.bool(True),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),                         
     # root folder for booking of histograms
@@ -18,14 +18,9 @@
     # second fraction test tresholds
     secondFracError   = cms.untracked.double(0.95),
     secondFracWarning = cms.untracked.double(0.8),
-    # DDU-TM matching tests tresholds
-    matchingFracError     = cms.untracked.double(0.65),
-    matchingFracWarning   = cms.untracked.double(0.85),
     nEventsCert = cms.untracked.int32(1000)
 
 
 )
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( triggerTest, hwSources = cms.untracked.vstring('TM'))
 

DQM/DTMonitorClient/python/dtTriggerEfficiencyTest_cfi.py

@@ -7,7 +7,7 @@
     # run in online environment
     runOnline = cms.untracked.bool(False),
     # kind of trigger data processed by DTLocalTriggerTask
-    hwSources = cms.untracked.vstring('TM','DDU'),
+    hwSources = cms.untracked.vstring('TM'),
     # false if DTLocalTriggerTask used LTC digis
     localrun = cms.untracked.bool(True),
     # root folder for booking of histograms
@@ -16,6 +16,4 @@
     detailedAnalysis = cms.untracked.bool(False)                                  
 )
 
-from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( triggerEffTest, hwSources = cms.untracked.vstring('TM'))
 

DQM/DTMonitorClient/src/DTEfficiencyTest.cc

@@ -152,7 +152,6 @@ void DTEfficiencyTest::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker,
           // Loop over the TH1F bin and fill the ME to be used for the Quality Test
           for (int bin = firstWire; bin <= lastWire; bin++) {
             if ((recSegmOccupancy_histo_root->GetBinContent(bin)) != 0) {
-              //cout<<"book histos"<<endl;
               if (EfficiencyHistos.find(lID) == EfficiencyHistos.end())
                 bookHistos(ibooker, lID, firstWire, lastWire);
               float efficiency =

DQM/DTMonitorClient/src/DTLocalTriggerBaseTest.cc

@@ -106,8 +106,7 @@ string DTLocalTriggerBaseTest::getMEName(string histoTag, string subfolder, cons
   stringstream sector;
   sector << chambid.sector();
 
-  string folderName =
-      topFolder(hwSource == "TM") + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str() + "/";
+  string folderName = topFolder() + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str() + "/";
   if (!subfolder.empty()) {
     folderName += subfolder + "/";
   }
@@ -122,7 +121,7 @@ string DTLocalTriggerBaseTest::getMEName(string histoTag, string subfolder, int
   stringstream wheel;
   wheel << wh;
 
-  string folderName = topFolder(hwSource == "TM") + "Wheel" + wheel.str() + "/";
+  string folderName = topFolder() + "Wheel" + wheel.str() + "/";
   if (!subfolder.empty()) {
     folderName += subfolder + "/";
   }
@@ -139,8 +138,7 @@ void DTLocalTriggerBaseTest::bookSectorHistos(
   stringstream sc;
   sc << sector;
   int sectorid = (wheel + 3) + (sector - 1) * 5;
-  bool isTM = hwSource == "TM";
-  string basedir = topFolder(isTM) + "Wheel" + wh.str() + "/Sector" + sc.str() + "/";
+  string basedir = topFolder() + "Wheel" + wh.str() + "/Sector" + sc.str() + "/";
   if (!folder.empty()) {
     basedir += folder + "/";
   }
@@ -194,8 +192,7 @@ void DTLocalTriggerBaseTest::bookSectorHistos(
 }
 
 void DTLocalTriggerBaseTest::bookCmsHistos(DQMStore::IBooker& ibooker, string hTag, string folder, bool isGlb) {
-  bool isTM = hwSource == "TM";
-  string basedir = topFolder(isTM);
+  string basedir = topFolder();
   if (!folder.empty()) {
     basedir += folder + "/";
   }
@@ -215,11 +212,10 @@ void DTLocalTriggerBaseTest::bookWheelHistos(DQMStore::IBooker& ibooker, int whe
   stringstream wh;
   wh << wheel;
   string basedir;
-  bool isTM = hwSource == "TM";
   if (hTag.find("Summary") != string::npos) {
-    basedir = topFolder(isTM);  //Book summary histo outside wheel directories
+    basedir = topFolder();  //Book summary histo outside wheel directories
   } else {
-    basedir = topFolder(isTM) + "Wheel" + wh.str() + "/";
+    basedir = topFolder() + "Wheel" + wh.str() + "/";
   }
   if (!folder.empty()) {
     basedir += folder + "/";

DQM/DTMonitorClient/src/DTLocalTriggerBaseTest.h

@@ -91,7 +91,7 @@ class DTLocalTriggerBaseTest : public DQMEDHarvester {
   std::string getMEName(std::string histoTag, std::string subfolder, int wh);
 
   /// Get top folder name
-  inline std::string& topFolder(bool isTM) { return isTM ? baseFolderTM : baseFolderDDU; };
+  inline std::string& topFolder() { return baseFolderTM; };
 
   /// Get message logger name
   inline std::string category() { return "DTDQM|DTMonitorClient|" + testName + "Test"; };
@@ -108,7 +108,6 @@ class DTLocalTriggerBaseTest : public DQMEDHarvester {
   edm::ParameterSet parameters;
   bool runOnline;
   std::string baseFolderTM;
-  std::string baseFolderDDU;
   std::string trigSource;
   std::string hwSource;
   edm::ESHandle<DTGeometry> muonGeom;

DQM/DTMonitorClient/src/DTLocalTriggerEfficiencyTest.cc

@@ -34,7 +34,6 @@ using namespace std;
 DTLocalTriggerEfficiencyTest::DTLocalTriggerEfficiencyTest(const edm::ParameterSet& ps) : trigGeomUtils(nullptr) {
   setConfig(ps, "DTLocalTriggerEfficiency");
   baseFolderTM = "DT/03-LocalTrigger-TM/";
-  baseFolderDDU = "DT/04-LocalTrigger-DDU/";
 
   bookingdone = false;
 }
@@ -301,13 +300,12 @@ void DTLocalTriggerEfficiencyTest::bookChambHistos(DQMStore::IBooker& ibooker, D
   sector << chambId.sector();
 
   string fullType = fullName(htype);
-  bool isTM = hwSource == "TM";
   string HistoName = fullType + "_W" + wheel.str() + "_Sec" + sector.str() + "_St" + station.str();
 
-  ibooker.setCurrentFolder(topFolder(isTM) + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" +
-                           station.str() + "/Segment");
+  ibooker.setCurrentFolder(topFolder() + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str() +
+                           "/Segment");
 
-  LogTrace(category()) << "[" << testName << "Test]: booking " + topFolder(isTM) + "Wheel" << wheel.str() << "/Sector"
+  LogTrace(category()) << "[" << testName << "Test]: booking " + topFolder() + "Wheel" << wheel.str() << "/Sector"
                        << sector.str() << "/Station" << station.str() << "/Segment/" << HistoName;
 
   uint32_t indexChId = chambId.rawId();

DQM/DTMonitorClient/src/DTLocalTriggerLutTest.cc

@@ -33,7 +33,6 @@ using namespace std;
 DTLocalTriggerLutTest::DTLocalTriggerLutTest(const edm::ParameterSet& ps) {
   setConfig(ps, "DTLocalTriggerLut");
   baseFolderTM = "DT/03-LocalTrigger-TM/";
-  baseFolderDDU = "DT/04-LocalTrigger-DDU/";
   thresholdPhiMean = ps.getUntrackedParameter<double>("thresholdPhiMean", 1.5);
   thresholdPhiRMS = ps.getUntrackedParameter<double>("thresholdPhiRMS", .5);
   thresholdPhibMean = ps.getUntrackedParameter<double>("thresholdPhibMean", 1.5);

DQM/DTMonitorClient/src/DTLocalTriggerSynchTest.cc

@@ -40,7 +40,6 @@ using namespace std;
 DTLocalTriggerSynchTest::DTLocalTriggerSynchTest(const edm::ParameterSet& ps) {
   setConfig(ps, "DTLocalTriggerSynch");
   baseFolderTM = "DT/90-LocalTriggerSynch/";
-  baseFolderDDU = "DT/90-LocalTriggerSynch/";
 
   bookingdone = false;
 }
@@ -151,7 +150,7 @@ void DTLocalTriggerSynchTest::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IG
                             << endl;
 
     DTTPGParameters* delayMap = new DTTPGParameters();
-    hwSource = parameters.getParameter<bool>("dbFromTM") ? "TM" : "DDU";
+    hwSource = "TM";
     std::vector<const DTChamber*>::const_iterator chambIt = muonGeom->chambers().begin();
     std::vector<const DTChamber*>::const_iterator chambEnd = muonGeom->chambers().end();
     for (; chambIt != chambEnd; ++chambIt) {
@@ -214,8 +213,7 @@ float DTLocalTriggerSynchTest::getFloatFromME(DQMStore::IGetter& igetter, DTCham
   stringstream sector;
   sector << chId.sector();
 
-  string folderName =
-      topFolder(hwSource == "TM") + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str() + "/";
+  string folderName = topFolder() + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str() + "/";
 
   string histoname =
       sourceFolder + folderName + meType + "_W" + wheel.str() + "_Sec" + sector.str() + "_St" + station.str();
@@ -243,10 +241,9 @@ void DTLocalTriggerSynchTest::bookChambHistos(DQMStore::IBooker& ibooker,
   sector << chambId.sector();
 
   string fullType = fullName(htype);
-  bool isTM = hwSource == "TM";
   string HistoName = fullType + "_W" + wheel.str() + "_Sec" + sector.str() + "_St" + station.str();
 
-  string folder = topFolder(isTM) + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str();
+  string folder = topFolder() + "Wheel" + wheel.str() + "/Sector" + sector.str() + "/Station" + station.str();
   if (!subfolder.empty()) {
     folder += "7" + subfolder;
   }

DQM/DTMonitorClient/src/DTLocalTriggerTPTest.cc

@@ -33,7 +33,6 @@ using namespace std;
 DTLocalTriggerTPTest::DTLocalTriggerTPTest(const edm::ParameterSet& ps) {
   setConfig(ps, "DTLocalTriggerTP");
   baseFolderTM = "DT/11-LocalTriggerTP-TM/";
-  baseFolderDDU = "DT/12-LocalTriggerTP-DDU/";
 
   bookingdone = false;
 }
@@ -83,7 +82,7 @@ void DTLocalTriggerTPTest::runClientDiagnostic(DQMStore::IBooker& ibooker, DQMSt
           for (int sect = 1; sect <= 12; ++sect) {
             DTChamberId chId(wh, stat, sect);
 
-            // Perform TM/DDU common plot analysis (Phi ones)
+            // Perform TM common plot analysis (Phi ones)
             TH2F* BXvsQual = getHisto<TH2F>(igetter.get(getMEName("BXvsQual_In", "LocalTriggerPhiIn", chId)));
             if (BXvsQual) {
               if (BXvsQual->GetEntries() > 1) {