Merge branch 'cherry-pick-d555cf8853-master' into 'master'

Merge branch '21.0_AODReductions_JetsBTagging' into '21.0'

See merge request !2767

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[:])

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" ]

Reconstruction/Jet/JetRec/python/JetRecFlags.py

@@ -227,7 +227,7 @@ class detailLevel(JobProperty):
   """
   statusOn = True
   allowedTypes = ['int']
-  StoredValue = JetContentDetail.Full
+  StoredValue = JetContentDetail.Reduced