diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py index 759a492fff38894d5e8c9980e6e086d0ad31f562..2bd82b32b2ececa9e8730087f0543b4372a74116 100755 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py @@ -385,7 +385,7 @@ class _BTaggingFlags: #defaultJetCollections = ['AntiKt4LCTopo','AntiKt6LCTopo','AntiKt4TopoEM','AntiKt6TopoEM'] - defaultJetCollections = ['AntiKt4LCTopo','AntiKt4EMTopo'] + defaultJetCollections = ['AntiKt4EMTopo'] for attr in self._Jets: setattr(self, attr, defaultJetCollections[:]) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_jobOptions.py index 6b1d265a72b3a8c8f45c691dd92fd73c84741432..67255bb3bd6e56a2f5d9fc5ab8af8303ca14abd3 100755 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_jobOptions.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTagging_jobOptions.py @@ -52,10 +52,11 @@ if not BTaggingFlags.DoNotSetupBTagging: # Temporary measure so the JetRec peopl if ConfInstance.checkFlagsUsingBTaggingFlags(): #Jet collections - JetCollectionList = ['AntiKt4LCTopoJets', 'AntiKt4EMTopoJets', 'AntiKt4TrackJets', 'AntiKt4EMPFlowJets', 'AntiKt2TrackJets'] + #JetCollectionList = ['AntiKt4LCTopoJets', 'AntiKt4EMTopoJets', 'AntiKt4TrackJets', 'AntiKt4EMPFlowJets', 'AntiKt2TrackJets'] + JetCollectionList = ['AntiKt4EMTopoJets'] from JetRec.JetRecFlags import jetFlags - if jetFlags.useTruth(): - JetCollectionList += [ 'AntiKt10TruthWZJets', 'AntiKt4TruthWZJets' ] + #if jetFlags.useTruth(): + # JetCollectionList += [ 'AntiKt10TruthWZJets', 'AntiKt4TruthWZJets' ] #WOUTER: Moved these into the BTaggingsFlags.py file. #BTaggingFlags.CalibrationChannelAliases += [ "AntiKt4EMTopo->AntiKt4TopoEM" ] diff --git a/Reconstruction/Jet/JetRec/python/JetRecFlags.py b/Reconstruction/Jet/JetRec/python/JetRecFlags.py index 8b43fcea27d23d1e4364499820462088375df684..258db5c26a9090fceaaca77e5cb0ec61e001c485 100644 --- a/Reconstruction/Jet/JetRec/python/JetRecFlags.py +++ b/Reconstruction/Jet/JetRec/python/JetRecFlags.py @@ -227,7 +227,7 @@ class detailLevel(JobProperty): """ statusOn = True allowedTypes = ['int'] - StoredValue = JetContentDetail.Full + StoredValue = JetContentDetail.Reduced