Merge pull request #5182 from ebouvier/PathsUpdateForTopPAG

DQM -- Update RunII path names in Top PAG DQM and validation codes
cms-sw · Sep 6, 2014 · 1360bef · 1360bef
2 parents 6722d64 + dc73869
commit 1360bef
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 32 deletions.
diff --git a/DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py b/DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py
@@ -211,7 +211,7 @@
     ## will be empty
     triggerExtras = cms.PSet(
       src   = cms.InputTag("TriggerResults","","HLT"),
-      paths = cms.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v'])
+      paths = cms.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v'])
      )
   ),
   ## ------------------------------------------------------
@@ -224,7 +224,7 @@
   preselection = cms.PSet(
     trigger = cms.PSet(
       src    = cms.InputTag("TriggerResults","","HLT"),
-      select = cms.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v'])
+      select = cms.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v'])
      ),
     ## [optional] : when omitted no preselection is applied
     vertex = cms.PSet(

diff --git a/DQMOffline/Trigger/python/topDiLeptonHLTEventDQM_cfi.py b/DQMOffline/Trigger/python/topDiLeptonHLTEventDQM_cfi.py
@@ -65,11 +65,10 @@
         src = cms.InputTag("TriggerResults","","HLT"),
         pathsELECMU = cms.vstring([ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v',
                                     'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v']),
-        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
-                                    'HLT_Mu17_Mu8_v']),
-        pathsDIELEC = cms.vstring([ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v',
-                                    'HLT_Ele23_Ele12_CaloId_TrackId_iso_v',
-                                    'HLT_Ele17_Ele8_Gsf_v'])
+        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TkMu8_v']),
+        pathsDIELEC = cms.vstring([ 'HLT_Ele23_Ele12_CaloId_TrackId_iso_v'])
     )    
   ),
 
@@ -84,7 +83,7 @@
     ## [optional] : when omitted no preselection is applied
     trigger = cms.PSet(
         src    = cms.InputTag("TriggerResults","","HLT"),
-        select = cms.vstring(['HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v','HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v','HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v','HLT_Mu17_Mu8_v','HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v','HLT_Ele23_Ele12_CaloId_TrackId_iso_v','HLT_Ele17_Ele8_Gsf_v'])
+        select = cms.vstring(['HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v','HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v','HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v','HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v','HLT_Mu17_TkMu8_v','HLT_Ele23_Ele12_CaloId_TrackId_iso_v'])
     ),
     ## [optional] : when omitted no preselection is applied
     vertex = cms.PSet(
@@ -193,11 +192,10 @@
         src = cms.InputTag("TriggerResults","","HLT"),
         pathsELECMU = cms.vstring([ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v',
                                     'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v']),
-        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
-                                    'HLT_Mu17_Mu8_v']),
-        pathsDIELEC = cms.vstring([ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v',
-                                    'HLT_Ele23_Ele12_CaloId_TrackId_iso_v',
-                                    'HLT_Ele17_Ele8_Gsf_v'])
+        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TkMu8_v']),
+        pathsDIELEC = cms.vstring([ 'HLT_Ele23_Ele12_CaloId_TrackId_iso_v'])
     )    
   ),
 
@@ -212,7 +210,7 @@
     ## [optional] : when omitted no preselection is applied
     trigger = cms.PSet(
         src    = cms.InputTag("TriggerResults","","HLT"),
-        select = cms.vstring(['HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v','HLT_Mu17_Mu8_v']),
+        select = cms.vstring(['HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v','HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v','HLT_Mu17_TkMu8_v']),
     ),
     ## [optional] : when omitted no preselection is applied
     vertex = cms.PSet(
@@ -327,11 +325,10 @@
         src = cms.InputTag("TriggerResults","","HLT"),
         pathsELECMU = cms.vstring([ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v',
                                     'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v']),
-        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
-                                    'HLT_Mu17_Mu8_v']),
-        pathsDIELEC = cms.vstring([ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v',
-                                    'HLT_Ele23_Ele12_CaloId_TrackId_iso_v',
-                                    'HLT_Ele17_Ele8_Gsf_v'])
+        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TkMu8_v']),
+        pathsDIELEC = cms.vstring([ 'HLT_Ele23_Ele12_CaloId_TrackId_iso_v'])
     )    
   ),
 
@@ -346,7 +343,7 @@
     ## [optional] : when omitted no preselection is applied
     trigger = cms.PSet(
         src    = cms.InputTag("TriggerResults","","HLT"),
-        select = cms.vstring(['HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v','HLT_Ele23_Ele12_CaloId_TrackId_iso_v','HLT_Ele17_Ele8_Gsf_v'])
+        select = cms.vstring(['HLT_Ele23_Ele12_CaloId_TrackId_iso_v'])
     ),
     ## [optional] : when omitted no preselection is applied
     vertex = cms.PSet(
@@ -462,11 +459,10 @@
         src = cms.InputTag("TriggerResults","","HLT"),
         pathsELECMU = cms.vstring([ 'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v',
                                     'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v']),
-        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
-                                    'HLT_Mu17_Mu8_v']),
-        pathsDIELEC = cms.vstring([ 'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v',
-                                    'HLT_Ele23_Ele12_CaloId_TrackId_iso_v',
-                                    'HLT_Ele17_Ele8_Gsf_v'])
+        pathsDIMUON = cms.vstring([ 'HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',
+                                    'HLT_Mu17_TkMu8_v']),
+        pathsDIELEC = cms.vstring([ 'HLT_Ele23_Ele12_CaloId_TrackId_iso_v'])
     )    
   ),
 

diff --git a/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py b/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py
@@ -86,7 +86,7 @@
   preselection = cms.PSet(
    trigger = cms.PSet(
       src    = cms.InputTag("TriggerResults","","HLT"),
-      select = cms.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v', 'HLT_IsoMu24_IterTrk02_v', 'HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v', 'HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v', 'HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v'])
+      select = cms.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v', 'HLT_IsoMu24_IterTrk02_v', 'HLT_IsoMu24_IterTrk02_TriCentralPFJet60_50_35_v', 'HLT_IsoMu24_IterTrk02_TriCentralPFJet40_v', 'HLT_IsoMu24_IterTrk02_CentralPFJet30_BTagCSV_v'])
     ),
     ## [optional] : when omitted no preselection is applied
     vertex = cms.PSet(
@@ -346,7 +346,7 @@
     ## will be empty
     triggerExtras = cms.PSet(
       src   = cms.InputTag("TriggerResults","","HLT"),
-      paths = cms.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v'])
+      paths = cms.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v'])
     )
   ),
   ## ------------------------------------------------------
@@ -359,7 +359,7 @@
   preselection = cms.PSet(
    trigger = cms.PSet(
       src    = cms.InputTag("TriggerResults","","HLT"),
-      select = cms.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v'])
+      select = cms.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v'])
     ),
     ## [optional] : when omitted no preselection is applied
     vertex = cms.PSet(

diff --git a/HLTriggerOffline/Top/python/singletopHLTEventValidation_cfi.py b/HLTriggerOffline/Top/python/singletopHLTEventValidation_cfi.py
@@ -49,5 +49,5 @@
         minJets      = cms.untracked.uint32(2),
         # Trigger
         sTrigger     = cms.untracked.string("TriggerResults"),
-        vsPaths      = cms.untracked.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v']),
+        vsPaths      = cms.untracked.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v']),
 )
diff --git a/HLTriggerOffline/Top/python/topDiLeptonHLTEventValidation_cfi.py b/HLTriggerOffline/Top/python/topDiLeptonHLTEventValidation_cfi.py
@@ -23,7 +23,7 @@
         minJets      = cms.untracked.uint32(2),
         # Trigger
         sTrigger     = cms.untracked.string("TriggerResults"),
-        vsPaths      = cms.untracked.vstring(['HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v',' HLT_Mu17_Mu8_v']),
+        vsPaths      = cms.untracked.vstring(['HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v','HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v','HLT_Mu17_TkMu8_v']),
 )
 
 # ttbar dielec
@@ -49,7 +49,7 @@
         minJets      = cms.untracked.uint32(2),
         # Trigger
         sTrigger     = cms.untracked.string("TriggerResults"),
-        vsPaths      = cms.untracked.vstring(['HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v','HLT_Ele23_Ele12_CaloId_TrackId_iso_v','HLT_Ele17_Ele8_Gsf_v']),
+        vsPaths      = cms.untracked.vstring(['HLT_Ele23_Ele12_CaloId_TrackId_iso_v']),
 )
 
 # ttbar elec-muon

diff --git a/HLTriggerOffline/Top/python/topSingleLeptonHLTEventValidation_cfi.py b/HLTriggerOffline/Top/python/topSingleLeptonHLTEventValidation_cfi.py
@@ -49,5 +49,5 @@
         minJets      = cms.untracked.uint32(4),
         # Trigger
         sTrigger     = cms.untracked.string("TriggerResults"),
-        vsPaths      = cms.untracked.vstring(['HLT_Ele27_WP80_Gsf_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP80_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP80_Gsf_CentralPFJet30_BTagCSV_v']),
+        vsPaths      = cms.untracked.vstring(['HLT_Ele27_WP85_Gsf_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet40_v', 'HLT_Ele27_WP85_Gsf_TriCentralPFJet60_50_35_v', 'HLT_Ele27_WP85_Gsf_CentralPFJet30_BTagCSV_v']),
 )