Merge pull request cms-sw#192 from kirschen/CMGTools-from-CMSSW_7_2_3

Move genlep/gentau/genlepfromtau from treeProducerSusyFullHad back to treeProducerSusyCore
parbol · Jan 8, 2015 · 1b69e81 · 1b69e81
2 parents 072359a + d5b6b36
commit 1b69e81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyCore.py b/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyCore.py
@@ -52,8 +52,8 @@
 }
 
 susyCore_collections = {
-            #"genleps"         : NTupleCollection("genLep",     genParticleWithSourceType, 10, help="Generated leptons (e/mu) from W/Z decays"),
-            #"gentauleps"      : NTupleCollection("genLepFromTau", genParticleWithSourceType, 10, help="Generated leptons (e/mu) from decays of taus from W/Z/h decays"),
-            #"gentaus"         : NTupleCollection("genTau",     genParticleWithSourceType, 10, help="Generated leptons (tau) from W/Z decays"),
+            "genleps"         : NTupleCollection("genLep",     genParticleWithLinksType, 10, help="Generated leptons (e/mu) from W/Z decays"),                                                                                                
+            "gentauleps"      : NTupleCollection("genLepFromTau", genParticleWithLinksType, 10, help="Generated leptons (e/mu) from decays of taus from W/Z/h decays"),                                                                       
+            "gentaus"         : NTupleCollection("genTau",     genParticleWithLinksType, 10, help="Generated leptons (tau) from W/Z decays"),                            
             "generatorSummary" : NTupleCollection("GenPart", genParticleWithLinksType, 100 , help="Hard scattering particles, with ancestry and links"),
 }
diff --git a/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyFullHad.py b/CMGTools/TTHAnalysis/python/analyzers/treeProducerSusyFullHad.py
@@ -115,9 +115,6 @@
 susyFullHad_collections.update({
         # put more here
 ##        "gennus"         : NTupleCollection("genNu",     genParticleWithSourceType, 10, help="Generated neutrinos (nue/numu/nutau) from W/Z decays"),
-        "genleps"         : NTupleCollection("genLep",     genParticleWithLinksType, 10, help="Generated leptons (e/mu) from W/Z decays"),                                                                                                
-        "gentauleps"      : NTupleCollection("genLepFromTau", genParticleWithLinksType, 10, help="Generated leptons (e/mu) from decays of taus from W/Z/h decays"),                                                                       
-        "gentaus"         : NTupleCollection("genTau",     genParticleWithLinksType, 10, help="Generated leptons (tau) from W/Z decays"),                            
         "selectedLeptons" : NTupleCollection("lep", leptonTypeSusy, 50, help="Leptons after the preselection", filter=lambda l : l.pt()>10 ),
         "selectedTaus"    : NTupleCollection("tau", tauTypeSusy, 50, help="Taus after the preselection"),
         "cleanJetsAll"       : NTupleCollection("jet",     jetTypeSusy, 100, help="all jets (w/ x-cleaning, w/ ID applied w/o PUID applied pt>10 |eta|<5.2) , sorted by pt", filter=lambda l : l.pt()>10  ),