Merge pull request #11404 from HuguesBrun/updateDQMforNewIso

Update muon HLT DQM for new muon isolation
cms-sw · Sep 24, 2015 · 5ce91fc · 5ce91fc
2 parents b7ffe63 + 409d4f7
commit 5ce91fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cfi.py b/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cfi.py
@@ -30,10 +30,16 @@
       "HLT_IsoTkMu27_v",
       "HLT_Mu27_v",
       "HLT_TkMu27_v",
-      "HLT_IsoMu20_v1",
-      "HLT_Mu20_v1",
-      "HLT_IsoTkMu20_v1",
-      "HLT_TkMu20_v1",
+      "HLT_IsoMu20_v",
+      "HLT_Mu20_v",
+      "HLT_TkMu20_v",
+      "HLT_IsoTkMu20_v",
+      "HLT_IsoMu22_v",
+      "HLT_IsoTkMu22_v",
+      "HLT_IsoMu18_v",
+      "HLT_IsoTkMu18_v",
+      "HLT_OldIsoMu18_v",
+      "HLT_OldIsoTkMu18_v",
       "HLT_L1SingleMu16_v",
       "HLT_L2Mu10_v",
       "HLT_HIL1DoubleMu0", #for HI

diff --git a/HLTriggerOffline/Muon/python/hltMuonValidator_cfi.py b/HLTriggerOffline/Muon/python/hltMuonValidator_cfi.py
@@ -4,7 +4,7 @@
 
     hltProcessName = cms.string("HLT"),
     hltPathsToCheck = cms.vstring(
-        "HLT_(L[12])?(Double)?(Iso)?(Tk)?Mu[0-9]*(Open)?(_NoVertex)?(_eta2p1)?(_IterTrk02)?(_v[0-9]*)?$",
+        "HLT_(L[12])?(OldIso)?(Iso)?(Tk)?Mu[0-9]*(Open)?(_NoVertex)?(_eta2p1)?(_v[0-9]*)?$",
         "HLT_Mu17_NoFilters?(_v[0-9]*)?$",
         "HLT_Dimuon0_Jpsi_v10",
         "HLT_Dimuon13_Jpsi_Barrel_v5",

diff --git a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc
@@ -131,13 +131,13 @@ HLTMuonValidator::stepLabels(const vector<string>& modules) {
             else
                 steps.push_back("L2Iso");
         }
-        else if ((modules[i].find("pfecalIsoRhoFiltered") != string::npos)) {
+        else if ((modules[i].find("pfecalIsoRhoFiltered") != string::npos)||(modules[i].find("pfecalOldIsoRhoFiltered") != string::npos)) {
             if (modules[i].find("L3") != string::npos)
                 steps.push_back("L3EcalIso");
             else if (modules[i].find("TkFiltered") != string::npos)
                 steps.push_back("TkEcalIso");
         }
-        else if ((modules[i].find("pfhcalIsoRhoFiltered") != string::npos)) {
+        else if ((modules[i].find("pfhcalIsoRhoFiltered") != string::npos)||(modules[i].find("pfhcalOldIsoRhoFiltered") != string::npos)) {
             if (modules[i].find("L3") != string::npos)
                 steps.push_back("L3HcalIso");
             else if (modules[i].find("TkFiltered") != string::npos)