Removal of example (default) trigger matching from the standard work-…

…fkow and complete review of Python trigger tools.
cms-sw · Sep 2, 2010 · da63669 · da63669
1 parent 21b06b0
commit da63669
Show file tree

Hide file tree

Showing 7 changed files with 868 additions and 367 deletions.
diff --git a/PhysicsTools/PatAlgos/plugins/PATTriggerMatchEmbedder.cc b/PhysicsTools/PatAlgos/plugins/PATTriggerMatchEmbedder.cc
@@ -10,10 +10,10 @@
    .
 
   \author   Volker Adler
-  \version  $Id: PATTriggerMatchEmbedder.cc,v 1.4 2010/04/20 21:39:47 vadler Exp $
+  \version  $Id: PATTriggerMatchEmbedder.cc,v 1.7 2010/09/01 18:56:48 vadler Exp $
 */
 //
-// $Id: PATTriggerMatchEmbedder.cc,v 1.4 2010/04/20 21:39:47 vadler Exp $
+// $Id: PATTriggerMatchEmbedder.cc,v 1.7 2010/09/01 18:56:48 vadler Exp $
 //
 
 
@@ -55,11 +55,11 @@ namespace pat {
   };
 
   typedef PATTriggerMatchEmbedder< Electron > PATTriggerMatchElectronEmbedder;
-  typedef PATTriggerMatchEmbedder< Jet >         PATTriggerMatchJetEmbedder;
-  typedef PATTriggerMatchEmbedder< MET >         PATTriggerMatchMETEmbedder;
-  typedef PATTriggerMatchEmbedder< Muon >        PATTriggerMatchMuonEmbedder;
-  typedef PATTriggerMatchEmbedder< Photon >      PATTriggerMatchPhotonEmbedder;
-  typedef PATTriggerMatchEmbedder< Tau >     PATTriggerMatchTauEmbedder;
+  typedef PATTriggerMatchEmbedder< Jet >      PATTriggerMatchJetEmbedder;
+  typedef PATTriggerMatchEmbedder< MET >      PATTriggerMatchMETEmbedder;
+  typedef PATTriggerMatchEmbedder< Muon >     PATTriggerMatchMuonEmbedder;
+  typedef PATTriggerMatchEmbedder< Photon >   PATTriggerMatchPhotonEmbedder;
+  typedef PATTriggerMatchEmbedder< Tau >      PATTriggerMatchTauEmbedder;
 
 }
 

diff --git a/PhysicsTools/PatAlgos/python/patEventContent_cff.py b/PhysicsTools/PatAlgos/python/patEventContent_cff.py
@@ -45,7 +45,7 @@
     'keep patTriggerObjects_patTrigger_*_*',
     'keep patTriggerFilters_patTrigger_*_*',
     'keep patTriggerPaths_patTrigger_*_*',
-    'keep patTriggerEvent_patTriggerEvent_*_*'
+    'keep *_patTriggerEvent_*_*'
 ]
 patTriggerStandAloneEventContent = [
     'keep patTriggerObjectStandAlones_patTrigger_*_*',
@@ -57,12 +57,12 @@
 ]
 
 patEventContentTriggerMatch = [
-    'keep *_cleanPatPhotonsTriggerMatch_*_*',
-    'keep *_cleanPatElectronsTriggerMatch_*_*',
-    'keep *_cleanPatMuonsTriggerMatch_*_*',
-    'keep *_cleanPatTausTriggerMatch_*_*',
-    'keep *_cleanPatJetsTriggerMatch_*_*',
-    'keep *_patMETsTriggerMatch_*_*'
+    'keep *_*PatPhotons*TriggerMatch_*_*',
+    'keep *_*PatElectrons*TriggerMatch_*_*',
+    'keep *_*PatMuons*TriggerMatch_*_*',
+    'keep *_*PatTaus*TriggerMatch_*_*',
+    'keep *_*PatJets*TriggerMatch_*_*',
+    'keep *_patMETs*TriggerMatch_*_*'
 ]
 
 patHiEventContent = [

diff --git a/PhysicsTools/PatAlgos/python/tools/trigTools.py b/PhysicsTools/PatAlgos/python/tools/trigTools.py
diff --git a/PhysicsTools/PatAlgos/python/triggerLayer1/triggerEventProducer_cfi.py b/PhysicsTools/PatAlgos/python/triggerLayer1/triggerEventProducer_cfi.py
@@ -1,18 +1,12 @@
 import FWCore.ParameterSet.Config as cms
 
-patTriggerEvent = cms.EDProducer( "PATTriggerEventProducer"
+patTriggerEvent = cms.EDProducer(
+  "PATTriggerEventProducer"
 , processName        = cms.string( 'HLT' )               # default; change only, if you know exactly, what you are doing!
 # , triggerResults     = cms.InputTag( 'TriggerResults' )  # default; change only, if you know exactly, what you are doing!
 # , patTriggerProducer = cms.InputTag( 'patTrigger' )      # default; change only, if you know exactly, what you are doing!
 # , condGtTag          = cms.InputTag( 'conditionsInEdm' ) # default; change only, if you know exactly, what you are doing!
 # , l1GtTag            = cms.InputTag( 'gtDigis' )         # default; change only, if you know exactly, what you are doing!
 , patTriggerMatches  = cms.VInputTag(
-    'electronTriggerMatchHLTEle15LWL1R'
-  , 'electronTriggerMatchHLTDoubleEle5SWL1R'
-  , 'muonTriggerMatchL1Muon'
-  , 'muonTriggerMatchHLTIsoMu3'
-  , 'muonTriggerMatchHLTMu3'
-  , 'muonTriggerMatchHLTDoubleMu3'
-  , 'tauTriggerMatchHLTDoubleLooseIsoTau15'
   )
 )
diff --git a/PhysicsTools/PatAlgos/python/triggerLayer1/triggerMatchEmbedder_cfi.py b/PhysicsTools/PatAlgos/python/triggerLayer1/triggerMatchEmbedder_cfi.py
@@ -1,57 +1,86 @@
 import FWCore.ParameterSet.Config as cms
 
 # Embedding in photons
-cleanPatPhotonsTriggerMatch = cms.EDProducer( "PATTriggerMatchPhotonEmbedder"
+cleanPatPhotonsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchPhotonEmbedder"
 , src     = cms.InputTag( "cleanPatPhotons" )
 , matches = cms.VInputTag(
   )
 )
+selectedPatPhotonsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchPhotonEmbedder"
+, src     = cms.InputTag( "selectedPatPhotons" )
+, matches = cms.VInputTag(
+  )
+)
 
 # Embedding in electrons
-cleanPatElectronsTriggerMatch = cms.EDProducer( "PATTriggerMatchElectronEmbedder"
+cleanPatElectronsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchElectronEmbedder"
 , src     = cms.InputTag( "cleanPatElectrons" )
 , matches = cms.VInputTag(
-    "electronTriggerMatchHLTEle15LWL1R"
-  , "electronTriggerMatchHLTDoubleEle5SWL1R"
+  )
+)
+selectedPatElectronsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchElectronEmbedder"
+, src     = cms.InputTag( "selectedPatElectrons" )
+, matches = cms.VInputTag(
   )
 )
 
 # Embedding in muons
-cleanPatMuonsTriggerMatch = cms.EDProducer( "PATTriggerMatchMuonEmbedder"
+cleanPatMuonsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchMuonEmbedder"
 , src     = cms.InputTag( "cleanPatMuons" )
 , matches = cms.VInputTag(
-    "muonTriggerMatchL1Muon"
-  , "muonTriggerMatchHLTIsoMu3"
-  , "muonTriggerMatchHLTMu3"
-  , "muonTriggerMatchHLTDoubleMu3"
+  )
+)
+selectedPatMuonsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchMuonEmbedder"
+, src     = cms.InputTag( "selectedPatMuons" )
+, matches = cms.VInputTag(
   )
 )
 
 # Embedding in taus
-cleanPatTausTriggerMatch = cms.EDProducer( "PATTriggerMatchTauEmbedder"
+cleanPatTausTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchTauEmbedder"
 , src     = cms.InputTag( "cleanPatTaus" )
 , matches = cms.VInputTag(
-    "tauTriggerMatchHLTDoubleLooseIsoTau15"
+  )
+)
+selectedPatTausTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchTauEmbedder"
+, src     = cms.InputTag( "selectedPatTaus" )
+, matches = cms.VInputTag(
   )
 )
 
 # Embedding in jets
-cleanPatJetsTriggerMatch = cms.EDProducer( "PATTriggerMatchJetEmbedder"
+cleanPatJetsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchJetEmbedder"
 , src     = cms.InputTag( "cleanPatJets" )
 , matches = cms.VInputTag(
   )
 )
+selectedPatJetsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchJetEmbedder"
+, src     = cms.InputTag( "selectedPatJets" )
+, matches = cms.VInputTag(
+  )
+)
 
 # Embedding in MET
-patMETsTriggerMatch = cms.EDProducer( "PATTriggerMatchMETEmbedder"
+patMETsTriggerMatch = cms.EDProducer(
+  "PATTriggerMatchMETEmbedder"
 , src     = cms.InputTag( "patMETs" )
 , matches = cms.VInputTag(
   )
 )
 
 
 ## Embedding sequences
-patTriggerMatchEmbedder = cms.Sequence(
+patTriggerMatchEmbedderDefaultSequence = cms.Sequence(
   cleanPatPhotonsTriggerMatch
 + cleanPatElectronsTriggerMatch
 + cleanPatMuonsTriggerMatch