fix conflicts from @Velken #17

jpata · Mar 1, 2015 · 5ab4409 · 5ab4409
2 parents aa91188 + 33eeade
commit 5ab4409
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/VHbbAnalysis/Heppy/test/crab/datasets.txt b/VHbbAnalysis/Heppy/test/crab/datasets.txt
@@ -7,6 +7,7 @@
 /ZH_HToBB_ZToNuNu_M-125_13TeV_powheg-herwigpp/Phys14DR-AVE30BX50_tsg_PHYS14_ST_V1-v1/MINIAODSIM
 /ZH_HToBB_ZToNuNu_M-125_13TeV_powheg-herwigpp/Phys14DR-PU40bx25_PHYS14_25_V1-v1/MINIAODSIM
 /ZH_HToBB_ZToNuNu_M-125_13TeV_powheg-herwigpp/Phys14DR-PU20bx25_tsg_PHYS14_25_V1-v1/MINIAODSIM
+/TTbarH_HToTauTau_M-125_13TeV_amcatnlo-pythia8-tauola/Phys14DR-AVE30BX50_tsg_PHYS14_ST_V1-v1/MINIAODSIM
 /QCD_HT-100To250_13TeV-madgraph/Phys14DR-PU20bx25_PHYS14_25_V1-v1/MINIAODSIM
 /QCD_HT_250To500_13TeV-madgraph/Phys14DR-PU20bx25_PHYS14_25_V1-v1/MINIAODSIM
 /QCD_HT_250To500_13TeV-madgraph/Phys14DR-PU20bx25_PHYS14_25_V1_ext1-v2/MINIAODSIM

diff --git a/VHbbAnalysis/Heppy/test/vhbb.py b/VHbbAnalysis/Heppy/test/vhbb.py
@@ -151,22 +151,28 @@
 #sh = cfg.Analyzer( class_object=HeppyShell)
 
 from PhysicsTools.Heppy.analyzers.core.TriggerBitAnalyzer import TriggerBitAnalyzer
-TrigAna= cfg.Analyzer(
-   verbose=False,
-   class_object=TriggerBitAnalyzer,
-   triggerBits={
-   "METBTAG":["HLT_PFMET120_NoiseCleaned_BTagCSV07_v*"],
-   "MET":["HLT_PFMET170_NoiseCleaned_v*"],
-   "DIELE" : ["HLT_Ele23_Ele12_CaloId_TrackId_Iso_v*"],
-   "ELE": ["HLT_Ele32_eta2p1_WP85_Gsf_v*","HLT_Ele32_eta2p1_WP85_Gsf_v*"],
-   "DIMU" : ["HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v*","HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v*"],
-   "MU" : ["HLT_IsoTkMu24_eta2p1_IterTrk02_v*","HLT_IsoTkMu24_IterTrk02_v*"],
-   "TAU": ["HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v*"],
-   "HH4bQuad":["HLT_QuadJet45_TripleCSV0p5_v*"],
-   "HH4bDouble":["HLT_DoubleJet90_Double30_TripleCSV0p5_v*"],  
+TrigAna = cfg.Analyzer(
+    verbose = False,
+    class_object = TriggerBitAnalyzer,
+    triggerBits = {
+        "METBTAG" : [ "HLT_PFMET120_NoiseCleaned_BTagCSV07_v*" ],
+        "MET"     : [ "HLT_PFMET170_NoiseCleaned_v*" ],
+        "DIELE"   : [ "HLT_Ele23_Ele12_CaloId_TrackId_Iso_v*" ],
+        "ELE"     : [ "HLT_Ele32_eta2p1_WP85_Gsf_v*", "HLT_Ele32_eta2p1_WP85_Gsf_v*" ],
+        "DIMU"    : [ "HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v*", "HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v*" ],
+        "MU"      : [ "HLT_IsoTkMu24_eta2p1_IterTrk02_v*", "HLT_IsoTkMu24_IterTrk02_v*" ],
+        "TAU"     : ["HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v*"],
+        "HH4bQuad":["HLT_QuadJet45_TripleCSV0p5_v*"],
+        "HH4bDouble":["HLT_DoubleJet90_Double30_TripleCSV0p5_v*"],  
+        "MUE"     : [ "HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v*" ],
+        "EMU"     : [ "HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v*" ],
+        "METTAU"  : [ "HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_v*" ],
+        "ELETAU"  : [ "HLT_Ele22_eta2p1_WP85_Gsf_LooseIsoPFTau20_v*" ],
+        "MUTAU"   : [ "HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v*" ],
+        "DiTAU"   : [ "HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v*" ],
    },
-#   processName='HLT',
-#   outprefix='HLT'
+#   processName = 'HLT',
+#   outprefix = 'HLT'
    )
 
 from PhysicsTools.HeppyCore.framework.services.tfile import TFileService