From f5406473ffa7fd25a0e2989f9302adb9cc9c1978 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Fri, 8 Nov 2019 16:45:06 +0100 Subject: [PATCH 01/14] Major JETM8 cleanup --- .../share/JETM8.py | 295 ++++-------------- 1 file changed, 55 insertions(+), 240 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index e4984b35229..021bf4db68f 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -20,7 +20,6 @@ if DerivationFrameworkIsMonteCarlo: #==================================================================== # SKIMMING TOOL #==================================================================== -# this recopying the latest JETM6 from DerivationFrameworkJetEtMiss import TriggerLists electronTriggers = TriggerLists.single_el_Trig() @@ -28,104 +27,31 @@ muonTriggers = TriggerLists.single_mu_Trig() jetTriggers = TriggerLists.jetTrig() # For first data -jetSelection = '(count( AntiKt10LCTopoJets.pt > 100.*GeV ) >=1)' -#jetSelection = '(count( CamKt12LCTopoJets.pt > 150.*GeV ) >=1)' - -orstr = ' || ' -andstr = ' && ' -eltrigsel = '(EventInfo.eventTypeBitmask==1) || '+orstr.join(electronTriggers) -elofflinesel = andstr.join(['count((Electrons.pt > 20*GeV) && (Electrons.DFCommonElectronsLHMedium)) == 1', - 'count(AntiKt10LCTopoJets.pt > 75*GeV) >=1']) -electronSelection = '( (' + eltrigsel + ') && (' + elofflinesel + ') )' - -mutrigsel = '(EventInfo.eventTypeBitmask==1) || '+orstr.join(muonTriggers) -muofflinesel = andstr.join(['count((Muons.pt > 20*GeV) && (Muons.DFCommonMuonsPreselection)) == 1', - 'count(AntiKt10LCTopoJets.pt > 75*GeV) >=1']) -muonSelection = ' ( (' + mutrigsel + ') && (' + muofflinesel + ') ) ' -# MET filter wanted? : MET_Reference_AntiKt4LCTopo > 20*GeV # should use a different container - -lepSelection = '( ' + electronSelection + ' || ' + muonSelection + ' )' - - -expression = jetSelection + ' || '+ lepSelection - +jetSelection = '(count( AntiKt10LCTopoJets.pt > 150.*GeV && abs(AntiKt10LCTopoJets.eta) < 2.5 ) >=1)' +#jetSelection += '||(count( AntiKt10TrackCaloClusterJets.pt > 150.*GeV && abs(AntiKt10TrackCaloClusterJets.eta) < 2.5 ) >=1)' +#jetSelection += '||(count( AntiKt10UFOCSSKJets.pt > 150.*GeV && abs(AntiKt10UFOCSSKJets.eta) < 2.5 ) >=1)' from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__TriggerSkimmingTool JETM8TrigSkimmingTool = DerivationFramework__TriggerSkimmingTool( name = "JETM8TrigSkimmingTool", - TriggerListOR = jetTriggers+electronTriggers+muonTriggers ) - #TriggerListOR = triggers ) + TriggerListOR = jetTriggers ) ToolSvc += JETM8TrigSkimmingTool from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool JETM8OfflineSkimmingTool = DerivationFramework__xAODStringSkimmingTool( name = "JETM8OfflineSkimmingTool", - expression = expression) + expression = jetSelection) ToolSvc += JETM8OfflineSkimmingTool -#Trigger matching decorations -from DerivationFrameworkCore.TriggerMatchingAugmentation import applyTriggerMatching -TrigMatchAug, NewTrigVars = applyTriggerMatching(ToolNamePrefix="JETM8", - ElectronTriggers=electronTriggers,MuonTriggers=muonTriggers) - #==================================================================== # THINNING TOOLS #==================================================================== thinningTools = [] -## from DerivationFrameworkJetEtMiss.DerivationFrameworkJetEtMissConf import DerivationFramework__ViewContainerThinning -## JETM8TrackJetInputThin = DerivationFramework__ViewContainerThinning( name = "JETM8ViewContTrackThinning", -## ThinningService = "JETM8ThinningSvc", -## SourceContainer = "InDetTrackParticles", -## ViewContainer = "JetSelectedTracks_LooseTrackJets", -## ParticleType = 4, # trackParticles -## ApplyAnd = False) - -## ToolSvc += JETM8TrackJetInputThin -## thinningTools.append(JETM8TrackJetInputThin) - - -# Truth particle thinning -doTruthThinning = True -preserveAllDescendants = False -from AthenaCommon.GlobalFlags import globalflags -if doTruthThinning and DerivationFrameworkIsMonteCarlo: - truth_cond_WZH = "((abs(TruthParticles.pdgId) >= 23) && (abs(TruthParticles.pdgId) <= 25))" # W, Z and Higgs - truth_cond_Lepton = "((abs(TruthParticles.pdgId) >= 11) && (abs(TruthParticles.pdgId) <= 16) && (TruthParticles.barcode < 200000))" # Leptons - truth_cond_Quark = "((abs(TruthParticles.pdgId) <= 5 && (TruthParticles.pt > 10000.)) || (abs(TruthParticles.pdgId) == 6))" # Quarks - truth_cond_Gluon = "((abs(TruthParticles.pdgId) == 21) && (TruthParticles.pt > 10000.))" # Gluons - truth_cond_Photon = "((abs(TruthParticles.pdgId) == 22) && (TruthParticles.pt > 10000.) && (TruthParticles.barcode < 200000))" # Photon - - truth_expression = '('+truth_cond_WZH+' || '+truth_cond_Lepton +' || '+truth_cond_Quark+' || '+truth_cond_Gluon+' || '+truth_cond_Photon+')' - - from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__GenericTruthThinning - JETM8TruthThinningTool = DerivationFramework__GenericTruthThinning( name = "JETM8TruthThinningTool", - ThinningService = "JETM8ThinningSvc", - ParticleSelectionString = truth_expression, - PreserveDescendants = preserveAllDescendants, - PreserveGeneratorDescendants = not preserveAllDescendants, - PreserveAncestors = True) - - ToolSvc += JETM8TruthThinningTool - thinningTools.append(JETM8TruthThinningTool) - - - from DerivationFrameworkJetEtMiss.DerivationFrameworkJetEtMissConf import DerivationFramework__ViewContainerThinning - JETM8TruthJetInputThin = DerivationFramework__ViewContainerThinning( name = "JETM8ViewContThinning", - ThinningService = "JETM8ThinningSvc", - SourceContainer = "TruthParticles", - ViewContainer = "JetInputTruthParticles", - ParticleType = 201, # truthParticles - ApplyAnd = False) - - ToolSvc += JETM8TruthJetInputThin - thinningTools.append(JETM8TruthJetInputThin) - #======================================= # CREATE PRIVATE SEQUENCE #======================================= jetm8Seq = CfgMgr.AthSequencer("JETM8Sequence") DerivationFrameworkJob += jetm8Seq -#jetm8Seq = DerivationFrameworkJob #======================================= # CREATE THE DERIVATION KERNEL ALGORITHM @@ -142,104 +68,50 @@ jetm8Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM8TrigKerne reducedJetList = ["AntiKt2PV0TrackJets", "AntiKt4PV0TrackJets", "AntiKt4TruthJets", + "AntiKt4TruthWZJets", "AntiKt10TruthJets", "AntiKt10LCTopoJets"] replaceAODReducedJets(reducedJetList,jetm8Seq,"JETM8") jetm8Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM8MainKernel", SkimmingTools = [JETM8OfflineSkimmingTool], - ThinningTools = thinningTools, - AugmentationTools = [TrigMatchAug]) - -#==================================================================== -# Special jets -#==================================================================== - -OutputJets["JETM8"] = [] - -from JetRecTools.JetRecToolsConfig import ctm -from JetRecTools.JetRecToolsConf import CaloClusterConstituentsOrigin, ConstituentSubtractorTool, VoronoiWeightTool + ThinningTools = thinningTools) -ctm.add( VoronoiWeightTool("JetConstit_Voronoi", - doSpread=True, nSigma=0), - alias = 'voronoi' ) - -ctm.add( VoronoiWeightTool("JetConstit_VoronoiSupp", - doSpread=False, nSigma=0), - alias = 'voronoiSupp' ) - -ctm.add( ConstituentSubtractorTool("JetConstit_ConstSub"), - alias = 'constsub' ) - -clustOrigSeq = ctm.buildConstitModifSequence( 'ConstitOrigSeq', - OutputContainer = 'OrigTopoClusters', - InputContainer= 'CaloCalTopoClusters', - modList = [ 'clus_origin'] ) - -# Hardcoding the equivalent value from the enum in xAODBase/ObjectType.h -# as loading the relevant dictionary seems to cause problems later -xAOD_Type_CaloCluster = 1 - -clustSKSeq = ctm.buildConstitModifSequence( 'ConstitOrigSKSeq', - OutputContainer = 'OrigSKTopoClusters', - InputContainer= 'OrigTopoClusters', - modList = [ 'softkiller'] , InputType=xAOD_Type_CaloCluster) - -clustVorSeq = ctm.buildConstitModifSequence( 'ConstitOrigVorSeq', - OutputContainer = 'OrigVorTopoClusters', - InputContainer= 'OrigTopoClusters', - modList = [ 'voronoi'] , InputType=xAOD_Type_CaloCluster) - -clustVorSuppSeq = ctm.buildConstitModifSequence( 'ConstitOrigVorSuppSeq', - OutputContainer = 'OrigVorSuppTopoClusters', - InputContainer= 'OrigTopoClusters', - modList = [ 'voronoiSupp'] , InputType=xAOD_Type_CaloCluster) - -clustVorSKSeq = ctm.buildConstitModifSequence( 'ConstitOrigVorSKSeq', - OutputContainer = 'OrigVorSuppSKTopoClusters', - InputContainer= 'OrigVorSuppTopoClusters', - modList = [ 'softkiller'] , InputType=xAOD_Type_CaloCluster) - -clustCSSeq = ctm.buildConstitModifSequence( 'ConstitOrigCSSeq', - OutputContainer = 'OrigCSTopoClusters', - InputContainer= 'OrigTopoClusters', - modList = [ 'constsub'] , InputType=xAOD_Type_CaloCluster) - -clustCSSKSeq = ctm.buildConstitModifSequence( 'ConstitOrigCSSKSeq', - OutputContainer = 'OrigCSSKTopoClusters', - InputContainer= 'OrigCSTopoClusters', - modList = [ 'softkiller'] , InputType=xAOD_Type_CaloCluster) - -correctedClusters = [ "OrigTopoClusters", "OrigSKTopoClusters", "OrigCSTopoClusters", "OrigCSSKTopoClusters", "OrigVorSuppSKTopoClusters", "OrigVorTopoClusters", "OrigVorSuppTopoClusters" ] +#======================================= +# BUILD PFO, TCC, AND UFO INPUTS +#======================================= # Add PFlow constituents from JetRecTools.ConstModHelpers import getConstModSeq, xAOD -addCHSPFlowObjects() pflowCSSKSeq = getConstModSeq(["CS","SK"], "EMPFlow") from JetRec.JetRecConf import JetAlgorithm -clustSeqAlg = JetAlgorithm("ClusterModifiers", Tools = [clustOrigSeq, clustSKSeq, clustCSSeq, clustCSSKSeq, clustVorSeq, clustVorSuppSeq, clustVorSKSeq,pflowCSSKSeq]) +clustSeqAlg = JetAlgorithm("ClusterModifiers", Tools = [pflowCSSKSeq]) jetm8Seq += clustSeqAlg -if jetFlags.useTruth: - addStandardJets("CamKt", 1.5, "Truth", ptmin=40000, algseq=jetm8Seq, outputGroup="JETM8") +# Add TCC constituents +from TrackCaloClusterRecTools.TrackCaloClusterConfig import runTCCReconstruction +import AthenaCommon.AtlasUnixStandardJob +include("RecExCond/AllDet_detDescr.py") +runTCCReconstruction(jetm8Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParticles", outputTCCName="TrackCaloClustersCombinedAndNeutral") -# CamKt15LCTopo -addStandardJets("CamKt", 1.5, "LCTopo", mods="lctopo_ungroomed", calibOpt="none", ghostArea=0.01, ptmin=2000, ptminFilter=50000, - algseq=jetm8Seq, outputGroup="JETM8") +# Add UFO constituents +from TrackCaloClusterRecTools.TrackCaloClusterConfig import runUFOReconstruction +emcsskufoAlg = runUFOReconstruction(jetm8Seq, ToolSvc, PFOPrefix="CSSK") -# AntiKt10Track -addTrimmedJets("AntiKt", 1.0, "PV0Track", rclus=0.2, ptfrac=0.05, algseq=jetm8Seq, outputGroup="JETM8") +#==================================================================== +# Special jets +#==================================================================== -# PFlow large-R jets -#addTrimmedJets("AntiKt", 1.0, "EMCPFlow", rclus=0.2, ptfrac=0.05, algseq=jetm8Seq, outputGroup="JETM8") -addTrimmedJets("AntiKt", 1.0, "EMPFlow", rclus=0.2, ptfrac=0.05, algseq=jetm8Seq, outputGroup="JETM8") +OutputJets["JETM8"] = [] # AntiKt10*PtFrac5Rclus20 addDefaultTrimmedJets(jetm8Seq,"JETM8") # Add VR track jets for b-tagging addVRJets(jetm8Seq) +addVRJets(jetm8Seq, do_ghost=True) +addVRJets(jetm8Seq, training='201903') # AntiKt2LCTopo if DerivationFrameworkIsMonteCarlo: @@ -248,47 +120,21 @@ if DerivationFrameworkIsMonteCarlo: addStandardJets("AntiKt",0.2,"LCTopo", mods="lctopo_ungroomed", calibOpt="none", ghostArea=0.01, ptmin=2000, ptminFilter=7000, algseq=jetm8Seq, outputGroup="JETM8") -# AntiKtVR600Rmax10Rmin2*PtFrac5Rclus20 -from DerivationFrameworkFlavourTag.HbbCommon import addVRCaloJets -addVRCaloJets(jetm8Seq,"JETM8") - -#AntiKt4PV0TrackJets -addAntiKt2PV0TrackJets(jetm8Seq, "JETM8") -addAntiKt4PV0TrackJets(jetm8Seq, "JETM8") - if DerivationFrameworkIsMonteCarlo: addAntiKt4TruthJets(jetm8Seq, "JETM8") addAntiKt10TruthJets(jetm8Seq, "JETM8") -#==================================================================== -# Add TCC objects and jets -#==================================================================== -from TrackCaloClusterRecTools.TrackCaloClusterConfig import runTCCReconstruction -import AthenaCommon.AtlasUnixStandardJob -include("RecExCond/AllDet_detDescr.py") -runTCCReconstruction(jetm8Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParticles", outputTCCName="TrackCaloClustersCombinedAndNeutral") addTCCTrimmedJets(jetm8Seq,"JETM8") -#==================================================================== -# Add UFO objects and jets -#==================================================================== -from TrackCaloClusterRecTools.TrackCaloClusterConfig import runUFOReconstruction -emufoAlg = runUFOReconstruction(jetm8Seq, ToolSvc, PFOPrefix="CHS") -emcsskufoAlg = runUFOReconstruction(jetm8Seq, ToolSvc, PFOPrefix="CSSK") - +# Add UFO jets from JetRec.JetRecConf import PseudoJetGetter -ufopjgetter = PseudoJetGetter("ufoPJGetter", InputContainer="CHSUFO", OutputContainer="CHSUFOPJ", Label="UFO", SkipNegativeEnergy=True) csskufopjgetter = PseudoJetGetter("csskufoPJGetter", InputContainer="CSSKUFO", OutputContainer="CSSKUFOPJ", Label="UFO", SkipNegativeEnergy=True) jtm+=csskufopjgetter csskufogetters = [csskufopjgetter]+list(jtm.gettersMap["tcc"])[1:] -jtm+=ufopjgetter - -chsufogetters = [ufopjgetter]+list(jtm.gettersMap["tcc"])[1:] csskufogetters = [csskufopjgetter]+list(jtm.gettersMap["tcc"])[1:] addStandardJets("AntiKt", 1.0, "UFOCSSK", ptmin=40000, ptminFilter=50000, algseq=jetm8Seq, outputGroup="JETM8", customGetters = csskufogetters, constmods=["CSSK"]) -addStandardJets("AntiKt", 1.0, "UFOCHS", ptmin=40000, ptminFilter=50000, algseq=jetm8Seq, outputGroup="JETM8", customGetters = chsufogetters, constmods=["CHS"]) if DerivationFrameworkIsMonteCarlo: addSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.1, mods="truth_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) @@ -299,7 +145,6 @@ addSoftDropJets("AntiKt", 1.0, "UFOCSSK", beta=1.0, zcut=0.1, algseq=jetm8Seq, o addRecursiveSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, N=-1, mods="tcc_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) addBottomUpSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, mods="tcc_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) - #==================================================================== # Set up b-tagging #==================================================================== @@ -328,15 +173,9 @@ svcMgr += createThinningSvc( svcName="JETM8ThinningSvc", outStreams=[evtStream] #==================================================================== from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM8SlimmingHelper = SlimmingHelper("JETM8SlimmingHelper") -JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJets", +JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "InDetTrackParticles", "PrimaryVertices", - "MET_Reference_AntiKt4EMTopo", - "MET_Reference_AntiKt4LCTopo", - "MET_Reference_AntiKt4EMPFlow", "AntiKt2LCTopoJets", - "AntiKt4EMTopoJets", - "AntiKt4EMTopoJets_BTagging201810", - "AntiKt4LCTopoJets", "AntiKt4EMPFlowJets", "AntiKt4EMPFlowJets_BTagging201810", "AntiKt4EMPFlowJets_BTagging201903", @@ -345,69 +184,45 @@ JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "TauJet "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", - "BTagging_AntiKt4EMTopo_201810", "BTagging_AntiKt4EMPFlow_201810", "BTagging_AntiKt4EMPFlow_201903", "BTagging_AntiKtVR30Rmax4Rmin02Track", - ] #+ correctedClusters + ] JETM8SlimmingHelper.AllVariables = ["CaloCalTopoClusters", - "LCOriginTopoClusters", "TrackCaloClustersCombinedAndNeutral", - "MuonTruthParticles", "egammaTruthParticles", - "TruthParticles", "TruthEvents", "TruthVertices", "JetETMissChargedParticleFlowObjects", "JetETMissNeutralParticleFlowObjects", - "Kt4EMTopoOriginEventShape","Kt4LCTopoOriginEventShape","Kt4EMPFlowEventShape"] - -#JETM8SlimmingHelper.AppendToDictionary.update({"LCOriginTopoClusters":"xAOD::CaloClusterContainer", -# "LCOriginTopoClustersAux":"xAOD::ShallowAuxContainer"}) -#JETM8SlimmingHelper.ExtraVariables =['LCOriginTopoClusters.calE.calEta.calM.calPhi'] - -JETM8SlimmingHelper.AppendToDictionary["CHSUFO"] = 'xAOD::TrackCaloClusterContainer' -JETM8SlimmingHelper.AppendToDictionary['CHSUFOAux'] = 'xAOD::TrackCaloClusterAuxContainer' -JETM8SlimmingHelper.ExtraVariables += [ 'CHSUFO.pt.eta.phi.taste' ] - -JETM8SlimmingHelper.AppendToDictionary["CSSKUFO"] = 'xAOD::TrackCaloClusterContainer' -JETM8SlimmingHelper.AppendToDictionary['CSSKUFOAux'] = 'xAOD::TrackCaloClusterAuxContainer' -JETM8SlimmingHelper.ExtraVariables += [ 'CSSKUFO.pt.eta.phi.taste' ] - -addOriginCorrectedClusters(JETM8SlimmingHelper,writeLC=True,writeEM=False) - -JETM8SlimmingHelper.ExtraVariables = [NewTrigVars["Electrons"][0],NewTrigVars["Muons"][0]] - -for truthc in [ - "TruthMuons", - "TruthElectrons", - "TruthPhotons", - "TruthTaus", -# "TruthNeutrinos" - ]: - JETM8SlimmingHelper.StaticContent.append("xAOD::TruthParticleContainer#"+truthc) - JETM8SlimmingHelper.StaticContent.append("xAOD::TruthParticleAuxContainer#"+truthc+"Aux.") - -for caloc in correctedClusters: - JETM8SlimmingHelper.AppendToDictionary.update({caloc:"xAOD::CaloClusterContainer", - caloc+"Aux":"xAOD::ShallowAuxContainer"}) - JETM8SlimmingHelper.ExtraVariables +=[ - "Electrons."+NewTrigVars["Electrons"], - "Muons."+NewTrigVars["Muons"], - caloc+'.calE.calEta.calM.calPhi'] + "TruthEvents", + "TruthElectrons", + "TruthMuons", + "TruthPhotons", + "TruthTaus", + "TruthNeutrinos", + "TruthBSM", + "TruthTop", + "TruthBoson", + "Kt4EMPFlowEventShape"] -print JETM8SlimmingHelper.AppendToDictionary +if DerivationFrameworkIsMonteCarlo: + JETM8SlimmingHelper.AppendToDictionary = { + "TruthTop" : "xAOD::TruthParticleContainer" , + "TruthTopAux" : "xAOD::TruthParticleAuxContainer", + "TruthBSM" : "xAOD::TruthParticleContainer" , + "TruthBSMAux" : "xAOD::TruthParticleAuxContainer", + "TruthBoson" : "xAOD::TruthParticleContainer" , + "TruthBosonAux" : "xAOD::TruthParticleAuxContainer" + } -# Trigger content -from DerivationFrameworkCore.JetTriggerContent import JetTriggerContent -for trig in JetTriggerContent: - if 'HLT' in trig and not 'Aux' in trig: - JETM8SlimmingHelper.AllVariables.append(trig) -JETM8SlimmingHelper.IncludeJetTriggerContent = True +print JETM8SlimmingHelper.AppendToDictionary # Add the jet containers to the stream -addJetOutputs(JETM8SlimmingHelper,["SmallR", - "LargeR", - "JETM8", - "AntiKt10EMPFlowJets"]) +addJetOutputs(JETM8SlimmingHelper,["LargeR", + "AntiKt4EMPFlowJets", + "AntiKt4TruthJets", + "AntiKt4TruthWZJets", + "JETM8"]) + # Add the MET containers to the stream -addMETOutputs(JETM8SlimmingHelper,["Diagnostic","AntiKt4LCTopo","AntiKt4EMPFlow","Track"]) +addMETOutputs(JETM8SlimmingHelper,["AntiKt4EMPFlow","Track"]) JETM8SlimmingHelper.AppendContentToStream(JETM8Stream) JETM8Stream.RemoveItem("xAOD::TrigNavigation#*") -- GitLab From 505e50c7ecf7b42d4a77ac1b011190fccfb8825e Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Mon, 11 Nov 2019 16:45:09 +0100 Subject: [PATCH 02/14] Adding a few more jet collections to replaceAODReducedJets --- .../python/ExtendedJetCommon.py | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py index f55990f2435..2f3c988cb11 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py @@ -53,12 +53,25 @@ ConfInst.doNotCheckForTaggerObstacles() from JetRec.JetRecStandard import jtm +def addAntiKt2LCTopoJets(sequence, outputlist): + addStandardJets("AntiKt", 0.2, "LCTopo", ptmin=2000, ptminFilter=7000, mods="lctopo_ungroomed", algseq=sequence, outputGroup=outputlist) + def addAntiKt10LCTopoJets(sequence, outputlist): addStandardJets("AntiKt", 1.0, "LCTopo", ptmin=40000, ptminFilter=50000, mods="lctopo_ungroomed", algseq=sequence, outputGroup=outputlist) def addAntiKt10TrackCaloClusterJets(sequence, outputlist): addStandardJets("AntiKt", 1.0, "TrackCaloCluster", ptmin=40000, ptminFilter=50000, mods="tcc_ungroomed", algseq=sequence, outputGroup=outputlist) +def addAntiKt10UFOCSSKJets(sequence, outputlist): + from JetRec.JetRecConf import PseudoJetGetter + from AthenaCommon.AppMgr import ToolSvc + + csskufopjgetter = PseudoJetGetter("csskufoPJGetter", InputContainer="CSSKUFO", OutputContainer="CSSKUFOPJ", Label="UFO", SkipNegativeEnergy=True) + ToolSvc += csskufopjgetter + csskufogetters = [csskufopjgetter]+list(jtm.gettersMap["tcc"])[1:] + + addStandardJets("AntiKt", 1.0, "UFOCSSK", ptmin=40000, ptminFilter=50000, algseq=sequence, outputGroup=outputlist, customGetters = csskufogetters, constmods=["CSSK"]) + def addAntiKt2PV0TrackJets(sequence, outputlist, extendedFlag = 0): if not "akt2track" in jtm.modifiersMap.keys(): from AthenaCommon.AppMgr import ToolSvc @@ -115,6 +128,10 @@ def addAntiKt4PV0TrackJets(sequence, outputlist, extendedFlag = 0): def addAntiKt10PV0TrackJets(sequence, outputlist): addStandardJets("AntiKt", 1.0, "PV0Track", ptmin=2000, ptminFilter=40000, mods="track_ungroomed", algseq=sequence, outputGroup=outputlist) +def addAntiKt2TruthJets(sequence,outputlist): + if DerivationFrameworkIsMonteCarlo: + addStandardJets("AntiKt", 0.2, "Truth", ptmin=5000, mods="truth_ungroomed", algseq=sequence, outputGroup=outputlist) + def addAntiKt4TruthJets(sequence,outputlist): if DerivationFrameworkIsMonteCarlo: addStandardJets("AntiKt", 0.4, "Truth", ptmin=5000, mods="truth_ungroomed", algseq=sequence, outputGroup=outputlist) @@ -143,6 +160,8 @@ def replaceAODReducedJets(jetlist,sequence,outputlist, extendedFlag = 0): addAntiKt4PV0TrackJets(sequence,outputlist, extendedFlag) if "AntiKt10PV0TrackJets" in jetlist: addAntiKt10PV0TrackJets(sequence,outputlist) + if "AntiKt2TruthJets" in jetlist: + addAntiKt2TruthJets(sequence,outputlist) if "AntiKt4TruthJets" in jetlist: addAntiKt4TruthJets(sequence,outputlist) if "AntiKt4TruthWZJets" in jetlist: @@ -151,10 +170,14 @@ def replaceAODReducedJets(jetlist,sequence,outputlist, extendedFlag = 0): addAntiKt10TruthJets(sequence,outputlist) if "AntiKt10TruthWZJets" in jetlist: addAntiKt10TruthWZJets(sequence,outputlist) + if "AntiKt2LCTopoJets" in jetlist: + addAntiKt2LCTopoJets(sequence,outputlist) if "AntiKt10LCTopoJets" in jetlist: addAntiKt10LCTopoJets(sequence,outputlist) if "AntiKt10TrackCaloClusterJets" in jetlist: addAntiKt10TrackCaloClusterJets(sequence,outputlist) + if "AntiKt10UFOCSSKJets" in jetlist: + addAntiKt10UFOCSSKJets(sequence,outputlist) ################################################################## # Jet helpers for adding low-pt jets needed for calibration -- GitLab From 77ef8cf1b226db7d1f296204616c40de7745ab65 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Mon, 11 Nov 2019 17:45:47 +0100 Subject: [PATCH 03/14] Adding UFOCSSK jets to LargeR list --- .../DerivationFrameworkJetEtMiss/python/JetCommon.py | 1 + 1 file changed, 1 insertion(+) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py index 2f0ff094280..babda29b984 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py @@ -533,6 +533,7 @@ OutputJets["SmallR"] = [ OutputJets["LargeR"] = [ "AntiKt10LCTopoJets", "AntiKt10TrackCaloClusterJets", + "AntiKt10UFOCSSKJets", "AntiKt10TruthJets", "AntiKt10TruthWZJets", ] -- GitLab From 16575d776fd0a8e48aa68c30a85ef5716a63969e Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Mon, 11 Nov 2019 17:46:16 +0100 Subject: [PATCH 04/14] Continuing overhaul --- .../share/JETM8.py | 123 +++++++++--------- 1 file changed, 59 insertions(+), 64 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index 021bf4db68f..05e6f8ee8cc 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -6,7 +6,6 @@ from DerivationFrameworkCore.DerivationFrameworkMaster import * from DerivationFrameworkJetEtMiss.JetCommon import * from DerivationFrameworkJetEtMiss.ExtendedJetCommon import * -from DerivationFrameworkJetEtMiss.METCommon import * from DerivationFrameworkEGamma.EGammaCommon import * from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkFlavourTag.HbbCommon import * @@ -14,8 +13,11 @@ from DerivationFrameworkFlavourTag.FlavourTagCommon import * # if DerivationFrameworkIsMonteCarlo: - from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents + from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents,addBosonsAndDownstreamParticles,addTopQuarkAndDownstreamParticles,addHFAndDownstreamParticles addStandardTruthContents() + addBosonsAndDownstreamParticles() + addTopQuarkAndDownstreamParticles() + addHFAndDownstreamParticles(addB=True, addC=False, generations=0) #==================================================================== # SKIMMING TOOL @@ -28,8 +30,8 @@ jetTriggers = TriggerLists.jetTrig() # For first data jetSelection = '(count( AntiKt10LCTopoJets.pt > 150.*GeV && abs(AntiKt10LCTopoJets.eta) < 2.5 ) >=1)' -#jetSelection += '||(count( AntiKt10TrackCaloClusterJets.pt > 150.*GeV && abs(AntiKt10TrackCaloClusterJets.eta) < 2.5 ) >=1)' -#jetSelection += '||(count( AntiKt10UFOCSSKJets.pt > 150.*GeV && abs(AntiKt10UFOCSSKJets.eta) < 2.5 ) >=1)' +jetSelection += '||(count( AntiKt10TrackCaloClusterJets.pt > 150.*GeV && abs(AntiKt10TrackCaloClusterJets.eta) < 2.5 ) >=1)' +jetSelection += '||(count( AntiKt10UFOCSSKJets.pt > 150.*GeV && abs(AntiKt10UFOCSSKJets.eta) < 2.5 ) >=1)' from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__TriggerSkimmingTool JETM8TrigSkimmingTool = DerivationFramework__TriggerSkimmingTool( name = "JETM8TrigSkimmingTool", @@ -62,21 +64,6 @@ jetm8Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM8TrigKerne SkimmingTools = [JETM8TrigSkimmingTool], ThinningTools = []) -#======================================= -# RESTORE AOD-REDUCED JET COLLECTIONS -#======================================= -reducedJetList = ["AntiKt2PV0TrackJets", - "AntiKt4PV0TrackJets", - "AntiKt4TruthJets", - "AntiKt4TruthWZJets", - "AntiKt10TruthJets", - "AntiKt10LCTopoJets"] -replaceAODReducedJets(reducedJetList,jetm8Seq,"JETM8") - -jetm8Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM8MainKernel", - SkimmingTools = [JETM8OfflineSkimmingTool], - ThinningTools = thinningTools) - #======================================= # BUILD PFO, TCC, AND UFO INPUTS #======================================= @@ -99,8 +86,27 @@ runTCCReconstruction(jetm8Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParti from TrackCaloClusterRecTools.TrackCaloClusterConfig import runUFOReconstruction emcsskufoAlg = runUFOReconstruction(jetm8Seq, ToolSvc, PFOPrefix="CSSK") +#======================================= +# RESTORE AOD-REDUCED JET COLLECTIONS +#======================================= +reducedJetList = ["AntiKt2PV0TrackJets", + "AntiKt4PV0TrackJets", + "AntiKt2LCTopoJets", + "AntiKt2TruthJets", + "AntiKt4TruthJets", + "AntiKt4TruthWZJets", + "AntiKt10TruthJets", + "AntiKt10LCTopoJets", + "AntiKt10TrackCaloClusterJets", + "AntiKt10UFOCSSKJets"] +replaceAODReducedJets(reducedJetList,jetm8Seq,"JETM8") + +jetm8Seq += CfgMgr.DerivationFramework__DerivationKernel( name = "JETM8MainKernel", + SkimmingTools = [JETM8OfflineSkimmingTool], + ThinningTools = thinningTools) + #==================================================================== -# Special jets +# Jets for tagging #==================================================================== OutputJets["JETM8"] = [] @@ -113,29 +119,8 @@ addVRJets(jetm8Seq) addVRJets(jetm8Seq, do_ghost=True) addVRJets(jetm8Seq, training='201903') -# AntiKt2LCTopo -if DerivationFrameworkIsMonteCarlo: - if jetFlags.useTruth: - addStandardJets("AntiKt",0.2,"Truth", mods="truth_ungroomed", calibOpt="none", ghostArea=0.01, ptmin=5000, algseq=jetm8Seq, outputGroup="JETM8") - -addStandardJets("AntiKt",0.2,"LCTopo", mods="lctopo_ungroomed", calibOpt="none", ghostArea=0.01, ptmin=2000, ptminFilter=7000, algseq=jetm8Seq, outputGroup="JETM8") - -if DerivationFrameworkIsMonteCarlo: - addAntiKt4TruthJets(jetm8Seq, "JETM8") - addAntiKt10TruthJets(jetm8Seq, "JETM8") - addTCCTrimmedJets(jetm8Seq,"JETM8") -# Add UFO jets -from JetRec.JetRecConf import PseudoJetGetter -csskufopjgetter = PseudoJetGetter("csskufoPJGetter", InputContainer="CSSKUFO", OutputContainer="CSSKUFOPJ", Label="UFO", SkipNegativeEnergy=True) - -jtm+=csskufopjgetter -csskufogetters = [csskufopjgetter]+list(jtm.gettersMap["tcc"])[1:] - -csskufogetters = [csskufopjgetter]+list(jtm.gettersMap["tcc"])[1:] -addStandardJets("AntiKt", 1.0, "UFOCSSK", ptmin=40000, ptminFilter=50000, algseq=jetm8Seq, outputGroup="JETM8", customGetters = csskufogetters, constmods=["CSSK"]) - if DerivationFrameworkIsMonteCarlo: addSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.1, mods="truth_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) addRecursiveSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.05, N=-1, mods="truth_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) @@ -175,12 +160,18 @@ from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper JETM8SlimmingHelper = SlimmingHelper("JETM8SlimmingHelper") JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "InDetTrackParticles", "PrimaryVertices", + "AntiKt2TruthJets", "AntiKt2LCTopoJets", + "AntiKt4TruthJets", + "AntiKt4TruthWZJets", "AntiKt4EMPFlowJets", "AntiKt4EMPFlowJets_BTagging201810", "AntiKt4EMPFlowJets_BTagging201903", + "AntiKt10LCTopoJets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", + "AntiKt10TrackCaloClusterJets", "AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets", + "AntiKt10UFOCSSKJets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", @@ -189,28 +180,33 @@ JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "BTagging_AntiKtVR30Rmax4Rmin02Track", ] JETM8SlimmingHelper.AllVariables = ["CaloCalTopoClusters", - "TrackCaloClustersCombinedAndNeutral", - "JetETMissChargedParticleFlowObjects", "JetETMissNeutralParticleFlowObjects", + "CSSKUFO", "TruthEvents", - "TruthElectrons", - "TruthMuons", - "TruthPhotons", - "TruthTaus", - "TruthNeutrinos", - "TruthBSM", - "TruthTop", - "TruthBoson", "Kt4EMPFlowEventShape"] -if DerivationFrameworkIsMonteCarlo: - JETM8SlimmingHelper.AppendToDictionary = { - "TruthTop" : "xAOD::TruthParticleContainer" , - "TruthTopAux" : "xAOD::TruthParticleAuxContainer", - "TruthBSM" : "xAOD::TruthParticleContainer" , - "TruthBSMAux" : "xAOD::TruthParticleAuxContainer", - "TruthBoson" : "xAOD::TruthParticleContainer" , - "TruthBosonAux" : "xAOD::TruthParticleAuxContainer" - } +JETM8SlimmingHelper.AppendToDictionary["CSSKUFO"] = 'xAOD::TrackCaloClusterContainer' +JETM8SlimmingHelper.AppendToDictionary['CSSKUFOAux'] = 'xAOD::TrackCaloClusterAuxContainer' +JETM8SlimmingHelper.ExtraVariables += [ 'CSSKUFO.pt.eta.phi.taste' ] + +for truthc in [ + "TruthTopQuark", + "TruthBoson", + "TruthHF" + ]: + JETM8SlimmingHelper.StaticContent.append("xAOD::TruthParticleContainer#"+truthc+"WithDecayParticles") + JETM8SlimmingHelper.StaticContent.append("xAOD::TruthParticleAuxContainer#"+truthc+"WithDecayParticlesAux.") + JETM8SlimmingHelper.StaticContent.append("xAOD::TruthVertexContainer#"+truthc+"WithDecayVertices") + JETM8SlimmingHelper.StaticContent.append("xAOD::TruthVertexAuxContainer#"+truthc+"WithDecayVerticesAux.") + +for truthc in [ + "TruthMuons", + "TruthElectrons", + "TruthPhotons", + "TruthBottom", + "TruthBSM" + ]: + JETM8SlimmingHelper.StaticContent.append("xAOD::TruthParticleContainer#"+truthc) + JETM8SlimmingHelper.StaticContent.append("xAOD::TruthParticleAuxContainer#"+truthc+"Aux.") print JETM8SlimmingHelper.AppendToDictionary @@ -219,10 +215,9 @@ addJetOutputs(JETM8SlimmingHelper,["LargeR", "AntiKt4EMPFlowJets", "AntiKt4TruthJets", "AntiKt4TruthWZJets", - "JETM8"]) - -# Add the MET containers to the stream -addMETOutputs(JETM8SlimmingHelper,["AntiKt4EMPFlow","Track"]) + "AntiKt2LCTopoJets", + "AntiKt2TruthJets", + "JETM8"],JETM8SlimmingHelper.SmartCollections) JETM8SlimmingHelper.AppendContentToStream(JETM8Stream) JETM8Stream.RemoveItem("xAOD::TrigNavigation#*") -- GitLab From 7de227026690803f1e7f0ea28f57a1cf00def7a1 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Mon, 11 Nov 2019 23:26:12 +0100 Subject: [PATCH 05/14] Adding AntiKt2TruthJets to ContainersOnTheFly --- .../DerivationFrameworkCore/python/ContainersOnTheFly.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py index 03f0182b17b..ac53addab93 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ContainersOnTheFly.py @@ -32,6 +32,8 @@ ContainersOnTheFly = [ ["TruthWbosonWithDecayParticlesAux",'xAOD::TruthParticleAuxContainer'], ['TruthWbosonWithDecayVertices','xAOD::TruthVertexContainer'], ['TruthWbosonWithDecayVerticesAux','xAOD::TruthVertexAuxContainer'], + ["AntiKt2TruthJets","xAOD::JetContainer"], + ["AntiKt2TruthJetsAux","xAOD::JetAuxContainer"], ["AntiKt4TruthJets","xAOD::JetContainer"], ["AntiKt4TruthJetsAux","xAOD::JetAuxContainer"], ["AntiKt4TruthWZJets","xAOD::JetContainer"], -- GitLab From 3e4a12cd5988ddd41b1cfb6f6e4153b570833e69 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Mon, 11 Nov 2019 23:27:18 +0100 Subject: [PATCH 06/14] Adding ungroomed and truth smart slimming lists --- .../python/FullListOfSmartContainers.py | 10 +++++++ .../python/SlimmingHelper.py | 30 +++++++++++++++++++ .../python/AntiKt10LCTopoJetsCPContent.py | 6 ++++ .../AntiKt10TrackCaloClusterJetsCPContent.py | 6 ++++ ...ttomUpSoftDropBeta100Zcut5JetsCPContent.py | 8 +++++ .../python/AntiKt10TruthJetsCPContent.py | 7 +++++ ...veSoftDropBeta100Zcut5NinfJetsCPContent.py | 8 +++++ ...TruthSoftDropBeta100Zcut10JetsCPContent.py | 8 +++++ ...ruthTrimmedPtFrac5SmallR20JetsCPContent.py | 8 +++++ .../python/AntiKt10TruthWZJetsCPContent.py | 7 +++++ .../python/AntiKt10UFOCSSKJetsCPContent.py | 6 ++++ .../python/AntiKt2TruthJetsCPContent.py | 7 +++++ 12 files changed, 111 insertions(+) create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py create mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2TruthJetsCPContent.py diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py index 04baae59925..9d8b544debb 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py @@ -11,6 +11,7 @@ FullListOfSmartContainers = [ "MET_Reference_AntiKt4LCTopo", "MET_Reference_AntiKt4EMTopo", "MET_Reference_AntiKt4EMPFlow", + "AntiKt2TruthJets", "AntiKt4TruthJets", "AntiKt4TruthWZJets", "AntiKt4TruthDressedWZJets", @@ -18,15 +19,24 @@ FullListOfSmartContainers = [ "AntiKt4LCTopoJets", "AntiKt6LCTopoJets", "AntiKt4EMTopoJets", + "AntiKt10TruthJets", + "AntiKt10TruthWZJets", + "AntiKt10LCTopoJets", + "AntiKt10TrackCaloClusterJets", + "AntiKt10UFOCSSKJets", + "AntiKt10TruthTrimmedPtFrac5SmallR20Jets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", "AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets", "AntiKt10EMPFlowTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCHSTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets", + "AntiKt10TruthSoftDropBeta100Zcut10Jets", "AntiKt10LCTopoCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCHSSoftDropBeta100Zcut10Jets", + "AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets", "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", + "AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets", "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt2SubJets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20ExKt3SubJets", diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py index 059569e4127..beab5874b2e 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py @@ -384,6 +384,24 @@ class SlimmingHelper: if not self.AppendToDictionary.has_key("AntiKt4EMTopoJets_BTagging201810"): self.AppendToDictionary["AntiKt4EMTopoJets_BTagging201810"]='xAOD::JetContainer' self.AppendToDictionary["AntiKt4EMTopoJets_BTagging201810Aux"]='xAOD::ShallowAuxContainer' + elif collectionName=="AntiKt10TruthJets": + from DerivationFrameworkJetEtMiss.AntiKt10TruthJetsCPContent import AntiKt10TruthJetsCPContent + items.extend(AntiKt10TruthJetsCPContent) + elif collectionName=="AntiKt10TruthWZJets": + from DerivationFrameworkJetEtMiss.AntiKt10TruthWZJetsCPContent import AntiKt10TruthWZJetsCPContent + items.extend(AntiKt10TruthWZJetsCPContent) + elif collectionName=="AntiKt10LCTopoJets": + from DerivationFrameworkJetEtMiss.AntiKt10LCTopoJetsCPContent import AntiKt10LCTopoJetsCPContent + items.extend(AntiKt10LCTopoJetsCPContent) + elif collectionName=="AntiKt10TrackCaloClusterJets": + from DerivationFrameworkJetEtMiss.AntiKt10TrackCaloClusterJetsCPContent import AntiKt10TrackCaloClusterJetsCPContent + items.extend(AntiKt10TrackCaloClusterJetsCPContent) + elif collectionName=="AntiKt10UFOCSSKJets": + from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKJetsCPContent import AntiKt10UFOCSSKJetsCPContent + items.extend(AntiKt10UFOCSSKJetsCPContent) + elif collectionName=="AntiKt10TruthTrimmedPtFrac5SmallR20Jets": + from DerivationFrameworkJetEtMiss.AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent + items.extend(AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent) elif collectionName=="AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets": from DerivationFrameworkJetEtMiss.AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent #from DerivationFrameworkCore.AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10LCTopoTrimmedPtFrac5SmallR20JetsCPContent @@ -412,6 +430,9 @@ class SlimmingHelper: elif collectionName=="AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets": from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent import AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent items.extend(AntiKt10UFOCSSKTrimmedPtFrac5SmallR20JetsCPContent) + elif collectionName=="AntiKt10TruthSoftDropBeta100Zcut10Jets": + from DerivationFrameworkJetEtMiss.AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent import AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent + items.extend(AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent) elif collectionName=="AntiKt10LCTopoCSSKSoftDropBeta100Zcut10Jets": from DerivationFrameworkJetEtMiss.AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent import AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent items.extend(AntiKt10LCTopoCSSKSoftDropBeta100Zcut10JetsCPContent) @@ -421,9 +442,15 @@ class SlimmingHelper: elif collectionName=="AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets": from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent import AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent items.extend(AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsCPContent) + elif collectionName=="AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets": + from DerivationFrameworkJetEtMiss.AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent import AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent + items.extend(AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent) elif collectionName=="AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets": from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent import AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent items.extend(AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5JetsCPContent) + elif collectionName=="AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets": + from DerivationFrameworkJetEtMiss.AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent import AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent + items.extend(AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent) elif collectionName=="AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets": from DerivationFrameworkJetEtMiss.AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent import AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent items.extend(AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJetsCPContent) @@ -439,6 +466,9 @@ class SlimmingHelper: if not self.AppendToDictionary.has_key("AntiKt4EMPFlowJets_BTagging201903"): self.AppendToDictionary["AntiKt4EMPFlowJets_BTagging201903"]='xAOD::JetContainer' self.AppendToDictionary["AntiKt4EMPFlowJets_BTagging201903Aux"]='xAOD::ShallowAuxContainer' + elif collectionName=="AntiKt2TruthJets": + from DerivationFrameworkJetEtMiss.AntiKt2TruthJetsCPContent import AntiKt2TruthJetsCPContent + items.extend(AntiKt2TruthJetsCPContent) elif collectionName=="AntiKt2LCTopoJets": from DerivationFrameworkJetEtMiss.AntiKt2LCTopoJetsCPContent import AntiKt2LCTopoJetsCPContent items.extend(AntiKt2LCTopoJetsCPContent) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py new file mode 100644 index 00000000000..d6eb42718c0 --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py @@ -0,0 +1,6 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10LCTopoJetsCPContent = [ + "AntiKt10LCTopoJets", + "AntiKt10LCTopoJets.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.constituentLinks.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py new file mode 100644 index 00000000000..59d34e8bac0 --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py @@ -0,0 +1,6 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TrackCaloClusterJetsCPContent = [ + "AntiKt10TrackCaloClusterJets", + "AntiKt10TrackCaloClusterJets.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.constituentLinks.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py new file mode 100644 index 00000000000..a873def6a46 --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py @@ -0,0 +1,8 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent = [ +"AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets", +"AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthJets", +"AntiKt10TruthJetsAux.GhostBHadronsFinalCount", +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py new file mode 100644 index 00000000000..07902649214 --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py @@ -0,0 +1,7 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TruthJetsCPContent = [ +"AntiKt10TruthJets", +"AntiKt10TruthJetsAux.pt.eta.phi.m.constituentLinks.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +] + diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py new file mode 100644 index 00000000000..6e893d7cb20 --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py @@ -0,0 +1,8 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent = [ +"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets", +"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthJets", +"AntiKt10TruthJetsAux.GhostBHadronsFinalCount", +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py new file mode 100644 index 00000000000..6c184faecfd --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py @@ -0,0 +1,8 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent = [ +"AntiKt10TruthSoftDropBeta100Zcut10Jets", +"AntiKt10TruthSoftDropBeta100Zcut10JetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthJets", +"AntiKt10TruthJetsAux.GhostBHadronsFinalCount", +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py new file mode 100644 index 00000000000..9efd7803dac --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py @@ -0,0 +1,8 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent = [ +"AntiKt10TruthTrimmedPtFrac5SmallR20Jets", +"AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.NTrimSubjets.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthJets", +"AntiKt10TruthJetsAux.GhostBHadronsFinalCount", +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py new file mode 100644 index 00000000000..47d8c520b4e --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py @@ -0,0 +1,7 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10TruthWZJetsCPContent = [ +"AntiKt10TruthWZJets", +"AntiKt10TruthWZJetsAux.pt.eta.phi.m.constituentLinks.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +] + diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py new file mode 100644 index 00000000000..61280325598 --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py @@ -0,0 +1,6 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration + +AntiKt10UFOCSSKJetsCPContent = [ + "AntiKt10UFOCSSKJets", + "AntiKt10UFOCSSKJets.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.constituentLinks.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" +] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2TruthJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2TruthJetsCPContent.py new file mode 100644 index 00000000000..68a6e7236be --- /dev/null +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt2TruthJetsCPContent.py @@ -0,0 +1,7 @@ +# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + +AntiKt2TruthJetsCPContent = [ +"AntiKt2TruthJets", +"AntiKt2TruthJetsAux.pt.eta.phi.m.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +] + -- GitLab From 3d8c058fcc6490e333014a1d33da59d44c166675 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Mon, 11 Nov 2019 23:27:54 +0100 Subject: [PATCH 07/14] Continuing overhaul --- .../share/JETM8.py | 49 ++++++++++++++----- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index 05e6f8ee8cc..ae3e64f1970 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -46,8 +46,26 @@ ToolSvc += JETM8OfflineSkimmingTool #==================================================================== # THINNING TOOLS #==================================================================== + thinningTools = [] +#==================================================================== +# Thin TruthParticles for truth jet constituents +#==================================================================== + +if DerivationFrameworkIsMonteCarlo: + from DerivationFrameworkJetEtMiss.DerivationFrameworkJetEtMissConf import DerivationFramework__ViewContainerThinning + JETM8TruthJetInputThin = DerivationFramework__ViewContainerThinning( name = "JETM8ViewContThinning", + ThinningService = "JETM8ThinningSvc", + SourceContainer = "TruthParticles", + ViewContainer = "JetInputTruthParticles", + ParticleType = 201, # truthParticles + ApplyAnd = False) + + ToolSvc += JETM8TruthJetInputThin + thinningTools.append(JETM8TruthJetInputThin) + + #======================================= # CREATE PRIVATE SEQUENCE #======================================= @@ -167,6 +185,12 @@ JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "AntiKt4EMPFlowJets", "AntiKt4EMPFlowJets_BTagging201810", "AntiKt4EMPFlowJets_BTagging201903", + "AntiKt10TruthJets", + "AntiKt10TruthWZJets", + "AntiKt10TruthTrimmedPtFrac5SmallR20Jets", + "AntiKt10TruthSoftDropBeta100Zcut10Jets", + "AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets", + "AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets", "AntiKt10LCTopoJets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", "AntiKt10TrackCaloClusterJets", @@ -181,12 +205,22 @@ JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", ] JETM8SlimmingHelper.AllVariables = ["CaloCalTopoClusters", "CSSKUFO", + "TruthParticles", "TruthEvents", "Kt4EMPFlowEventShape"] -JETM8SlimmingHelper.AppendToDictionary["CSSKUFO"] = 'xAOD::TrackCaloClusterContainer' -JETM8SlimmingHelper.AppendToDictionary['CSSKUFOAux'] = 'xAOD::TrackCaloClusterAuxContainer' -JETM8SlimmingHelper.ExtraVariables += [ 'CSSKUFO.pt.eta.phi.taste' ] +JETM8SlimmingHelper.AppendToDictionary["CSSKUFO"] = "xAOD::TrackCaloClusterContainer" +JETM8SlimmingHelper.AppendToDictionary["CSSKUFOAux"] = "xAOD::TrackCaloClusterAuxContainer" +JETM8SlimmingHelper.ExtraVariables += [ "CSSKUFO.pt.eta.phi.taste" ] + +# Add the jet containers to the stream +addJetOutputs(JETM8SlimmingHelper,["LargeR", + "AntiKt4EMPFlowJets", + "AntiKt4TruthJets", + "AntiKt4TruthWZJets", + "AntiKt2LCTopoJets", + "AntiKt2TruthJets", + "JETM8"],JETM8SlimmingHelper.SmartCollections) for truthc in [ "TruthTopQuark", @@ -210,15 +244,6 @@ for truthc in [ print JETM8SlimmingHelper.AppendToDictionary -# Add the jet containers to the stream -addJetOutputs(JETM8SlimmingHelper,["LargeR", - "AntiKt4EMPFlowJets", - "AntiKt4TruthJets", - "AntiKt4TruthWZJets", - "AntiKt2LCTopoJets", - "AntiKt2TruthJets", - "JETM8"],JETM8SlimmingHelper.SmartCollections) - JETM8SlimmingHelper.AppendContentToStream(JETM8Stream) JETM8Stream.RemoveItem("xAOD::TrigNavigation#*") JETM8Stream.RemoveItem("xAOD::TrigNavigationAuxInfo#*") -- GitLab From 64f4667f2fe85f26f5b0e86ca6a2793570c42809 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Tue, 12 Nov 2019 11:07:02 +0100 Subject: [PATCH 08/14] Removing PartonTruthLabelID from akt10 truth smart slimming lists --- .../python/AntiKt10TruthJetsCPContent.py | 2 +- .../python/AntiKt10TruthWZJetsCPContent.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py index 07902649214..c8db26069d7 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py @@ -2,6 +2,6 @@ AntiKt10TruthJetsCPContent = [ "AntiKt10TruthJets", -"AntiKt10TruthJetsAux.pt.eta.phi.m.constituentLinks.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +"AntiKt10TruthJetsAux.pt.eta.phi.m.constituentLinks.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py index 47d8c520b4e..9cf847cc723 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py @@ -2,6 +2,6 @@ AntiKt10TruthWZJetsCPContent = [ "AntiKt10TruthWZJets", -"AntiKt10TruthWZJetsAux.pt.eta.phi.m.constituentLinks.PartonTruthLabelID.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +"AntiKt10TruthWZJetsAux.pt.eta.phi.m.constituentLinks.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" ] -- GitLab From d3b367780088fe2d2b224734844f33edfdc9d6ab Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Tue, 12 Nov 2019 11:27:28 +0100 Subject: [PATCH 09/14] Removing EDM decorations from smart slimming lists --- .../python/AntiKt10LCTopoJetsCPContent.py | 2 +- .../python/AntiKt10TrackCaloClusterJetsCPContent.py | 2 +- .../AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py | 2 +- .../python/AntiKt10TruthJetsCPContent.py | 2 +- ...tiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py | 2 +- .../python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py | 2 +- .../python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py | 2 +- .../python/AntiKt10TruthWZJetsCPContent.py | 2 +- .../python/AntiKt10UFOCSSKJetsCPContent.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py index d6eb42718c0..c93cb4b4a89 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10LCTopoJetsCPContent = [ "AntiKt10LCTopoJets", - "AntiKt10LCTopoJets.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.constituentLinks.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10LCTopoJets.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py index 59d34e8bac0..1630d8223c0 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10TrackCaloClusterJetsCPContent = [ "AntiKt10TrackCaloClusterJets", - "AntiKt10TrackCaloClusterJets.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.constituentLinks.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10TrackCaloClusterJets.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py index a873def6a46..321bd34ba26 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent.py @@ -2,7 +2,7 @@ AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsCPContent = [ "AntiKt10TruthBottomUpSoftDropBeta100Zcut5Jets", -"AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthBottomUpSoftDropBeta100Zcut5JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", "AntiKt10TruthJets", "AntiKt10TruthJetsAux.GhostBHadronsFinalCount", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py index c8db26069d7..b13704fb744 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py @@ -2,6 +2,6 @@ AntiKt10TruthJetsCPContent = [ "AntiKt10TruthJets", -"AntiKt10TruthJetsAux.pt.eta.phi.m.constituentLinks.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +"AntiKt10TruthJetsAux.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py index 6e893d7cb20..fce3c8069b0 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent.py @@ -2,7 +2,7 @@ AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsCPContent = [ "AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJets", -"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthRecursiveSoftDropBeta100Zcut5NinfJetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", "AntiKt10TruthJets", "AntiKt10TruthJetsAux.GhostBHadronsFinalCount", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py index 6c184faecfd..b6299a8ef12 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent.py @@ -2,7 +2,7 @@ AntiKt10TruthSoftDropBeta100Zcut10JetsCPContent = [ "AntiKt10TruthSoftDropBeta100Zcut10Jets", -"AntiKt10TruthSoftDropBeta100Zcut10JetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthSoftDropBeta100Zcut10JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", "AntiKt10TruthJets", "AntiKt10TruthJetsAux.GhostBHadronsFinalCount", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py index 9efd7803dac..b253b6d394c 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent.py @@ -2,7 +2,7 @@ AntiKt10TruthTrimmedPtFrac5SmallR20JetsCPContent = [ "AntiKt10TruthTrimmedPtFrac5SmallR20Jets", -"AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux.pt.eta.phi.m.constituentLinks.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.NTrimSubjets.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", +"AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux.ECF1.ECF2.ECF3.Tau1_wta.Tau2_wta.Tau3_wta.Split12.Split23.NTrimSubjets.Parent.GhostBHadronsFinalCount.Qw.PlanarFlow.FoxWolfram2.FoxWolfram0.Angularity.Aplanarity.KtDR.ZCut12", "AntiKt10TruthJets", "AntiKt10TruthJetsAux.GhostBHadronsFinalCount", ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py index 9cf847cc723..f7aaaf3bf56 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthWZJetsCPContent.py @@ -2,6 +2,6 @@ AntiKt10TruthWZJetsCPContent = [ "AntiKt10TruthWZJets", -"AntiKt10TruthWZJetsAux.pt.eta.phi.m.constituentLinks.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +"AntiKt10TruthWZJetsAux.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py index 61280325598..200d85afa09 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10UFOCSSKJetsCPContent = [ "AntiKt10UFOCSSKJets", - "AntiKt10UFOCSSKJets.pt.eta.phi.m.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.constituentLinks.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10UFOCSSKJets.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] -- GitLab From f6cb56ba347510e442ed2a21c5675b470f5bfded Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Tue, 12 Nov 2019 13:13:55 +0100 Subject: [PATCH 10/14] Fixing lists --- .../python/AntiKt10LCTopoJetsCPContent.py | 2 +- .../python/AntiKt10TrackCaloClusterJetsCPContent.py | 2 +- .../python/AntiKt10UFOCSSKJetsCPContent.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py index c93cb4b4a89..c5cf1708a97 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10LCTopoJetsCPContent = [ "AntiKt10LCTopoJets", - "AntiKt10LCTopoJets.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10LCTopoJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py index 1630d8223c0..660f0f17681 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TrackCaloClusterJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10TrackCaloClusterJetsCPContent = [ "AntiKt10TrackCaloClusterJets", - "AntiKt10TrackCaloClusterJets.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10TrackCaloClusterJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py index 200d85afa09..1b27a6dc558 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10UFOCSSKJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10UFOCSSKJetsCPContent = [ "AntiKt10UFOCSSKJets", - "AntiKt10UFOCSSKJets.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10UFOCSSKJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] -- GitLab From d4cbe471c774c4cfe0544a402307cb1d56188a24 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Tue, 12 Nov 2019 14:09:59 +0100 Subject: [PATCH 11/14] Adding trimmed UFOCSSK jets --- .../DerivationFrameworkJetEtMiss/share/JETM8.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index ae3e64f1970..cd7c709e0f6 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -144,6 +144,7 @@ if DerivationFrameworkIsMonteCarlo: addRecursiveSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.05, N=-1, mods="truth_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) addBottomUpSoftDropJets('AntiKt', 1.0, 'Truth', beta=1.0, zcut=0.05, mods="truth_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) +addTrimmedJets("AntiKt", 1.0, "UFOCSSK", rclus=0.2, ptfrac=0.05, algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False, mods="tcc_groomed") addSoftDropJets("AntiKt", 1.0, "UFOCSSK", beta=1.0, zcut=0.1, algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False, mods="tcc_groomed") addRecursiveSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, N=-1, mods="tcc_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) addBottomUpSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, mods="tcc_groomed", algseq=jetm8Seq, outputGroup="JETM8", writeUngroomed=False) @@ -196,6 +197,7 @@ JETM8SlimmingHelper.SmartCollections = ["Electrons", "Photons", "Muons", "AntiKt10TrackCaloClusterJets", "AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCSSKJets", + "AntiKt10UFOCSSKTrimmedPtFrac5SmallR20Jets", "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", "AntiKt10UFOCSSKBottomUpSoftDropBeta100Zcut5Jets", "AntiKt10UFOCSSKRecursiveSoftDropBeta100Zcut5NinfJets", -- GitLab From 04fe0fd5f3f199b3b29318e7aa1dd2d554b5d0e1 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Tue, 12 Nov 2019 14:10:41 +0100 Subject: [PATCH 12/14] Redoing ungroomed akt10 truth smart slimming --- .../python/AntiKt10TruthJetsCPContent.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py index b13704fb744..04500c8fc85 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py @@ -2,6 +2,5 @@ AntiKt10TruthJetsCPContent = [ "AntiKt10TruthJets", -"AntiKt10TruthJetsAux.ConeTruthLabelID.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.TrueFlavor" +"AntiKt10TruthJetsAux.GhostBHadronsFinal.GhostBHadronsFinalCount.GhostHBosons.GhostHBosonsCount.GhostTQuarksFinal.GhostTQuarksFinalCount.GhostWBosons.GhostWBosonsCount.GhostZBosons.GhostZBosonsCount" ] - -- GitLab From 52278c1c5eb826c2c460f5d69b9987bb6031c166 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Wed, 13 Nov 2019 14:14:35 +0100 Subject: [PATCH 13/14] Adding PartonTruthLabelID for AntiKt10LCTopoJets --- .../python/AntiKt10LCTopoJetsCPContent.py | 2 +- .../share/JETM8.py | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py index c5cf1708a97..b6406ddb1e0 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10LCTopoJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10LCTopoJetsCPContent = [ "AntiKt10LCTopoJets", - "AntiKt10LCTopoJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" + "AntiKt10LCTopoJetsAux.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m.PartonTruthLabelID.DetectorEta.DetectorY.GhostBHadronsFinalCount.GhostHBosonsCount.GhostTQuarksFinalCount.GhostTrack.GhostWBosonsCount.GhostZBosonsCount.GhostVR30Rmax4Rmin02TrackJet.GhostVR30Rmax4Rmin02TrackJetGhostTag.GhostVR30Rmax4Rmin02TrackJet_BTagging201903.HadronConeExclExtendedTruthLabelID.HadronConeExclTruthLabelID.NumTrkPt500.SumPtTrkPt500" ] diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py index cd7c709e0f6..7714697ce79 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM8.py @@ -11,14 +11,6 @@ from DerivationFrameworkMuons.MuonsCommon import * from DerivationFrameworkFlavourTag.HbbCommon import * from DerivationFrameworkFlavourTag.FlavourTagCommon import * -# -if DerivationFrameworkIsMonteCarlo: - from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents,addBosonsAndDownstreamParticles,addTopQuarkAndDownstreamParticles,addHFAndDownstreamParticles - addStandardTruthContents() - addBosonsAndDownstreamParticles() - addTopQuarkAndDownstreamParticles() - addHFAndDownstreamParticles(addB=True, addC=False, generations=0) - #==================================================================== # SKIMMING TOOL #==================================================================== @@ -152,6 +144,7 @@ addBottomUpSoftDropJets('AntiKt', 1.0, 'UFOCSSK', beta=1.0, zcut=0.05, mods="tcc #==================================================================== # Set up b-tagging #==================================================================== + # use alias for VR jets from BTagging.BTaggingFlags import BTaggingFlags BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo"] @@ -159,6 +152,17 @@ BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtV #tag pFlow jets FlavorTagInit(scheduleFlipped = False, JetCollections = ['AntiKt4EMPFlowJets'], Sequencer = jetm8Seq) +#==================================================================== +# Add truth information +#==================================================================== + +if DerivationFrameworkIsMonteCarlo: + from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents,addBosonsAndDownstreamParticles,addTopQuarkAndDownstreamParticles,addHFAndDownstreamParticles + addStandardTruthContents() + addBosonsAndDownstreamParticles() + addTopQuarkAndDownstreamParticles() + addHFAndDownstreamParticles(addB=True, addC=False, generations=0) + #==================================================================== # SET UP STREAM #==================================================================== -- GitLab From 7d6f16e48797358d9ea90d44aacd1f2c818bacc0 Mon Sep 17 00:00:00 2001 From: Jason Veatch Date: Wed, 13 Nov 2019 14:44:51 +0100 Subject: [PATCH 14/14] Adding PartonTruthLabelID for AntiKt10TruthJets --- .../python/AntiKt10TruthJetsCPContent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py index 04500c8fc85..897d12f198e 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/AntiKt10TruthJetsCPContent.py @@ -2,5 +2,5 @@ AntiKt10TruthJetsCPContent = [ "AntiKt10TruthJets", -"AntiKt10TruthJetsAux.GhostBHadronsFinal.GhostBHadronsFinalCount.GhostHBosons.GhostHBosonsCount.GhostTQuarksFinal.GhostTQuarksFinalCount.GhostWBosons.GhostWBosonsCount.GhostZBosons.GhostZBosonsCount" +"AntiKt10TruthJetsAux.PartonTruthLabelID.GhostBHadronsFinal.GhostBHadronsFinalCount.GhostHBosons.GhostHBosonsCount.GhostTQuarksFinal.GhostTQuarksFinalCount.GhostWBosons.GhostWBosonsCount.GhostZBosons.GhostZBosonsCount" ] -- GitLab