Follow recommendations of JetETMis how to add jets.

Also do not thin away all InDetTrackParticles in HIGG5D2.


Former-commit-id: fc922aaed05c6e49d05cbd37351a6f34f29c7071

PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py

@@ -223,17 +223,14 @@ higg2d4Seq += CfgMgr.DerivationFramework__DerivationKernel(
 if not "HIGG2D4Jets" in OutputJets:
     OutputJets["HIGG2D4Jets"] = []
 
-    addAntiKt2PV0TrackJets(higg2d4Seq, 'HIGG2D4Jets')
-    addAntiKt4PV0TrackJets(higg2d4Seq, "HIGG2D4Jets")
-    addDefaultTrimmedJets(higg2d4Seq,"HIGG2D4");
-
+    reducedJetList = ["AntiKt2PV0TrackJets", "AntiKt4PV0TrackJets", "AntiKt10LCTopoJets"]
     if jetFlags.useTruth:
-      addAntiKt4TruthJets(higg2d4Seq, "HIGG2D4Jets")
-      addAntiKt4TruthWZJets(higg2d4Seq, "HIGG2D4Jets")
+        reducedJetList += ['AntiKt4TruthJets','AntiKt4TruthWZJets']
+    replaceAODReducedJets(reducedJetList, higg2d4Seq, "HIGG2D4Jets")
 
+    addDefaultTrimmedJets(higg2d4Seq,"HIGG2D4");
+    if jetFlags.useTruth:
       HIGG5Common.addTrimmedTruthWZJets(higg2d4Seq,'HIGG2D4Jets')
-      # reducedJetList = ["AntiKt2PV0TrackJets", "AntiKt4PV0TrackJets", "AntiKt10LCTopoJets"]
-      # replaceAODReducedJets(reducedJetList, higg2d4Seq, "HIGG2D4Jets")
 
 #====================================================================
 # Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py

@@ -192,15 +192,13 @@ higg5d1Seq += CfgMgr.DerivationFramework__DerivationKernel(
 if not "HIGG5D1Jets" in OutputJets:
     OutputJets["HIGG5D1Jets"] = []
 
-    #AntiKt2PV0TrackJets
-    addAntiKt2PV0TrackJets(higg5d1Seq, 'HIGG5D1Jets')
-    addAntiKt4PV0TrackJets(higg5d1Seq, "HIGG5D1Jets")
-    addDefaultTrimmedJets(higg5d1Seq,"HIGG5D1");
-
+    reducedJetList = ["AntiKt2PV0TrackJets", "AntiKt4PV0TrackJets", "AntiKt10LCTopoJets"]
     if jetFlags.useTruth:
-      addAntiKt4TruthJets(higg5d1Seq, "HIGG5D1Jets")
-      addAntiKt4TruthWZJets(higg5d1Seq, "HIGG5D1Jets")
+        reducedJetList += ['AntiKt4TruthJets','AntiKt4TruthWZJets']
+    replaceAODReducedJets(reducedJetList, higg5d1Seq, "HIGG5D1Jets")
 
+    addDefaultTrimmedJets(higg5d1Seq,"HIGG5D1");
+    if jetFlags.useTruth:
       HIGG5Common.addTrimmedTruthWZJets(higg5d1Seq,'HIGG5D1Jets')
 
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py

@@ -39,13 +39,14 @@ thinningTools=[]
 
 # Establish the thinning helper (which will set up the services behind the scenes) 
 from DerivationFrameworkCore.ThinningHelper import ThinningHelper 
+# HIGG5D2ThinningHelper_AntiKt10LCTopoJet = ThinningHelper("HIGG5D2ThinningHelperAntiKt10LCTopoJet")
 HIGG5D2ThinningHelper = ThinningHelper("HIGG5D2ThinningHelper")
 #trigger navigation content
 HIGG5D2ThinningHelper.TriggerChains = 'HLT_e.*|HLT_mu.*|HLT_xe.*|HLT_j.*' 
 HIGG5D2ThinningHelper.AppendToStream(HIGG5D2Stream) 
 
 import DerivationFrameworkHiggs.HIGG5Common as HIGG5Common
-thinningTools.append( HIGG5Common.getAntiKt4EMTopoTrackParticleThinning('HIGG5D2',HIGG5D2ThinningHelper, SelectionString = "AntiKt4EMTopoJets.pt > 100000*GeV", ApplyAnd = True) )
+thinningTools.append( HIGG5Common.getAntiKt4EMTopoTrackParticleThinning('HIGG5D2',HIGG5D2ThinningHelper))
 thinningTools.append( HIGG5Common.getAntiKt10LCTopoTrackParticleThinning('HIGG5D2',HIGG5D2ThinningHelper))
 thinningTools.append( HIGG5Common.getMuonTrackParticleThinning(         'HIGG5D2',HIGG5D2ThinningHelper) )
 thinningTools.append( HIGG5Common.getElectronTrackParticleThinning(     'HIGG5D2',HIGG5D2ThinningHelper) )
@@ -74,7 +75,7 @@ jetSel = '(( count( (AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 15.*GeV) && (abs(
 jetSel += '|| (( count( (AntiKt4EMTopoJets.pt > 100.0*GeV) && (abs(AntiKt4EMTopoJets.eta) < 2.6) ) ) > 0)'
 jetSel += '|| (( count( (AntiKt10LCTopoJets.pt > 100.0*GeV) && (abs(AntiKt10LCTopoJets.eta) < 2.6) ) ) > 0)'
 jetSel += '|| (( count( (AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
-jetSel += '|| (( count( (AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
+# jetSel += '|| (( count( (AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
 
 
 #====================================================================
@@ -265,15 +266,13 @@ if not "HIGG5D2Jets" in OutputJets:
     OutputJets["HIGG5D2Jets"] = []
 
     #AntiKt2PV0TrackJets
-    addAntiKt2PV0TrackJets(higg5d2Seq, 'HIGG5D2Jets')
-    addAntiKt4PV0TrackJets(higg5d2Seq, "HIGG5D2Jets")
+    reducedJetList = ["AntiKt2PV0TrackJets", "AntiKt4PV0TrackJets", "AntiKt10LCTopoJets"]
+    if jetFlags.useTruth:
+        reducedJetList += ['AntiKt4TruthJets','AntiKt4TruthWZJets']
+    replaceAODReducedJets(reducedJetList, higg5d2Seq, "HIGG5D2Jets")
 
     addDefaultTrimmedJets(higg5d2Seq,"HIGG5D2");
-
     if jetFlags.useTruth:
-      addAntiKt4TruthJets(higg5d2Seq, "HIGG5D2Jets")
-      addAntiKt4TruthWZJets(higg5d2Seq, "HIGG5D2Jets")
-
       HIGG5Common.addTrimmedTruthWZJets(higg5d2Seq,'HIGG5D2Jets') 
 
     #=======================================
@@ -283,10 +282,10 @@ if not "HIGG5D2Jets" in OutputJets:
     # Set up geometry and BField
     import AthenaCommon.AtlasUnixStandardJob
 
-    include("RecExCond/AllDet_detDescr.py")
-    runTCCReconstruction(higg5d2Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParticles")
-    from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addTCCTrimmedJets
-    addTCCTrimmedJets(higg5d2Seq, "HIGG5D2")
+    #  include("RecExCond/AllDet_detDescr.py")
+    #  runTCCReconstruction(higg5d2Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParticles")
+    #  from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addTCCTrimmedJets
+    #  addTCCTrimmedJets(higg5d2Seq, "HIGG5D2")
 
 #====================================================================
 # Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet 
@@ -399,7 +398,9 @@ if DerivationFrameworkIsMonteCarlo :
 addJetOutputs(HIGG5D2SlimmingHelper,["HIGG5D2Jets"],slimmed_content)
 
 # Add the MET containers to the stream
-addMETOutputs(HIGG5D2SlimmingHelper,[],["Track","AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets","AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets"])
+addMETOutputs(HIGG5D2SlimmingHelper,[],["Track","AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets"
+#                                        ,"AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets"
+])
 
 
 HIGG5D2SlimmingHelper.IncludeMuonTriggerContent = True

PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py

@@ -253,11 +253,10 @@ higg5d3Seq += CfgMgr.DerivationFramework__DerivationKernel(
 if not "HIGG5D3Jets" in OutputJets:
     OutputJets["HIGG5D3Jets"] = []
 
-    addAntiKt2PV0TrackJets(higg5d3Seq, 'HIGG5D3Jets')
-    addAntiKt4PV0TrackJets(higg5d3Seq, "HIGG5D3Jets")
-
+    reducedJetList = ["AntiKt2PV0TrackJets", "AntiKt4PV0TrackJets", "AntiKt10LCTopoJets"]
     if jetFlags.useTruth:
-      addAntiKt4TruthJets(higg5d3Seq, "HIGG5D3Jets")
+        reducedJetList += ['AntiKt4TruthJets']
+    replaceAODReducedJets(reducedJetList, higg5d3Seq, "HIGG5D3Jets")
 
 higg5d3Seq += CfgMgr.DerivationFramework__DerivationKernel(
     "HIGG5D3Kernel",