diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py
index e205b87b638aadb378e9f0fec5ba9a8b2bec5627..c6ec6b1a99dce19e309cb2bf1ecefcd09795c212 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/ExtendedJetCommon.py
@@ -663,6 +663,73 @@ def addRscanJets(jetalg,radius,inputtype,sequence,outputlist):
addStandardJets(jetalg, radius, "LCTopo", mods="lctopo_ungroomed",
ghostArea=0.01, ptmin=2000, ptminFilter=7000, calibOpt="none", algseq=sequence, outputGroup=outputlist)
+##################################################################
+
+def addConstModJets(jetalg,radius,inputtype,constmods,sequence,outputlist,customVxColl="",
+ addGetters=None, **kwargs):
+
+ if len(constmods)>0:
+ extjetlog.info("Building jet collection with modifier sequence {0}".format(constmods))
+ if customVxColl:
+ extjetlog.info("Building jet collection with custom vx collection {0}".format(customVxColl))
+
+ constmodstr = "".join(constmods)
+ if customVxColl and "CustomVtx" not in inputtype:
+ inputtype=inputtype+"CustomVtx"
+ jetname = "{0}{1}{2}{3}{4}Jets".format(jetalg,int(radius*10),constmodstr,inputtype,customVxColl)
+ algname = "jetalg"+jetname
+
+ # Avoid scheduling twice
+ if hasattr(sequence,algname):
+ extjetlog.warning("Sequence {0} already has an instance of const mod jet alg {1}".format(sequence,algname))
+ return
+
+ from JetRecConfig import ConstModHelpers
+ from JetRecConfig.JetDefinition import xAODType, JetConstit
+
+ if inputtype == "EMTopo":
+ constit = JetConstit( xAODType.CaloCluster, ["EM","Origin"])
+ elif inputtype == "LCTopo":
+ constit = JetConstit( xAODType.CaloCluster, ["LC","Origin"])
+ elif inputtype == "EMPFlow":
+ constit = JetConstit( xAODType.ParticleFlow )
+
+ constit.modifiers += constmods
+
+ constitalg = ConstModHelpers.getConstitModAlg(constit)
+ if not hasattr(sequence, constitalg.name()):
+ sequence += constitalg
+
+ # Get the PseudoJetGetter
+ from JetRecConfig import JetRecConfig
+ constitpjalg = JetRecConfig.getConstitPJGAlg( constit )
+ if not hasattr(sequence,constitpjalg.name()):
+ sequence += constitpjalg
+
+ getterbase = inputtype.lower()
+ if inputtype == "PFlowCustomVtx": getterbase = "empflow_reduced"
+
+ getters = [constitpjalg]+list(jtm.gettersMap[getterbase])[1:]
+
+ if addGetters:
+ getters += addGetters
+
+ suffix = customVxColl+constmodstr
+
+ # Pass the configuration to addStandardJets
+ # The modifiers will be taken from the
+ jetfindargs = {"jetalg": jetalg,
+ "rsize": radius,
+ "inputtype": inputtype,
+ "customGetters": getters,
+ "namesuffix": suffix,
+ "algseq": sequence,
+ "outputGroup": outputlist
+ }
+ jetfindargs.update(kwargs)
+
+ addStandardJets(**jetfindargs)
+
##################################################################
# Helper to add origin corrected clusters
##################################################################
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py
index cc2dd97d61949111caf1928968077e239e908de3..1fffbcfe03d18fc54349e02dab6806e6cd5c1d92 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommon.py
@@ -27,7 +27,7 @@ DFJetAlgs = {}
##################################################################
# Schedule the augmentation of a flag to label events with large
-# EMEC-IW Noise based on the presence of many bad quality clusters
+# EMEC-IW Noise based on the presence of many bad quality clusters
##################################################################
if hasattr(DerivationFrameworkJob,"BadBatmanAugmentation"):
@@ -41,7 +41,7 @@ else:
DerivationFrameworkJob += batmanaug
batmanaugtool = None
from AthenaCommon.AppMgr import ToolSvc
- # create and add the tool to the alg if needed
+ # create and add the tool to the alg if needed
if hasattr(ToolSvc,"BadBatmanAugmentationTool"):
batmanaugtool = getattr(ToolSvc,"BadBatmanAugmentationTool")
else:
@@ -100,17 +100,20 @@ def addGhostAssociation(DerivationFrameworkJob):
##################################################################
-def reCreatePseudoJets(jetalg, rsize, inputtype, variableRMassScale=-1.0, variableRMinRadius=-1.0, algseq=None):
+def reCreatePseudoJets(jetalg, rsize, inputtype, variableRMassScale=-1.0, variableRMinRadius=-1.0, algseq=None, constmods=[]):
"""Return a list of tools (possibly empty) to be run in a jetalg. These tools will make sure PseudoJets will be associated
to the container specified by the input arguments.
"""
from JetRec.JetRecStandard import jtm
from JetRec.JetRecUtils import buildJetContName
- jetContName = buildJetContName(jetalg, rsize, inputtype, variableRMassScale, variableRMinRadius)
+ constmodstr = "".join(constmods)
+ inputname = inputtype+constmodstr
+ label = inputtype + constmodstr
+ jetContName = buildJetContName(jetalg, rsize, inputname, variableRMassScale, variableRMinRadius)
# Set default for the arguments to be passd to addJetFinder
- finderArgs = dict( modifiersin= [], consumers = [], ghostArea= 0.01 , ptmin=40000, )
+ finderArgs = dict( modifiersin= [], consumers = [], ghostArea= 0.01 , ptmin=40000, constmods=constmods, )
# We do things differently if the container already exists in the input
from RecExConfig.AutoConfiguration import IsInInputFile
@@ -165,22 +168,54 @@ def reCreatePseudoJets(jetalg, rsize, inputtype, variableRMassScale=-1.0, variab
#finderArgs['ghostArea'] =0 ## Cannot afford ghost area calculation for variable-R jets (for now)
# map the input to the jtm code for PseudoJetGetter
- getterMap = dict( LCTopo = 'lctopo', EMTopo = 'emtopo', EMPFlow = 'empflow', EMCPFlow = 'emcpflow', Truth='truth', TruthWZ='truthwz', PV0Track='pv0track')
+ getterMap = dict( LCTopo = 'lctopo', EMTopo = 'emtopo', EMPFlow = 'empflow', EMCPFlow = 'emcpflow',
+ Truth='truth', TruthWZ='truthwz', TruthDressedWZ='truthdressedwz', TruthCharged='truthcharged',
+ PV0Track='pv0track')
# create the finder for the temporary collection.
- for getter in jtm.gettersMap[getterMap[inputtype]]:
- if getter not in jtm.allGetters:
+ getters = getterMap[inputtype]
+
+ for getter in jtm.gettersMap[getters]:
+ if not hasattr(algseq, getter.name()):
algseq += getter
- jtm.allGetters += getter
- tmpFinderTool= jtm.addJetFinder(tmpName, jetalg, rsize, getterMap[inputtype] ,
+ if len(constmods) > 0:
+ finderArgs['modifiersin'] = []
+
+ from JetRecConfig import ConstModHelpers
+ from JetRecConfig.JetDefinition import xAODType, JetConstit
+
+ if inputtype == "EMTopo":
+ constit = JetConstit( xAODType.CaloCluster, ["EM","Origin"])
+ elif inputtype == "LCTopo":
+ constit = JetConstit( xAODType.CaloCluster, ["LC","Origin"])
+ elif inputtype == "EMPFlow":
+ constit = JetConstit( xAODType.ParticleFlow )
+
+ constit.modifiers += constmods
+
+ constitalg = ConstModHelpers.getConstitModAlg(constit)
+ if not hasattr(algseq, constitalg.name()):
+ algseq += constitalg
+
+ from JetRecConfig import JetRecConfig
+ constitpjalg = JetRecConfig.getConstitPJGAlg( constit )
+ if not hasattr(algseq, constitpjalg.name()):
+ algseq += constitpjalg
+
+ getterbase = inputtype.lower()
+ getters = [constitpjalg]+list(jtm.gettersMap[getterbase])[1:]
+
+ tmpFinderTool= jtm.addJetFinder(tmpName, jetalg, rsize, getters,
**finderArgs # pass the prepared arguments
)
return [tmpFinderTool]
+##################################################################
+
def buildGenericGroomAlg(jetalg, rsize, inputtype, groomedName, jetToolBuilder,
includePreTools=False, algseq=None, outputGroup="CustomJets",
- writeUngroomed=False, variableRMassScale=-1.0, variableRMinRadius=-1.0):
+ writeUngroomed=False, variableRMassScale=-1.0, variableRMinRadius=-1.0, constmods=[]):
algname = "jetalg"+groomedName[:-4]
from RecExConfig.AutoConfiguration import IsInInputFile
@@ -192,7 +227,10 @@ def buildGenericGroomAlg(jetalg, rsize, inputtype, groomedName, jetToolBuilder,
return
from JetRec.JetRecUtils import buildJetContName
- ungroomedName = buildJetContName(jetalg, rsize, inputtype, variableRMassScale, variableRMinRadius)
+ constmodstr = "".join(constmods)
+ inputname = inputtype+constmodstr
+ label = inputtype + constmodstr
+ ungroomedName = buildJetContName(jetalg, rsize, inputname, variableRMassScale, variableRMinRadius)
ungroomedalgname = "jetalg"+ungroomedName[:-4] # Remove "Jets" from name
# add these groomed jets to the output (use setdefault() to constuct the list if not existing yet)
@@ -207,14 +245,15 @@ def buildGenericGroomAlg(jetalg, rsize, inputtype, groomedName, jetToolBuilder,
finderalg = getattr(algseq, ungroomedalgname)
dfjetlog.warning( "Algsequence "+algseq.name()+" already has an instance of "+ungroomedalgname )
elif ungroomedalgname in DFJetAlgs:
- dfjetlog.info( "Added jet finder"+ ungroomedalgname+" to sequence"+ algseq.name() )
+ dfjetlog.info( "Added jet finder "+ ungroomedalgname+" to sequence"+ algseq.name() )
finderalg = DFJetAlgs[ungroomedalgname]
algseq += DFJetAlgs[ungroomedalgname]
else:
# 1. make sure we have pseudo-jet in our original container
# this returns a list of the needed tools to do so.
- jetalgTools = reCreatePseudoJets(jetalg, rsize, inputtype, variableRMassScale, variableRMinRadius, algseq)
- if includePreTools:
+ jetalgTools = reCreatePseudoJets(jetalg, rsize, inputtype, variableRMassScale, variableRMinRadius, algseq, constmods=constmods)
+
+ if includePreTools and jetFlags.useTracks() and not "Truth" in inputtype:
# enable track ghost association and JVF
jetalgTools = [jtm.tracksel, jtm.tvassoc] + jetalgTools
@@ -238,10 +277,11 @@ def buildGenericGroomAlg(jetalg, rsize, inputtype, groomedName, jetToolBuilder,
##################################################################
def addTrimmedJets(jetalg, rsize, inputtype, rclus=0.3, ptfrac=0.05, mods="groomed",
includePreTools=False, algseq=None, outputGroup="Trimmed",
- writeUngroomed=False, variableRMassScale=-1.0, variableRMinRadius=-1.0):
+ writeUngroomed=False, variableRMassScale=-1.0, variableRMinRadius=-1.0, constmods=[]):
from JetRec.JetRecUtils import buildJetContName
from JetRec.JetRecUtils import buildJetAlgName
- trimmedName = "{0}{1}TrimmedPtFrac{2}SmallR{3}Jets".format(buildJetAlgName(jetalg, rsize, variableRMassScale, variableRMinRadius),inputtype,int(ptfrac*100),int(rclus*100))
+ inputname = inputtype + "".join(constmods)
+ trimmedName = "{0}{1}TrimmedPtFrac{2}SmallR{3}Jets".format(buildJetAlgName(jetalg, rsize, variableRMassScale, variableRMinRadius),inputname,int(ptfrac*100),int(rclus*100))
# a function dedicated to build Trimmed jet :
def trimToolBuilder( name, inputJetCont):
@@ -254,14 +294,15 @@ def addTrimmedJets(jetalg, rsize, inputtype, rclus=0.3, ptfrac=0.05, mods="groom
return buildGenericGroomAlg(jetalg, rsize, inputtype, trimmedName, trimToolBuilder,
includePreTools, algseq, outputGroup,
writeUngroomed=writeUngroomed,
- variableRMassScale=variableRMassScale, variableRMinRadius=variableRMinRadius)
+ variableRMassScale=variableRMassScale, variableRMinRadius=variableRMinRadius, constmods=constmods)
##################################################################
def addPrunedJets(jetalg, rsize, inputtype, rcut=0.50, zcut=0.15, mods="groomed",
includePreTools=False, algseq=None, outputGroup="Pruned",
- writeUngroomed=False):
- prunedName = "{0}{1}{2}PrunedR{3}Z{4}Jets".format(jetalg,str(int(rsize*10)),inputtype,int(rcut*100),int(zcut*100))
+ writeUngroomed=False, constmods=[]):
+ inputname = inputtype + "".join(constmods)
+ prunedName = "{0}{1}{2}PrunedR{3}Z{4}Jets".format(jetalg,str(int(rsize*10)),inputname,int(rcut*100),int(zcut*100))
# a function dedicated to build Pruned jet :
def pruneToolBuilder( name, inputJetCont):
@@ -273,14 +314,15 @@ def addPrunedJets(jetalg, rsize, inputtype, rcut=0.50, zcut=0.15, mods="groomed"
# pass the trimmedName and our specific trimming tool builder to the generic function :
return buildGenericGroomAlg(jetalg, rsize, inputtype, prunedName, pruneToolBuilder,
includePreTools, algseq, outputGroup,
- writeUngroomed=writeUngroomed)
+ writeUngroomed=writeUngroomed, constmods=constmods)
##################################################################
def addFilteredJets(jetalg, rsize, inputtype, mumax=1.0, ymin=0.15, mods="groomed",
includePreTools=False, algseq=None, outputGroup="Filtered",
- writeUngroomed=False):
- filteredName = "{0}{1}{2}BDRSFilteredMU{3}Y{4}Jets".format(jetalg,int(rsize*10),inputtype,int(mumax*100),int(ymin*100))
+ writeUngroomed=False, constmods=[]):
+ inputname = inputtype + "".join(constmods)
+ filteredName = "{0}{1}{2}BDRSFilteredMU{3}Y{4}Jets".format(jetalg,int(rsize*10),inputname,int(mumax*100),int(ymin*100))
# a function dedicated to build Filtered jet :
def filterToolBuilder( name, inputJetCont):
@@ -292,15 +334,81 @@ def addFilteredJets(jetalg, rsize, inputtype, mumax=1.0, ymin=0.15, mods="groome
# pass the trimmedName and our specific trimming tool builder to the generic function :
return buildGenericGroomAlg(jetalg, rsize, inputtype, filteredName, filterToolBuilder,
includePreTools, algseq, outputGroup,
- writeUngroomed=writeUngroomed)
+ writeUngroomed=writeUngroomed, constmods=constmods)
##################################################################
+def addSoftDropJets(jetalg, rsize, inputtype, beta=0, zcut=0.1, mods="groomed",
+ includePreTools=False, algseq=None, outputGroup="SoftDrop",
+ writeUngroomed=False, constmods=[]):
+
+ inputname = inputtype + "".join(constmods)
+ softDropName = "{0}{1}{2}SoftDropBeta{3}Zcut{4}Jets".format(jetalg,int(rsize*10),inputname,int(beta*100),int(zcut*100))
+
+ # a function dedicated to build SoftDrop jet:
+ def softDropToolBuilder( name, inputJetCont):
+ from JetRec.JetRecStandard import jtm
+ if name in jtm.tools: return jtm.tools[name]
+ else: return jtm.addJetSoftDrop( name, beta=beta, zcut=zcut, r0=rsize, input=inputJetCont, modifiersin=mods )
+
+ dfjetlog.info( "Configuring soft drop jets : "+softDropName )
+ #pass the softDropName and our specific soft drop tool to the generic function:
+ return buildGenericGroomAlg(jetalg, rsize, inputtype, softDropName, softDropToolBuilder,
+ includePreTools, algseq, outputGroup,
+ writeUngroomed=writeUngroomed, constmods=constmods)
+
+##################################################################
+
+def addRecursiveSoftDropJets(jetalg, rsize, inputtype, beta=0, zcut=0.1, N=-1, mods="groomed",
+ includePreTools=False, algseq=None, outputGroup="SoftDrop",
+ writeUngroomed=False, constmods=[]):
+ inputname = inputtype + "".join(constmods)
+ if N >= 0:
+ softDropName = "{0}{1}{2}RecursiveSoftDropBeta{3}Zcut{4}N{5}Jets".format(jetalg,int(rsize*10),inputname,int(beta*100),int(zcut*100), int(N))
+ if N < 0:
+ softDropName = "{0}{1}{2}RecursiveSoftDropBeta{3}Zcut{4}NinfJets".format(jetalg,int(rsize*10),inputname,int(beta*100),int(zcut*100))
+
+
+ # a function dedicated to build SoftDrop jet:
+ def recursiveSoftDropToolBuilder( name, inputJetCont):
+ from JetRec.JetRecStandard import jtm
+ if name in jtm.tools: return jtm.tools[name]
+ else: return jtm.addJetRecursiveSoftDrop( name, beta=beta, zcut=zcut, N=N, r0=rsize, input=inputJetCont, modifiersin=mods )
+
+ dfjetlog.info( "Configuring soft drop jets : "+softDropName )
+ #pass the softDropName and our specific soft drop tool to the generic function:
+ return buildGenericGroomAlg(jetalg, rsize, inputtype, softDropName, recursiveSoftDropToolBuilder,
+ includePreTools, algseq, outputGroup,
+ writeUngroomed=writeUngroomed, constmods=constmods)
+
+##################################################################
+
+def addBottomUpSoftDropJets(jetalg, rsize, inputtype, beta=0, zcut=0.1, mods="groomed",
+ includePreTools=False, algseq=None, outputGroup="SoftDrop",
+ writeUngroomed=False, constmods=[]):
+ inputname = inputtype + "".join(constmods)
+ softDropName = "{0}{1}{2}BottomUpSoftDropBeta{3}Zcut{4}Jets".format(jetalg,int(rsize*10),inputname,int(beta*100),int(zcut*100))
+
+ # a function dedicated to build SoftDrop jet:
+ def bottomUpSoftDropToolBuilder( name, inputJetCont):
+ from JetRec.JetRecStandard import jtm
+ if name in jtm.tools: return jtm.tools[name]
+ else: return jtm.addJetBottomUpSoftDrop( name, beta=beta, zcut=zcut, r0=rsize, input=inputJetCont, modifiersin=mods )
+
+ dfjetlog.info( "Configuring soft drop jets : "+softDropName )
+ #pass the softDropName and our specific soft drop tool to the generic function:
+ return buildGenericGroomAlg(jetalg, rsize, inputtype, softDropName, bottomUpSoftDropToolBuilder,
+ includePreTools, algseq, outputGroup,
+ writeUngroomed=writeUngroomed, constmods=constmods)
+
+##################################################################
+
def addStandardJets(jetalg, rsize, inputtype, ptmin=0., ptminFilter=0.,
mods="default", calibOpt="none", ghostArea=0.01,
algseq=None, namesuffix="",
- outputGroup="CustomJets"):
+ outputGroup="CustomJets", customGetters=None, pretools = [], constmods = [],
+ overwrite=False):
jetnamebase = "{0}{1}{2}{3}".format(jetalg,int(rsize*10),inputtype,namesuffix)
jetname = jetnamebase+"Jets"
@@ -312,7 +420,7 @@ def addStandardJets(jetalg, rsize, inputtype, ptmin=0., ptminFilter=0.,
if algseq is None:
dfjetlog.warning( "No algsequence passed! Will not schedule "+algname )
return
- elif IsInInputFile("xAOD::JetContainer",jetname):
+ elif IsInInputFile("xAOD::JetContainer",jetname) and not overwrite:
dfjetlog.warning( "Collection "+jetname+" is already in input AOD!" )
return
elif algname in DFJetAlgs:
@@ -344,23 +452,33 @@ def addStandardJets(jetalg, rsize, inputtype, ptmin=0., ptminFilter=0.,
finderArgs['modifiersin'] = mods
finderArgs['calibOpt'] = calibOpt
print ("mods in:", finderArgs['modifiersin'])
- #finderArgs.pop('modifiersin') # leave the default modifiers.
+ if overwrite:
+ dfjetlog.info("Will overwrite AOD version of "+jetname)
+ finderArgs['overwrite']=True
# map the input to the jtm code for PseudoJetGetter
- getterMap = dict( LCTopo = 'lctopo', EMTopo = 'emtopo', EMPFlow = 'empflow', EMCPFlow = 'emcpflow', Truth='truth', TruthWZ='truthwz', PV0Track='pv0track')
+ getterMap = dict( LCTopo = 'lctopo', EMTopo = 'emtopo', EMPFlow = 'empflow', EMCPFlow = 'emcpflow',
+ Truth = 'truth', TruthWZ = 'truthwz', TruthDressedWZ = 'truthdressedwz', TruthCharged = 'truthcharged',
+ PV0Track='pv0track')
# create the finder for the temporary collection.
- for getter in jtm.gettersMap[getterMap[inputtype]]:
- if getter not in jtm.allGetters:
- algseq += getter
- jtm.allGetters += getter
+ if customGetters is None:
+ inGetter = getterMap[inputtype]
+ for getter in jtm.gettersMap[inGetter]:
+ if not hasattr(algseq, getter.name()):
+ algseq += getter
+ else:
+ inGetter = customGetters
+ for getter in customGetters:
+ if not hasattr(algseq, getter.name()):
+ algseq += getter
- finderTool= jtm.addJetFinder(jetname, jetalg, rsize, getterMap[inputtype] ,
+ finderTool= jtm.addJetFinder(jetname, jetalg, rsize, inGetter, constmods=constmods,
**finderArgs # pass the prepared arguments
)
from JetRec.JetRecConf import JetAlgorithm
- alg = JetAlgorithm(algname, Tools = [finderTool])
+ alg = JetAlgorithm(algname, Tools = pretools+[finderTool])
dfjetlog.info( "Added "+algname+" to sequence "+algseq.name() )
algseq += alg
DFJetAlgs[algname] = alg;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py
new file mode 100644
index 0000000000000000000000000000000000000000..368277ad4a23c477c38e1a0ae77ec73dbd82329b
--- /dev/null
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/METTriggerDerivationContent.py
@@ -0,0 +1,173 @@
+from DerivationFrameworkCore.DerivationFrameworkMaster import *
+from DerivationFrameworkJetEtMiss.JetCommon import *
+from DerivationFrameworkJetEtMiss.ExtendedJetCommon import *
+from DerivationFrameworkJetEtMiss.METCommon import *
+
+from DerivationFrameworkCore.ThinningHelper import ThinningHelper
+from DerivationFrameworkInDet.DerivationFrameworkInDetConf import DerivationFramework__TrackParticleThinning, DerivationFramework__MuonTrackParticleThinning, DerivationFramework__EgammaTrackParticleThinning, DerivationFramework__TauTrackParticleThinning
+from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
+from AthenaCommon.SystemOfUnits import GeV
+from AthenaCommon.AppMgr import ToolSvc
+from DerivationFrameworkJetEtMiss.PFlowCommon import applyPFOAugmentation
+
+class METTriggerDerivationContentManager(object):
+ """ Helper class to assemble MET trigger derivation content """
+ def __init__(
+ self, stream_name, stream, common_prefix="DFMETTrig",
+ jet_algorithms = ["AntiKt4EMTopo", "AntiKt4EMPFlow"],
+ track_threshold = 10*GeV, track_sel=None, all_vars=None):
+ """ Create the manager
+
+ Parameters
+ ------------
+ stream_name: The name of the stream (e.g JETM10)
+ stream: The stream object returned by MSMgr.NewPoolRootStream
+ common_prefix: The prefix used by shared tools and decorations to prevent duplication
+ jet_algorithms: The different jet algorithms (+ associated MET containers) to write
+ track_threshold: Write out all tracks with pT above this threshold (in MeV)
+ track_sel: The track selection string
+ all_vars: Extra containers to add to 'AllVariables'
+ """
+ self.stream_name = stream_name
+ self._common_prefix = common_prefix
+ self.track_threshold = track_threshold
+ track_sel = track_sel
+ self.track_sel = track_sel
+ self.all_vars = [] if all_vars is None else all_vars
+ # Create the tools
+ if any(x in self.all_vars for x in ("JetETMissNeutralParticleFlowObjects", "JetETMissChargedParticleFlowObjects") ):
+ applyPFOAugmentation()
+ self._make_slimming_tools(stream, jet_algorithms)
+ self._make_augmentation_tools(stream)
+ self._make_thinning_tools(stream)
+
+ @classmethod
+ def make_loose_manager(cls, stream_name, stream):
+ return cls(
+ stream_name, stream, track_threshold=1*GeV, track_sel="Loose",
+ all_vars = [
+ "HLT_xAOD__MuonContainer_MuonEFInfo",
+ "CaloCalTopoClusters",
+ "JetETMissChargedParticleFlowObjects",
+ "JetETMissNeutralParticleFlowObjects",
+ "Kt4EMPFlowEventShape"])
+
+ @classmethod
+ def make_tight_manager(cls, stream_name, stream):
+ return cls(stream_name, stream, track_threshold=10*GeV)
+
+ @property
+ def common_prefix(self):
+ return self._common_prefix
+
+ def make_kernel(self, *skimming_tools):
+ return CfgMgr.DerivationFramework__DerivationKernel(
+ self.stream_name + "Kernel",
+ AugmentationTools = self.augmentation_tools,
+ SkimmingTools = list(skimming_tools),
+ ThinningTools = self.thinning_tools)
+
+
+ def _mk_common_tool(self, cls, name, **kwargs):
+ """ Create a common tool, if it isn't already in the ToolSvc """
+ global ToolSvc
+ # Resolve the full name
+ if not name.startswith(self.common_prefix):
+ name = self.common_prefix + name
+ try:
+ return getattr(ToolSvc, name)
+ except AttributeError:
+ ToolSvc += cls(name, **kwargs)
+ return getattr(ToolSvc, name)
+
+ def _make_slimming_tools(self, stream, jet_algorithms):
+ self.slimming_helper = SlimmingHelper(self.stream_name + "SlimmingHelper")
+ smart_collections = ["Electrons", "Muons", "Photons", "TauJets", "PrimaryVertices", "InDetTrackParticles"]
+ smart_collections += ["{0}Jets".format(a) for a in jet_algorithms]
+ smart_collections += ["MET_Reference_{0}".format(a) for a in jet_algorithms]
+ if "AntiKt4EMTopo" in jet_algorithms:
+ smart_collections += [
+ "AntiKt4EMTopoJets_BTagging201810", "BTagging_AntiKt4EMTopo_201810"]
+ if "AntiKt4EMPFlow" in jet_algorithms:
+ smart_collections += [
+ "AntiKt4EMPFlowJets_BTagging201810", "BTagging_AntiKt4EMPFlow_201810",
+ "AntiKt4EMPFlowJets_BTagging201903", "BTagging_AntiKt4EMPFlow_201903"]
+ self.slimming_helper.SmartCollections = smart_collections
+ self.slimming_helper.ExtraVariables = [
+ "{0}Jets.Timing".format(a) for a in jet_algorithms]
+ self.slimming_helper.AllVariables = [
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PS",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUC",
+ "HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl",
+ "LVL1EnergySumRoI",
+ "LVL1JetRoIs",
+ "LVL1JetEtRoI"] \
+ + ["MET_Core_{0}".format(a) for a in jet_algorithms] \
+ + ["METAssoc_{0}".format(a) for a in jet_algorithms] \
+ + self.all_vars
+
+ def _make_augmentation_tools(self, stream):
+ """ Create any common augmentation tools """
+ self.augmentation_tools = []
+ if self.track_sel is not None:
+ tool = self._mk_common_tool(
+ CfgMgr.DerivationFramework__InDetTrackSelectionToolWrapper,
+ "{0.track_sel}TrackSelWrapper".format(self),
+ ContainerName = "InDetTrackParticles",
+ DecorationName = self.common_prefix + self.track_sel)
+ tool.TrackSelectionTool.CutLevel = self.track_sel
+ self.augmentation_tools.append(tool)
+ self.slimming_helper.ExtraVariables.append(
+ "InDetTrackParticles." + tool.DecorationName)
+ tva_tool = self._mk_common_tool(
+ CfgMgr.DerivationFramework__TVAAugmentationTool,
+ "NominalTVAAugmentationTool",
+ LinkName = self.common_prefix+"NominalTVA",
+ TrackName = "InDetTrackParticles",
+ TVATool = self._mk_common_tool(
+ CfgMgr.CP__TrackVertexAssociationTool,
+ "NominalTVATool",
+ WorkingPoint="Nominal") )
+ self.augmentation_tools.append(tva_tool)
+ self.slimming_helper.ExtraVariables.append(
+ "{0.TrackName}.{0.LinkName}".format(tva_tool) )
+
+ def _make_thinning_tools(self, stream):
+ stream_name = self.stream_name
+ self.thinning_helper = ThinningHelper(stream_name+"ThinningHelper")
+ self.thinning_helper.AppendToStream(stream)
+ self.thinning_tools = []
+ tool = DerivationFramework__TrackParticleThinning(
+ stream_name + "TPThinningTool",
+ StreamName = stream_name,
+ SelectionString = "InDetTrackParticles.pt > {0}*GeV".format(
+ self.track_threshold) )
+ if self.track_sel is not None:
+ tool.SelectionString += " || InDetTrackParticles.{0.common_prefix}{0.track_sel}".format(self)
+ self.thinning_tools.append(tool)
+ self.thinning_tools += [
+ DerivationFramework__MuonTrackParticleThinning(
+ stream_name + "MuonTPThinningTool",
+ StreamName = stream_name,
+ MuonKey = "Muons",
+ InDetTrackParticlesKey = "InDetTrackParticles"),
+ DerivationFramework__EgammaTrackParticleThinning(
+ stream_name + "ElectronTPThinningTool",
+ StreamName = stream_name,
+ SGKey = "Electrons",
+ InDetTrackParticlesKey = "InDetTrackParticles"),
+ DerivationFramework__EgammaTrackParticleThinning(
+ stream_name + "PhotonTPThinningTool",
+ StreamName = stream_name,
+ SGKey = "Photons",
+ InDetTrackParticlesKey = "InDetTrackParticles"),
+ DerivationFramework__TauTrackParticleThinning(
+ stream_name + "TauTPThinningTool",
+ StreamName = stream_name,
+ TauKey = "TauJets",
+ InDetTrackParticlesKey = "InDetTrackParticles")
+ ]
+ global ToolSvc
+ ToolSvc += self.thinning_tools
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/TriggerLists.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/TriggerLists.py
index 83a470027c31a3f2c30a677cc5038bf4785b8cb8..21387bca2b605931dfb744def71a8167a5f78509 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/TriggerLists.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/TriggerLists.py
@@ -1,320 +1,43 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from TriggerMenu.api.TriggerAPI import TriggerAPI
+from TriggerMenu.api.TriggerEnums import TriggerPeriod, TriggerType
+
+# jet triggers (single Jets, prescaled and unprescaled)
+def jetTrig():
+ period2015tofuture = TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017 | TriggerPeriod.y2018 | TriggerPeriod.future
+ period2017tofuture = TriggerPeriod.y2017 | TriggerPeriod.y2018 | TriggerPeriod.future
+ API_jetTrig = TriggerAPI.getActive(period2015tofuture, TriggerType.j_single)
+ # Large-radius multijet triggers
+ API_jetTrig += TriggerAPI.getActive(period2017tofuture,TriggerType.j_multi,matchPattern=".*_a10t_.*")
+ # Eta-intercalibration triggers (one central, one forward jet)
+ API_jetTrig += TriggerAPI.getActive(period2015tofuture,TriggerType.j_multi,matchPattern="HLT_j.*_320eta490")
+ return API_jetTrig
+
+# electron triggers (unprescaled)
+def single_el_Trig():
+ API_singleElTriggers = TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2015, TriggerType.el_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2016, TriggerType.el_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2017, TriggerType.el_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2018, TriggerType.el_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.future, TriggerType.el_single)
+ return API_singleElTriggers
+
+def multi_el_Trig():
+ API_multiElTriggers = TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2015, TriggerType.el_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2016, TriggerType.el_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2017, TriggerType.el_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2018, TriggerType.el_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.future, TriggerType.el_multi)
+ return API_multiElTriggers
+
+# single muon triggers (unprescaled)
+def single_mu_Trig():
+ API_singleMuTriggers = TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2015, TriggerType.mu_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2016, TriggerType.mu_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2017, TriggerType.mu_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2018, TriggerType.mu_single) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.future, TriggerType.mu_single)
+ return API_singleMuTriggers
+
+def multi_mu_Trig():
+ API_multiMuTriggers = TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2015, TriggerType.mu_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2016, TriggerType.mu_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2017, TriggerType.mu_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2018, TriggerType.mu_multi) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.future, TriggerType.mu_multi)
+ return API_multiMuTriggers
+
+# xe triggers (unprescaled)
+def MET_Trig():
+ API_MET_Triggers = TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2015, TriggerType.xe) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2016, TriggerType.xe) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2017, TriggerType.xe) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.y2018, TriggerType.xe) + TriggerAPI.getLowestUnprescaled(TriggerPeriod.future, TriggerType.xe)
+ return API_MET_Triggers
+
+# photon triggers (prescaled and unprescaled)
+def single_photon_Trig():
+ API_singlePhotonTriggers = TriggerAPI.getActive(TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017 | TriggerPeriod.y2018 | TriggerPeriod.future, TriggerType.g_single)
+ return API_singlePhotonTriggers
-# jet triggers
-jetTriggers = [
-# unprescaled
-'HLT_j360_320eta490',
-'HLT_j360_320eta490_jes',
-'HLT_j360_320eta490_lcw',
-'HLT_j360_320eta490_lcw_jes',
-'HLT_j360_320eta490_lcw_nojcalib',
-'HLT_j360_320eta490_nojcalib',
-'HLT_j360_a10_lcw_L1J100',
-'HLT_j360_a10_lcw_sub_L1J100',
-'HLT_j360_a10r_L1J100',
-'HLT_j380',
-'HLT_j380_jes',
-'HLT_j380_lcw',
-'HLT_j380_lcw_jes',
-'HLT_j380_lcw_nojcalib',
-'HLT_j380_nojcalib',
-'HLT_j400_a10_lcw_L1J100',
-'HLT_j400_a10r_L1J100',
-'HLT_j400_a10_lcw_L1J100',
-'HLT_j400_a10r_L1J100',
-'HLT_j400_a10r_L1J100',
-'HLT_j400_a10_lcw_L1J100',
-'HLT_j400',
-'HLT_j400_jes',
-'HLT_j400_lcw',
-'HLT_j400_lcw_jes',
-'HLT_j400_nojcalib',
-'HLT_j400_sub',
-'HLT_j420',
-'HLT_j420_jes',
-'HLT_j420_lcw',
-'HLT_j420_lcw_jes',
-'HLT_j420_lcw_nojcalib',
-'HLT_j420_nojcalib',
-'HLT_j420_a10_lcw_L1J100',
-'HLT_j420_a10_lcw_sub_L1J100',
-'HLT_j420_a10r_L1J100',
-'HLT_j440',
-'HLT_j460',
-'HLT_j460_a10_lcw_nojcalib_L1J100',
-'HLT_j460_a10_lcw_sub_L1J100',
-'HLT_j460_a10_nojcalib_L1J100',
-'HLT_j460_a10_sub_L1J100',
-'HLT_j460_a10r_L1J100',
-# prescaled
-'HLT_j0_perf_L1RD0_FILLED',
-'HLT_j15',
-'HLT_j15_320eta490',
-'HLT_j15_j15_320eta490',
-'HLT_j25',
-'HLT_j25_320eta490',
-'HLT_j25_j25_320eta490',
-'HLT_j35',
-'HLT_j35_320eta490',
-'HLT_j35_j35_320eta490',
-'HLT_j35_jes',
-'HLT_j35_lcw',
-'HLT_j35_lcw_jes',
-'HLT_j35_lcw_nojcalib',
-'HLT_j35_nojcalib',
-'HLT_j45',
-'HLT_j45_320eta490',
-'HLT_j45_L1RD0_FILLED',
-'HLT_j45_j45_320eta490',
-'HLT_j55',
-'HLT_j55_320eta490',
-'HLT_j60',
-'HLT_j60_280eta320',
-'HLT_j60_320eta490',
-'HLT_j60_L1RD0_FILLED',
-'HLT_j60_j60_320eta490',
-'HLT_j85',
-'HLT_j85_280eta320',
-'HLT_j85_280eta320_jes',
-'HLT_j85_280eta320_lcw',
-'HLT_j85_280eta320_lcw_jes',
-'HLT_j85_280eta320_lcw_nojcalib',
-'HLT_j85_280eta320_nojcalib',
-'HLT_j85_320eta490',
-'HLT_j85_L1RD0_FILLED',
-'HLT_j85_j85_320eta490',
-'HLT_j85_jes',
-'HLT_j100',
-'HLT_j110',
-'HLT_j110_320eta490',
-'HLT_j150',
-'HLT_j175',
-'HLT_j175_320eta490',
-'HLT_j175_320eta490_jes',
-'HLT_j175_320eta490_lcw',
-'HLT_j175_320eta490_lcw_jes',
-'HLT_j175_320eta490_lcw_nojcalib',
-'HLT_j175_320eta490_nojcalib',
-'HLT_j200',
-'HLT_j260',
-'HLT_j260_320eta490_jes',
-'HLT_j260_320eta490_lcw',
-'HLT_j260_320eta490_lcw_jes',
-'HLT_j260_320eta490_lcw_nojcalib',
-'HLT_j260_320eta490_nojcalib',
-'HLT_j260_a10_lcw_L1J75',
-'HLT_j260_a10_lcw_nojcalib_L1J75',
-'HLT_j260_a10_lcw_sub_L1J75',
-'HLT_j260_a10_nojcalib_L1J75',
-'HLT_j260_a10_sub_L1J75',
-'HLT_j260_a10r_L1J75',
-'HLT_j300',
-'HLT_j300_a10_lcw_L1J75',
-'HLT_j300_a10_sub_L1J75',
-'HLT_j300_a10r_L1J75',
-'HLT_j320',
-'HLT_j340',
-'HLT_j360',
-'HLT_j380',
-]
-
-# single electron triggers
-
-singleElTriggers = [
-'HLT_e26_lhtight_smooth_iloose',
-'HLT_e26_lhtight_smooth_ivarloose',
-'HLT_e26_lhtight_iloose',
-'HLT_e26_lhtight_ivarloose',
-'HLT_e26_lhtight_nod0_iloose',
-'HLT_e26_lhtight_nod0_ivarloose',
-'HLT_e26_lhtight_cutd0dphideta_iloose',
-'HLT_e28_lhtight_smooth_iloose',
-'HLT_e28_lhtight_smooth_ivarloose',
-'HLT_e28_lhtight_iloose',
-'HLT_e28_lhtight_ivarloose',
-'HLT_e28_lhtight_nod0_iloose',
-'HLT_e28_lhtight_nod0_ivarloose',
-'HLT_e28_lhtight_nod0_ringer_iloose',
-'HLT_e28_lhtight_nod0_ringer_ivarloose',
-'HLT_e60_lhmedium',
-'HLT_e60_lhmedium_nod0',
-'HLT_e60_lhmedium_L1EM24VHI ',
-'HLT_e60_lhmedium_nod0_L1EM24VHI ',
-'HLT_e60_lhmedium_cutd0dphideta',
-'HLT_e140_lhloose',
-'HLT_e140_lhloose_nod0 ',
-'HLT_e140_lhloose_L1EM24VHI ',
-'HLT_e140_lhloose_nod0_L1EM24VHI ',
-'HLT_e300_etcut ',
-'HLT_e26_lhtight_idperf',
-'HLT_e24_lhtight_iloose',
-'HLT_e24_lhtight_nod0_iloose',
-'HLT_e24_lhtight_ivarloose',
-'HLT_e24_lhtight_nod0_ivarloose',
-'HLT_e24_lhtight_cutd0dphideta_iloose ',
-'HLT_e17_lhloose_nod0_2e9_lhloose_nod0',
-'HLT_e24_lhmedium_iloose',
-'HLT_e24_lhmedium_ivarloose',
-'HLT_e24_lhmedium_nod0_iloose',
-'HLT_e24_lhmedium_nod0_ivarloose ',
-'HLT_e24_lhmedium_iloose_L1EM20VH',
-'HLT_e24_lhmedium_nod0_iloose_L1EM20VH',
-'HLT_e24_lhmedium_ivarloose_L1EM20VH',
-'HLT_e24_lhmedium_nod0_ivarloose_L1EM20VH',
-'HLT_e24_lhmedium_L1EM20VH',
-'HLT_e24_lhmedium_nod0_L1EM20VH',
-'HLT_e24_medium_iloose_L1EM20VH ',
-'HLT_e120_lhloose',
-'HLT_e120_lhloose_nod0',
-'HLT_e24_lhmedium_iloose_L1EM18VH',
-'HLT_e24_lhmedium_nod0_iloose_L1EM18VH',
-'HLT_e24_lhmedium_ivarloose_L1EM18VH',
-'HLT_e24_lhmedium_nod0_ivarloose_L1EM18VH',
-'HLT_e24_lhmedium_nod0_ringer_iloose',
-'HLT_e24_lhmedium_nod0_ringer_ivarloose',
-'HLT_e60_medium',
-'HLT_e60_medium_L1EM24VHI',
-]
-
-# single muon triggers
-
-singleMuTriggers = [
-'HLT_mu26_imedium',
-'HLT_mu26_ivarmedium',
-'HLT_mu50HLT_mu60_0eta105_msonly',
-'HLT_mu24_mu8noL1',
-'HLT_mu24_2mu4noL1',
-'HLT_mu22_2mu4noL1',
-'HLT_mu20_2mu4noL1',
-'HLT_mu22_mu8noL1',
-'HLT_mu24_imedium',
-'HLT_mu24_ivarmedium',
-'HLT_mu20_mu8noL1',
-'HLT_mu40',
-'HLT_mu50',
-'HLT_mu24_ivarloose',
-'HLT_mu24_iloose',
-'HLT_mu24_iloose_L1MU15',
-'HLT_mu24_ivarloose_L1MU15',
-'HLT_mu20_iloose_L1MU15',
-'HLT_mu20_ivarloose_L1MU15',
-]
-
-# xe triggers
-
-metTriggers = [
-'HLT_xe80_tc_lcw_L1XE50',
-'HLT_xe90_mht_L1XE50',
-'HLT_xe90_mht_wEFMu_L1XE50',
-'HLT_xe90_tc_lcw_L1XE50 ',
-'HLT_xe90_tc_lcw_wEFMu_L1XE50 ',
-'HLT_xe100',
-'HLT_xe100_L1XE50 ',
-'HLT_xe100_L1XE60',
-'HLT_xe100_mht_L1XE50',
-'HLT_xe100_mht_L1XE60',
-'HLT_xe100_mht_wEFMu_L1XE50',
-'HLT_xe100_tc_em_L1XE50',
-'HLT_xe100_tc_em_wEFMu_L1XE50',
-'HLT_xe100_tc_lcw_L1XE50 ',
-'HLT_xe100_tc_lcw_L1XE60',
-'HLT_xe100_tc_lcw_wEFMu_L1XE50 ',
-'HLT_xe100_wEFMu_L1XE50 ',
-'HLT_xe110_L1XE50 ',
-'HLT_xe110_mht_L1XE50',
-'HLT_xe110_pueta_L1XE50 ',
-'HLT_xe110_pufit_L1XE50 ',
-'HLT_xe110_tc_em_L1XE50',
-'HLT_xe110_tc_em_wEFMu_L1XE50',
-'HLT_xe110_wEFMu_L1XE50 ',
-'HLT_xe120 ',
-'HLT_xe120_mht ',
-'HLT_xe120_mht_wEFMu ',
-'HLT_xe120_pueta',
-'HLT_xe120_pueta_L1XE50 ',
-'HLT_xe120_pueta_wEFMu',
-'HLT_xe120_pufit',
-'HLT_xe120_pufit_L1XE50',
-'HLT_xe120_pufit_wEFMu',
-'HLT_xe120_tc_em',
-'HLT_xe120_tc_em_wEFMu',
-'HLT_xe120_tc_lcw',
-'HLT_xe120_tc_lcw_wEFMu',
-'HLT_xe120_wEFMu ',
-'HLT_xe130_mht_L1XE50',
-]
-
-#multi-muon triggers
-
-multiMuTriggers = [
-'HLT_2mu10',
-'HLT_3mu4',
-'HLT_2mu14',
-'HLT_2mu14_nomucomb',
-'HLT_3mu6',
-'HLT_3mu6_msonly',
-'HLT_mu18_mu8noL1',
-'HLT_mu18_2mu4noL1',
-]
-
-# multi-el triggers
-
-multiElTriggers = [
-'HLT_e17_lhloose_2e9_lhloose',
-'HLT_e17_lhmedium_2e9_lhmedium',
-'HLT_e17_lhmedium_nod0_2e9_lhmedium_nod0',
-'HLT_2e17_lhvloose',
-'HLT_2e17_lhvloose_nod0',
-'HLT_2e17_lhloose_cutd0dphideta',
-'HLT_2e17_lhloose',
-'HLT_2e15_lhvloose_L12EM13VH',
-'HLT_2e15_lhvloose_nod0_L12EM13VH',
-'HLT_2e12_lhvloose_L12EM10VH ',
-'HLT_2e12_lhvloose_nod0_L12EM10VH',
-]
-
-# photon triggers
-singlePhotonTriggers = [
-# prescaled
-'HLT_g10_loose',
-'HLT_g15_loose',
-'HLT_g15_loose_L1EM3',
-'HLT_g15_loose_L1EM7',
-'HLT_g20_loose',
-'HLT_g20_loose_L1EM12',
-'HLT_g20_loose_L1EM15',
-'HLT_g25_loose',
-'HLT_g25_loose_L1EM15',
-'HLT_g35_loose',
-'HLT_g35_loose_L1EM15',
-'HLT_g40_loose_L1EM15',
-'HLT_g45_loose_L1EM15',
-'HLT_g50_loose',
-'HLT_g50_loose_L1EM15',
-'HLT_g60_loose',
-'HLT_g60_loose_L1EM15VH',
-'HLT_g70_loose',
-'HLT_g80_loose',
-'HLT_g100_loose',
-'HLT_g120_loose',
-# unprescaled
-'HLT_g140_loose',
-'HLT_g200_etcut',
-'HLT_g250_etcut',
-'HLT_g300_etcut',
-]
-
-# multi-photon triggers
-
-multiPhotonTriggers = [
-'HLT_2g60_loose_L12EM15VH',
-'HLT_2g22_tight',
-'HLT_3g20_loose',
-'HLT_2g50_loose',
-'HLT_2g20_tight',
-'HLT_2g20_loose_g15_loose',
-'HLT_3g15_loose',
-'HLT_g35_medium_g25_medium',
-'HLT_g35_loose_g25_loose',
-'HLT_g35_loose_L1EM15_g25_loose_L1EM15',
-]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py
index fd2b32de69acb8bd2377b2c860b545c56c866f19..1dccd7f1c1a469c69f7639d950bb7e9cac69eede 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/share/JETM11.py
@@ -24,7 +24,6 @@ JETM11Stream.AcceptAlgs(['JETM11Kernel'])
#======================================================================================================================
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__xAODStringSkimmingTool
from DerivationFrameworkTools.DerivationFrameworkToolsConf import DerivationFramework__TriggerSkimmingTool
-# cutExpression = "(count(Electrons.DFCommonElectronsLHLoose && Electrons.DFCommonElectrons_pt > (20 * GeV) && abs(Electrons.DFCommonElectrons_eta) < 2.47) + count(Muons.DFCommonMuonsPreselection && Muons.pt > (20*GeV) && abs(Muon.eta) < 2.47) ) >= 1"
singleElTriggers = TriggerLists.single_el_Trig()
singleMuTriggers = TriggerLists.single_mu_Trig()
cutExpression = "(count(Electrons.DFCommonElectronsLHLoose && Electrons.pt > (24 * GeV) && abs(Electrons.eta) < 2.47) + count(Muons.DFCommonMuonsPreselection && Muons.pt > (24*GeV) && abs(Muons.eta) < 2.47) ) >= 1"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx
index 7eadb5433a9da527a16cd4b3851fe500dd6ed8ae..dba95878b6dfac5f9acd1d202a1e04cc57b32c11 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -10,6 +10,7 @@
#include "JetAugmentationTool.h"
#include "xAODCore/ShallowCopy.h"
+#include "StoreGate/WriteDecorHandle.h"
namespace DerivationFramework {
@@ -63,28 +64,38 @@ namespace DerivationFramework {
m_docalib = true;
- m_dec_calibpt = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+m_calibMomentKey+"_pt");
- m_dec_calibeta = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+m_calibMomentKey+"_eta");
- m_dec_calibphi = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+m_calibMomentKey+"_phi");
- m_dec_calibm = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+m_calibMomentKey+"_m");
+ m_calibpt_key = m_containerName + "." + m_momentPrefix + m_calibMomentKey + "_pt";
+ m_calibeta_key = m_containerName + "." + m_momentPrefix + m_calibMomentKey + "_eta";
+ m_calibphi_key = m_containerName + "." + m_momentPrefix + m_calibMomentKey + "_phi";
+ m_calibm_key = m_containerName + "." + m_momentPrefix + m_calibMomentKey + "_m";
+
+ ATH_CHECK(m_calibpt_key.initialize());
+ ATH_CHECK(m_calibeta_key.initialize());
+ ATH_CHECK(m_calibphi_key.initialize());
+ ATH_CHECK(m_calibm_key.initialize());
if(!m_jvtTool.empty()) {
CHECK(m_jvtTool.retrieve());
ATH_MSG_INFO("Augmenting jets with updated JVT \"" << m_momentPrefix+m_jvtMomentKey << "\"");
m_dojvt = true;
- m_dec_jvt = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+m_jvtMomentKey);
- m_dec_passJvt = std::make_unique< SG::AuxElement::Decorator<char> >(m_momentPrefix+"pass"+m_jvtMomentKey);
+ m_jvt_key = m_containerName + "." + m_momentPrefix + m_jvtMomentKey;
+ m_passJvt_key = m_containerName + "." + m_momentPrefix + "pass" + m_jvtMomentKey;
+
+ ATH_CHECK(m_jvt_key.initialize());
+ ATH_CHECK(m_passJvt_key.initialize());
if(!m_btagSelTools.empty()) {
size_t ibtag(0);
for(const auto& tool : m_btagSelTools) {
CHECK(tool.retrieve());
ATH_MSG_INFO("Augmenting jets with B-tag working point \"" << m_momentPrefix+m_btagWP[ibtag] << "\"");
- m_dec_btag.push_back(new SG::AuxElement::Decorator<float>(m_momentPrefix+m_btagWP[ibtag]));
+ m_dec_btag_keys.emplace_back( m_containerName + "." + m_momentPrefix+m_btagWP[ibtag] );
m_dobtag = true;
++ibtag;
}
+
+ ATH_CHECK(m_dec_btag_keys.initialize());
}
}
}
@@ -98,8 +109,14 @@ namespace DerivationFramework {
CHECK(m_jetTrackSumMomentsTool.retrieve());
ATH_MSG_INFO("Augmenting jets with track sum moments \"" << m_momentPrefix << "TrackSumMass,Pt\"");
m_decoratetracksum = true;
- m_dec_tracksummass = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+"TrackSumMass");
- m_dec_tracksumpt = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix+"TrackSumPt");
+ m_acc_tracksummass = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_momentPrefix+"TrackSumMass");
+ m_acc_tracksumpt = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_momentPrefix+"TrackSumPt");
+
+ m_tracksummass_key = m_containerName + "." + m_momentPrefix+"TrackSumMass";
+ m_tracksumpt_key = m_containerName + "." + m_momentPrefix+"TrackSumPt";
+
+ ATH_CHECK(m_tracksummass_key.initialize());
+ ATH_CHECK(m_tracksumpt_key.initialize());
}
// This tool creates the GhostTruthAssociation decorations recommended for truth matching //
@@ -107,8 +124,15 @@ namespace DerivationFramework {
CHECK(m_jetPtAssociationTool.retrieve());
ATH_MSG_INFO("Augmenting jets with GhostTruthAssociation moments Link and Fraction");
m_decorateptassociation = true;
- m_dec_GhostTruthAssociationFraction = std::make_unique< SG::AuxElement::Decorator<float> >("GhostTruthAssociationFraction");
- m_dec_GhostTruthAssociationLink = std::make_unique< SG::AuxElement::Decorator< ElementLink<xAOD::JetContainer> > >("GhostTruthAssociationLink");
+ m_acc_GhostTruthAssociationFraction = std::make_unique< SG::AuxElement::ConstAccessor<float> >("GhostTruthAssociationFraction");
+ m_acc_GhostTruthAssociationLink = std::make_unique< SG::AuxElement::ConstAccessor< ElementLink<xAOD::JetContainer> > >("GhostTruthAssociationLink");
+
+ m_GhostTruthAssociationFraction_key = m_containerName + ".GhostTruthAssociationFraction";
+ m_GhostTruthAssociationLink_key = m_containerName + ".GhostTruthAssociationLink";
+
+ ATH_CHECK(m_GhostTruthAssociationFraction_key.initialize());
+ ATH_CHECK(m_GhostTruthAssociationLink_key.initialize());
+
}
if(!m_trkSelectionTool.empty()) {
@@ -119,12 +143,28 @@ namespace DerivationFramework {
if(!m_qgTool.empty()){
CHECK(m_qgTool.retrieve());
m_decorateQGVariables = true;
- m_dec_AssociatedNTracks = std::make_unique< SG::AuxElement::Decorator<int> >(m_momentPrefix + "QGTagger_NTracks");
- m_dec_AssociatedTracksWidth = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix + "QGTagger_TracksWidth");
- m_dec_AssociatedTracksC1 = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix + "QGTagger_TracksC1");
- m_dec_Associated_truthjet_nCharged = std::make_unique< SG::AuxElement::Decorator<int> >(m_momentPrefix + "QGTagger_truthjet_nCharged");
- m_dec_Associated_truthjet_pt = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix + "QGTagger_truthjet_pt");
- m_dec_Associated_truthjet_eta = std::make_unique< SG::AuxElement::Decorator<float> >(m_momentPrefix + "QGTagger_truthjet_eta");
+
+ m_acc_AssociatedNTracks = std::make_unique< SG::AuxElement::ConstAccessor<int> >(m_momentPrefix + "QGTagger_NTracks");
+ m_acc_AssociatedTracksWidth = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_momentPrefix + "QGTagger_TracksWidth");
+ m_acc_AssociatedTracksC1 = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_momentPrefix + "QGTagger_TracksC1");
+ m_acc_Associated_truthjet_nCharged = std::make_unique< SG::AuxElement::ConstAccessor<int> >(m_momentPrefix + "QGTagger_truthjet_nCharged");
+ m_acc_Associated_truthjet_pt = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_momentPrefix + "QGTagger_truthjet_pt");
+ m_acc_Associated_truthjet_eta = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_momentPrefix + "QGTagger_truthjet_eta");
+
+ m_associatedNTracks_key = m_containerName + "." + m_momentPrefix + "QGTagger_NTracks";
+ m_associatedTracksWidth_key = m_containerName + "." + m_momentPrefix + "QGTagger_TracksWidth";
+ m_associatedTracksC1_key =m_containerName + "." + m_momentPrefix + "QGTagger_TracksC1";
+ m_associated_truthjet_nCharged_key =m_containerName + "." + m_momentPrefix + "QGTagger_truthjet_nCharged";
+ m_associated_truthjet_pt_key =m_containerName + "." + m_momentPrefix + "QGTagger_truthjet_pt";
+ m_associated_truthjet_eta_key =m_containerName + "." + m_momentPrefix + "QGTagger_truthjet_eta";
+
+ ATH_CHECK(m_associatedNTracks_key.initialize());
+ ATH_CHECK(m_associatedTracksWidth_key.initialize());
+ ATH_CHECK(m_associatedTracksC1_key.initialize());
+ ATH_CHECK(m_associated_truthjet_nCharged_key.initialize());
+ ATH_CHECK(m_associated_truthjet_pt_key.initialize());
+ ATH_CHECK(m_associated_truthjet_eta_key.initialize());
+
}
}
}
@@ -134,13 +174,30 @@ namespace DerivationFramework {
ATH_MSG_INFO("Augmenting jets with truthlabeling");
m_decoratetruthlabel = true;
m_truthLabelName = m_jetTruthLabelingTool->getLargeRJetTruthLabelName();
- m_dec_Label = std::make_unique< SG::AuxElement::Decorator<int> >(m_truthLabelName);
- m_dec_dRW = std::make_unique< SG::AuxElement::Decorator<float> >(m_truthLabelName+"_dR_W");
- m_dec_dRZ = std::make_unique< SG::AuxElement::Decorator<float> >(m_truthLabelName+"_dR_Z");
- m_dec_dRTop = std::make_unique< SG::AuxElement::Decorator<float> >(m_truthLabelName+"_dR_Top");
- m_dec_dRH = std::make_unique< SG::AuxElement::Decorator<float> >(m_truthLabelName+"_dR_H");
- m_dec_NB = std::make_unique< SG::AuxElement::Decorator<int> >(m_truthLabelName+"_NB");
- m_dec_TruthJetMass = std::make_unique< SG::AuxElement::Decorator<float> >(m_truthLabelName+"_TruthJetMass");
+
+ m_acc_label = std::make_unique< SG::AuxElement::ConstAccessor<int> >(m_truthLabelName);
+ m_acc_dRW = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_truthLabelName+"_dR_W");
+ m_acc_dRZ = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_truthLabelName+"_dR_Z");
+ m_acc_dRTop = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_truthLabelName+"_dR_Top");
+ m_acc_dRH = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_truthLabelName+"_dR_H");
+ m_acc_NB = std::make_unique< SG::AuxElement::ConstAccessor<int> >(m_truthLabelName+"_NB");
+ m_acc_truthJetMass = std::make_unique< SG::AuxElement::ConstAccessor<float> >(m_truthLabelName+"_TruthJetMass");
+
+ m_truthLabel_key = m_containerName + "." + m_truthLabelName;
+ m_truthLabel_dRW_key = m_containerName + "." + m_truthLabelName+"_dR_W";
+ m_truthLabel_dRZ_key = m_containerName + "." + m_truthLabelName+"_dR_Z";
+ m_truthLabel_dRH_key = m_containerName + "." + m_truthLabelName+"_dR_H";
+ m_truthLabel_dRTop_key = m_containerName + "." + m_truthLabelName+"_dR_Top";
+ m_truthLabel_NB_key = m_containerName + "." + m_truthLabelName+"_NB";
+ m_truthLabel_truthJetMass_key = m_containerName + "." + m_truthLabelName+"_TruthJetMass";
+
+ ATH_CHECK(m_truthLabel_key.initialize());
+ ATH_CHECK(m_truthLabel_dRW_key.initialize());
+ ATH_CHECK(m_truthLabel_dRZ_key.initialize());
+ ATH_CHECK(m_truthLabel_dRH_key.initialize());
+ ATH_CHECK(m_truthLabel_dRTop_key.initialize());
+ ATH_CHECK(m_truthLabel_NB_key.initialize());
+ ATH_CHECK(m_truthLabel_truthJetMass_key.initialize());
}
return StatusCode::SUCCESS;
@@ -149,10 +206,6 @@ namespace DerivationFramework {
StatusCode JetAugmentationTool::finalize()
{
- if(m_dobtag) {
- for(const auto& pdec : m_dec_btag) delete pdec;
- }
-
return StatusCode::SUCCESS;
}
@@ -188,7 +241,7 @@ namespace DerivationFramework {
// Check if GhostTruthAssociation decorations already exist for first jet, and if so skip them
bool isMissingPtAssociation = true;
- if( !m_decorateptassociation || jets_copy->size() == 0 || m_dec_GhostTruthAssociationFraction->isAvailable(*jets_copy->at(0)) ) {
+ if( !m_decorateptassociation || jets_copy->size() == 0 || m_acc_GhostTruthAssociationFraction->isAvailable(*jets_copy->at(0)) ) {
isMissingPtAssociation = false;
}
@@ -223,28 +276,38 @@ namespace DerivationFramework {
if(m_docalib) {
+ SG::WriteDecorHandle<xAOD::JetContainer, float> calibpt_handle(m_calibpt_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> calibeta_handle(m_calibeta_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> calibphi_handle(m_calibphi_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> calibm_handle(m_calibm_key);
+
// generate static decorators to avoid multiple lookups
- (*m_dec_calibpt)(jet_orig) = jet->pt();
- (*m_dec_calibeta)(jet_orig) = jet->eta();
- (*m_dec_calibphi)(jet_orig) = jet->phi();
- (*m_dec_calibm)(jet_orig) = jet->m();
+ calibpt_handle(jet_orig) = jet->pt();
+ calibeta_handle(jet_orig) = jet->eta();
+ calibphi_handle(jet_orig) = jet->phi();
+ calibm_handle(jet_orig) = jet->m();
- ATH_MSG_VERBOSE("Calibrated jet pt: " << (*m_dec_calibpt)(jet_orig) );
+ ATH_MSG_VERBOSE("Calibrated jet pt: " << jet->pt() );
if(m_dojvt) {
- (*m_dec_jvt)(jet_orig) = m_jvtTool->updateJvt(*jet);
- ATH_MSG_VERBOSE("Calibrated JVT: " << (*m_dec_jvt)(jet_orig) );
-
- bool passJVT_tool = m_jetJvtEfficiencyTool->passesJvtCut(jet_orig);
- (*m_dec_passJvt)(jet_orig) = passJVT_tool;
+ SG::WriteDecorHandle<xAOD::JetContainer, float> jvt_handle(m_jvt_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, char> passJvt_handle(m_passJvt_key);
+ float jvt_value = m_jvtTool->updateJvt(*jet);
+ jvt_handle(jet_orig)= jvt_value;
+ ATH_MSG_VERBOSE("Calibrated JVT: " << jvt_value);
+
+ bool passJVT = m_jetJvtEfficiencyTool->passesJvtCut(jet_orig);
+ passJvt_handle(jet_orig) = passJVT;
+
if(m_dobtag) {
- bool passJVT = jet->pt()>50e3 || fabs(jet->eta())>2.4 || (*m_dec_jvt)(jet_orig)>0.64;
size_t ibtag(0);
for(const auto& tool : m_btagSelTools) {
- (*m_dec_btag[ibtag])(jet_orig) = jet->pt()>20e3 && fabs(jet->eta())<2.5 && passJVT && tool->accept(*jet);
- ATH_MSG_VERBOSE("Btag working point \"" << m_btagWP[ibtag] << "\" " << ((*m_dec_btag[ibtag])(jet_orig) ? "passed." : "failed."));
+ SG::WriteDecorHandle<xAOD::JetContainer, char> dec_btag_handle(m_dec_btag_keys.at(ibtag));
+ bool passWP = std::abs(jet->eta()) < 2.7 && passJVT && tool->accept(*jet);
+ dec_btag_handle(jet_orig) = passWP;
+ ATH_MSG_VERBOSE("Btag working point \"" << m_btagWP[ibtag] << "\" " << (passWP ? "passed." : "failed."));
++ibtag;
}
}
@@ -252,42 +315,68 @@ namespace DerivationFramework {
}
if(m_decoratetracksum) {
- (*m_dec_tracksummass)(jet_orig) = jet->getAttribute<float>("TrackSumMass");
- (*m_dec_tracksumpt)(jet_orig) = jet->getAttribute<float>("TrackSumPt");
- ATH_MSG_VERBOSE("TrackSumMass: " << (*m_dec_tracksummass)(jet_orig) );
- ATH_MSG_VERBOSE("TrackSumPt: " << (*m_dec_tracksummass)(jet_orig) );
+ SG::WriteDecorHandle<xAOD::JetContainer, float> tracksummass_handle(m_tracksummass_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> tracksumpt_handle(m_tracksumpt_key);
+
+ tracksummass_handle(jet_orig) = (*m_acc_tracksummass)(*jet);
+ tracksumpt_handle(jet_orig) = (*m_acc_tracksumpt)(*jet);
+
+ ATH_MSG_VERBOSE("TrackSumMass: " << (*m_acc_tracksummass)(jet_orig) );
+ ATH_MSG_VERBOSE("TrackSumPt: " << (*m_acc_tracksummass)(jet_orig) );
}
if(m_decorateptassociation && isMissingPtAssociation){
- if(m_dec_GhostTruthAssociationFraction->isAvailable(*jet)){
- (*m_dec_GhostTruthAssociationFraction)(jet_orig) = jet->getAttribute<float>("GhostTruthAssociationFraction");
- ATH_MSG_VERBOSE("GhostTruthAssociationFraction: " << (*m_dec_GhostTruthAssociationFraction)(jet_orig) );
+
+ SG::WriteDecorHandle<xAOD::JetContainer, float> ghostTruthAssocFrac_handle(m_GhostTruthAssociationFraction_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, ElementLink<xAOD::JetContainer> > ghostTruthAssocLink_handle(m_GhostTruthAssociationLink_key);
+
+ if(m_acc_GhostTruthAssociationFraction->isAvailable(*jet)){
+ ghostTruthAssocFrac_handle(jet_orig) = (*m_acc_GhostTruthAssociationFraction)(*jet);
+ ATH_MSG_INFO("GhostTruthAssociationFraction: " << (*m_acc_GhostTruthAssociationFraction)(jet_orig) );
}
- if(m_dec_GhostTruthAssociationLink->isAvailable(*jet)){
- (*m_dec_GhostTruthAssociationLink)(jet_orig) = jet->getAttribute< ElementLink<xAOD::JetContainer> >("GhostTruthAssociationLink");
- ATH_MSG_VERBOSE("GhostTruthAssociationLink: " << (*m_dec_GhostTruthAssociationLink)(jet_orig) );
+ if(m_acc_GhostTruthAssociationLink->isAvailable(*jet)){
+ ghostTruthAssocLink_handle(jet_orig) = (*m_acc_GhostTruthAssociationLink)(*jet);
+ ATH_MSG_INFO("GhostTruthAssociationLink: " << (*m_acc_GhostTruthAssociationLink)(jet_orig) );
}
}
if(m_decoratetruthlabel){
- if(m_dec_Label->isAvailable(*jet)) (*m_dec_Label)(jet_orig) = (*m_dec_Label)(*jet);
- if(m_dec_dRW->isAvailable(*jet)) (*m_dec_dRW)(jet_orig) = (*m_dec_dRW)(*jet);
- if(m_dec_dRZ->isAvailable(*jet)) (*m_dec_dRZ)(jet_orig) = (*m_dec_dRZ)(*jet);
- if(m_dec_dRTop->isAvailable(*jet)) (*m_dec_dRTop)(jet_orig) = (*m_dec_dRTop)(*jet);
- if(m_dec_dRH->isAvailable(*jet)) (*m_dec_dRH)(jet_orig) = (*m_dec_dRH)(*jet);
- if(m_dec_NB->isAvailable(*jet)) (*m_dec_NB)(jet_orig) = (*m_dec_NB)(*jet);
- if(m_dec_TruthJetMass->isAvailable(*jet)) (*m_dec_TruthJetMass)(jet_orig) = (*m_dec_TruthJetMass)(*jet);
+
+ SG::WriteDecorHandle<xAOD::JetContainer, float> truthLabel_dRW_handle(m_truthLabel_dRW_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, int> truthLabel_handle(m_truthLabel_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> truthLabel_dRZ_handle(m_truthLabel_dRZ_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> truthLabel_dRH_handle(m_truthLabel_dRH_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> truthLabel_dRTop_handle(m_truthLabel_dRTop_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, int> truthLabel_NB_handle(m_truthLabel_NB_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> truthLabel_truthJetMass_handle(m_truthLabel_truthJetMass_key);
+
+ if(m_acc_label->isAvailable(*jet)) truthLabel_handle(jet_orig) = (*m_acc_label)(*jet);
+ if(m_acc_dRW->isAvailable(*jet)) truthLabel_dRW_handle(jet_orig) = (*m_acc_dRW)(*jet);
+ if(m_acc_dRZ->isAvailable(*jet)) truthLabel_dRZ_handle(jet_orig) = (*m_acc_dRZ)(*jet);
+ if(m_acc_dRH->isAvailable(*jet)) truthLabel_dRH_handle(jet_orig) = (*m_acc_dRH)(*jet);
+ if(m_acc_dRTop->isAvailable(*jet)) truthLabel_dRTop_handle(jet_orig) = (*m_acc_dRTop)(*jet);
+ if(m_acc_NB->isAvailable(*jet)) truthLabel_NB_handle(jet_orig) = (*m_acc_NB)(*jet);
+ if(m_acc_truthJetMass->isAvailable(*jet)) truthLabel_truthJetMass_handle(jet_orig) = (*m_acc_truthJetMass)(*jet);
+
}
if(m_decorateQGVariables){
- if(m_dec_AssociatedNTracks->isAvailable(*jet)) (*m_dec_AssociatedNTracks)(jet_orig) = (*m_dec_AssociatedNTracks)(*jet);
- if(m_dec_AssociatedTracksWidth->isAvailable(*jet)) (*m_dec_AssociatedTracksWidth)(jet_orig) = (*m_dec_AssociatedTracksWidth)(*jet);
- if(m_dec_AssociatedTracksC1->isAvailable(*jet)) (*m_dec_AssociatedTracksC1)(jet_orig) = (*m_dec_AssociatedTracksC1)(*jet);
- if(m_dec_Associated_truthjet_nCharged->isAvailable(*jet)) (*m_dec_Associated_truthjet_nCharged)(jet_orig) = (*m_dec_Associated_truthjet_nCharged)(*jet);
- if(m_dec_Associated_truthjet_pt->isAvailable(*jet)) (*m_dec_Associated_truthjet_pt)(jet_orig) = (*m_dec_Associated_truthjet_pt)(*jet);
- if(m_dec_Associated_truthjet_eta->isAvailable(*jet)) (*m_dec_Associated_truthjet_eta)(jet_orig) = (*m_dec_Associated_truthjet_eta)(*jet);
- }
+ SG::WriteDecorHandle<xAOD::JetContainer, int> associatedNTracks_handle(m_associatedNTracks_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> associatedTracksWidth_handle(m_associatedTracksWidth_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> associatedTracksC1_handle(m_associatedTracksC1_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, int> associated_truthjet_nCharged_handle(m_associated_truthjet_nCharged_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> associated_truthjet_pt_handle(m_associated_truthjet_pt_key);
+ SG::WriteDecorHandle<xAOD::JetContainer, float> associated_truthjet_eta_handle(m_associated_truthjet_eta_key);
+
+ if(m_acc_AssociatedNTracks->isAvailable(*jet)) associatedNTracks_handle(jet_orig) = (*m_acc_AssociatedNTracks)(*jet);
+ if(m_acc_AssociatedTracksWidth->isAvailable(*jet)) associatedTracksWidth_handle(jet_orig) = (*m_acc_AssociatedTracksWidth)(*jet);
+ if(m_acc_AssociatedTracksC1->isAvailable(*jet)) associatedTracksC1_handle(jet_orig) = (*m_acc_AssociatedTracksC1)(*jet);
+ if(m_acc_Associated_truthjet_nCharged->isAvailable(*jet)) associated_truthjet_nCharged_handle(jet_orig) = (*m_acc_Associated_truthjet_nCharged)(*jet);
+ if(m_acc_Associated_truthjet_pt->isAvailable(*jet)) associated_truthjet_pt_handle(jet_orig) = (*m_acc_Associated_truthjet_pt)(*jet);
+ if(m_acc_Associated_truthjet_eta->isAvailable(*jet)) associated_truthjet_eta_handle(jet_orig) = (*m_acc_Associated_truthjet_eta)(*jet);
+ }
+
}
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h
index f4bc5557f3e873273aad89cea9d48e913e763100..9363efa601c402bd1d846b771ea68e48277aaa19 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h
@@ -16,6 +16,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/WriteDecorHandleKeyArray.h"
#include "JetInterface/IJetModifier.h"
#include "JetInterface/IJetUpdateJvt.h"
@@ -45,70 +46,88 @@ namespace DerivationFramework {
//
// implement augmentations explicitly to avoid need to parse lists of moments to copy
//
- // calibration
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_calibpt;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_calibeta;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_calibphi;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_calibm;
+ // calibration
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_calibpt_key {this, "CalibPtKey", "", "Decoration for calibrated jet pt"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_calibeta_key {this, "CalibEtaKey", "", "Decoration for calibrated jet eta"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_calibphi_key {this, "CalibPhiKey", "", "Decoration for calibrated jet phi"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_calibm_key {this, "CalibMKey", "", "Decoration for calibrated jet mass"};
ToolHandle<IJetModifier> m_jetCalibTool;
std::string m_calibMomentKey;
bool m_docalib;
// JVT
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_jvt;
- std::unique_ptr< SG::AuxElement::Decorator<char> > m_dec_passJvt;
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_jvt_key {this, "JVTKey", "", "Decoration for JVT"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_passJvt_key {this, "passJVTKey", "", "Decoration for boolean containing JVT decision"};
ToolHandle<IJetUpdateJvt> m_jvtTool;
ToolHandle<CP::IJetJvtEfficiency> m_jetJvtEfficiencyTool;
std::string m_jvtMomentKey;
bool m_dojvt;
//PFlow fJVT
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_fjvt;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_fjvt;
std::string m_fjvtMomentKey;
// b-tagging @author tripiana@cern.ch
- std::vector<SG::AuxElement::Decorator<float>*> m_dec_btag;
std::vector<std::string> m_btagWP;
bool m_dobtag;
/// Athena configured tools
ToolHandleArray<IBTaggingSelectionTool> m_btagSelTools;
+ SG::WriteDecorHandleKeyArray<xAOD::JetContainer> m_dec_btag_keys{this, "BtagDecKeys", {}, "SG keys for b-tagging WP decisions"};
//TrackSumMass and TrackSumPt for calo-jets built in Tier-0
//@author: nurfikri.bin.norjoharuddeen@cern.ch
ToolHandle<IJetModifier> m_jetTrackSumMomentsTool;
bool m_decoratetracksum;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_tracksummass;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_tracksumpt;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_tracksummass;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_tracksumpt;
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_tracksummass_key {this,"TrackSumMassKey", "", "Decoration for mass calculated from associated tracks"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_tracksumpt_key {this,"TrackSumPtKey", "","Decoration for pt calculated from associated tracks"};
// GhostTruthAssociation for derivations, @author jeff.dandoy@cern.ch
ToolHandle<IJetModifier> m_jetPtAssociationTool;
bool m_decorateptassociation;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_GhostTruthAssociationFraction;
- std::unique_ptr< SG::AuxElement::Decorator< ElementLink<xAOD::JetContainer> > > m_dec_GhostTruthAssociationLink;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_GhostTruthAssociationFraction;
+ std::unique_ptr< SG::AuxElement::ConstAccessor< ElementLink<xAOD::JetContainer> > > m_acc_GhostTruthAssociationLink;
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_GhostTruthAssociationFraction_key {this,"GhostTruthAssocFracKey", "", "Decoration for fraction of ghost-associated truth pt to reco jet"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_GhostTruthAssociationLink_key {this, "GhostTruthAssocLinkKey", "", "Decoration for links of ghost-associated truth particles"};
// Ntracks for QGTaggerTool ---
ToolHandle<InDet::IInDetTrackSelectionTool> m_trkSelectionTool;
ToolHandle<CP::ITrackVertexAssociationTool> m_trkVtxAssociationTool;
ToolHandle<IJetDecorator> m_qgTool;
bool m_decorateQGVariables;
- std::unique_ptr< SG::AuxElement::Decorator<int> > m_dec_AssociatedNTracks;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_AssociatedTracksWidth;
- std::unique_ptr< SG::AuxElement::Decorator<float> >m_dec_AssociatedTracksC1;
- std::unique_ptr< SG::AuxElement::Decorator<int> > m_dec_Associated_truthjet_nCharged;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_Associated_truthjet_pt;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_Associated_truthjet_eta;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<int> > m_acc_AssociatedNTracks;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_AssociatedTracksWidth;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> >m_acc_AssociatedTracksC1;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<int> > m_acc_Associated_truthjet_nCharged;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_Associated_truthjet_pt;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_Associated_truthjet_eta;
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_associatedNTracks_key {this, "associatedNTracksKey", "", "Decoration for number of ghost-associated tracks"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_associatedTracksWidth_key {this, "associatedTracksWidthKey", "", "Decoration for track width"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_associatedTracksC1_key {this, "associatedTracksC1Key", "", "Decoration for track C1"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_associated_truthjet_nCharged_key {this, "associatedTruthNChargedKey", "", "Decoration for charged truth particles"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_associated_truthjet_pt_key {this, "associatedTruthJetPtKey", "", "Decoration for associated truth jet pT"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_associated_truthjet_eta_key {this, "associatedTruthJetEtaKey", "", "Decoration for associated truth jet eta "};
//// Large-R jet truth labeling @author jveatch@cern.ch and tnobe@cern.ch
ToolHandle<JetTruthLabelingTool> m_jetTruthLabelingTool;
bool m_decoratetruthlabel;
- std::unique_ptr< SG::AuxElement::Decorator<int> > m_dec_Label;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_dRW;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_dRZ;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_dRH;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_dRTop;
- std::unique_ptr< SG::AuxElement::Decorator<int> > m_dec_NB;
- std::unique_ptr< SG::AuxElement::Decorator<float> > m_dec_TruthJetMass;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<int> > m_acc_label;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_dRW;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_dRZ;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_dRH;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_dRTop;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<int> > m_acc_NB;
+ std::unique_ptr< SG::AuxElement::ConstAccessor<float> > m_acc_truthJetMass;
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_key {this,"truthLabelKey", "", "Decoration for large-R truth label"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_dRW_key {this, "truthLabeldRWKey", "", "Decoration for dR between large-R jet and W boson"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_dRZ_key {this, "truthLabeldRZKey", "", "Decoration for dR between large-R jet and Z boson"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_dRH_key {this, "truthLabeldRHKey", "", "Decoration for dR between large-R jet and H boson"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_dRTop_key {this, "truthLabeldRTopKey", "", "Decoration for dR between large-R jet and top quark"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_NB_key {this, "truthLabeldRNBKey", "", "Decoration for number of ghost-associated b-hadrons"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_truthLabel_truthJetMass_key {this, "truthLabelJetMassKey", "", "Decoration for matched truth-jet mass"};
+
std::string m_truthLabelName;
};
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.cxx
index 171ebace5cbf14076f037dda5d660f41bd1bc516..bc8a09145789c9160e9b3716e4e0d36ea6668c66 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.cxx
@@ -1,10 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// JetExternalAssocTool.cxx
#include "JetExternalAssocTool.h"
+#include "StoreGate/WriteDecorHandle.h"
namespace DerivationFramework{
@@ -48,19 +49,16 @@ StatusCode JetExternalAssocTool::initialize() {
// setup vector of decorator
for(auto NewLinkName : m_VectorOfNewLinkNames){
- auto decorator = new SG::AuxElement::Decorator<type_ghostlink>(m_momentPrefix + NewLinkName);
- m_VectorOfDecors.push_back(decorator);
+ m_dec_keys.emplace_back( m_containerName + "." + m_momentPrefix + NewLinkName);
}
+ ATH_CHECK(m_dec_keys.initialize());
+
return StatusCode::SUCCESS;
}
StatusCode JetExternalAssocTool::finalize(){
- for(auto decorator : m_VectorOfDecors){
- delete decorator;
- }
-
return StatusCode::SUCCESS;
}
@@ -181,7 +179,9 @@ bool JetExternalAssocTool::TransferLink(const xAOD::Jet& jet, const xAOD::Jet& j
targetLinks.push_back(el_obj);
}
- (*(m_VectorOfDecors[index_link]))(jet) = targetLinks;
+ SG::WriteDecorHandle<xAOD::JetContainer, type_ghostlink*> dec_handle(m_dec_keys.at(index_link));
+ *dec_handle(jet) = targetLinks;
+
}
return true;
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.h
index 8dbe2a047a22442ffbc71504c37d9ac6270b893f..72bb7ceceb20af3b937ab65e306108713ef06caa 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetExternalAssocTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// JetExternalAssocTool.h
@@ -17,6 +17,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
#include "GaudiKernel/ToolHandle.h"
+#include "StoreGate/WriteDecorHandleKeyArray.h"
#include "xAODJet/JetContainer.h"
@@ -54,10 +55,9 @@ namespace DerivationFramework{
typedef ElementLink<xAOD::IParticleContainer> type_el;
typedef std::vector<type_el> type_ghostlink;
- std::vector<SG::AuxElement::Decorator<type_ghostlink>* > m_VectorOfDecors;
+ SG::WriteDecorHandleKeyArray<xAOD::JetContainer> m_dec_keys{this, "DecKeys", {}, "SG keys for external decorations"};
};
}
-
#endif
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.cxx
index 8793166274dfad6f83daf2376634205c1f73467c..8703b7a56ec1a02076025e6fcc071befa73ff6d5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.cxx
@@ -4,6 +4,7 @@
#include "TVAAugmentationTool.h"
#include "xAODTracking/TrackParticleContainer.h"
+#include "StoreGate/WriteDecorHandle.h"
namespace DerivationFramework {
@@ -25,12 +26,17 @@ namespace DerivationFramework {
ATH_MSG_INFO("Initialising TVAAugmentationTool " << name() );
ATH_CHECK( m_tool.retrieve() );
- m_vtxDec = std::make_unique<SG::AuxElement::Decorator<vtxLink_t>>(m_linkName);
+ m_vtxDec_key = m_trackName + "." + m_linkName;
+ ATH_CHECK(m_vtxDec_key.initialize());
+
return StatusCode::SUCCESS;
}
StatusCode TVAAugmentationTool::addBranches() const
{
+
+ SG::WriteDecorHandle<xAOD::TrackParticleContainer, vtxLink_t> vtxDec_handle(m_vtxDec_key);
+
const xAOD::VertexContainer* vertices = nullptr;
ATH_CHECK(evtStore()->retrieve(vertices, m_vertexName) );
const xAOD::TrackParticleContainer* tracks = nullptr;
@@ -40,7 +46,7 @@ namespace DerivationFramework {
for (const xAOD::Vertex* ivtx : *vertices)
for (const xAOD::TrackParticle* itrk : matchMap[ivtx])
- (*m_vtxDec)(*itrk).toContainedElement(*vertices, ivtx);
+ vtxDec_handle(*itrk).toContainedElement(*vertices, ivtx);
return StatusCode::SUCCESS;
}
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.h
index 2b2680b5ca9d6e186e6cdabacf6eba507988f390..068fa1e7b233d1efe046c923d97c074f78798a4f 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/TVAAugmentationTool.h
@@ -29,7 +29,8 @@ namespace DerivationFramework {
ToolHandle<CP::ITrackVertexAssociationTool> m_tool;
// Internals
using vtxLink_t = ElementLink<xAOD::VertexContainer>;
- std::unique_ptr<SG::AuxElement::Decorator<vtxLink_t>> m_vtxDec;
+ SG::WriteDecorHandleKey<xAOD::TrackParticleContainer> m_vtxDec_key {this, "vtxDecKey", "", "Decoration for associated vertex"};
+
}; //> end class TVAAugmentationTool
} //> end namespace DerivationFramework
diff --git a/Reconstruction/Jet/JetRec/CMakeLists.txt b/Reconstruction/Jet/JetRec/CMakeLists.txt
index ff8000133ec7e963eb4fb241335fd8cf8e3845f4..de9b347d3eaac7243f31f733d8207a9bdc8c56a7 100644
--- a/Reconstruction/Jet/JetRec/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRec/CMakeLists.txt
@@ -51,12 +51,11 @@ find_package( GTest )
atlas_add_library( JetRecLib
JetRec/*.h Root/*.h Root/*.cxx
PUBLIC_HEADERS JetRec
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${FASTJETCONTRIB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJET_LIBRARIES} AthLinks AthContainers AsgTools
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJET_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES} AthLinks AthContainers AsgTools
xAODCaloEvent xAODJet xAODMuon EventShapeInterface JetEDM
JetInterface
- PRIVATE_LINK_LIBRARIES ${FASTJETCONTRIB_LIBRARIES} CxxUtils xAODBase xAODCore
+ PRIVATE_LINK_LIBRARIES CxxUtils xAODBase xAODCore
xAODEventInfo xAODTracking ${mon_lib})
if( NOT XAOD_STANDALONE )
diff --git a/Reconstruction/Jet/JetRec/JetRec/JetBottomUpSoftDrop.h b/Reconstruction/Jet/JetRec/JetRec/JetBottomUpSoftDrop.h
new file mode 100644
index 0000000000000000000000000000000000000000..7b6ea6297de6d7bd3f15b296fe3f0a668235f775
--- /dev/null
+++ b/Reconstruction/Jet/JetRec/JetRec/JetBottomUpSoftDrop.h
@@ -0,0 +1,65 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// JetBottomUpSoftDrop.h
+
+#ifndef JetBottomUpSoftDrop_H
+#define JetBottomUpSoftDrop_H
+
+// Jennifer Roloff & Joe Taenzer
+// October 2016
+//
+// Tool to groom jets with bottom up softdrop.
+// SoftDrop is described in this paper: arXiv:1402.2657
+// Bottom Up SoftDrop is described in this paper (under the name "Iterated SoftDrop": https://arxiv.org/pdf/1704.06266.pdf
+// See also: https://fastjet.hepforge.org/trac/browser/contrib/contribs/RecursiveTools/tags/2.0.0-beta1/BottomUpSoftDrop.hh
+
+#include "AsgTools/AsgTool.h"
+#include "JetInterface/IJetGroomer.h"
+#include "JetInterface/IJetFromPseudojet.h"
+#include "AsgTools/ToolHandle.h"
+
+#include "fastjet/ClusterSequence.hh"
+#include "fastjet/contrib/RecursiveSymmetryCutBase.hh"
+#include "fastjet/contrib/BottomUpSoftDrop.hh"
+
+class JetBottomUpSoftDrop
+: public asg::AsgTool,
+ virtual public IJetGroomer {
+ASG_TOOL_CLASS(JetBottomUpSoftDrop, IJetGroomer)
+
+public:
+
+ // Ctor.
+ JetBottomUpSoftDrop(std::string name);
+
+ // Dtor.
+ ~JetBottomUpSoftDrop();
+
+ // Initilization.
+ StatusCode initialize();
+
+ // Groom a jet and add result to a container.
+ int groom(const xAOD::Jet& jin,
+ const PseudoJetContainer&,
+ xAOD::JetContainer& jout) const;
+
+ // Dump to log.
+ void print() const;
+
+private: // data
+
+ // Job options.
+ // SoftDrop algorithm:
+ // z > zcut * (dR12/R0)^beta
+ // z = min(pT1, pT2)/(pT1+pT2)
+ // R0 = characteristic jet radius
+ float m_zcut; // pT fraction for retaining subjets
+ float m_beta; // How much to consider angular dependence
+ float m_R0; // Normalization of angular distance, usually the characteristic jet radius (default R0 = 1)
+ ToolHandle<IJetFromPseudojet> m_bld; // Tool to build jets.
+
+};
+
+#endif
diff --git a/Reconstruction/Jet/JetRec/JetRec/JetRecDict.h b/Reconstruction/Jet/JetRec/JetRec/JetRecDict.h
index ca7763e79c998f70df282baf189ff8387f198552..bf8f46fb3fb7a0f702085c5dd3f96ff41e0a8d8d 100644
--- a/Reconstruction/Jet/JetRec/JetRec/JetRecDict.h
+++ b/Reconstruction/Jet/JetRec/JetRec/JetRecDict.h
@@ -1,11 +1,12 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef JETREC_JETRECDICT_H
#define JETREC_JETRECDICT_H
#include "JetRec/FastJetInterfaceTool.h"
+#include "JetRec/JetBottomUpSoftDrop.h"
#include "JetRec/JetByVertexFinder.h"
#include "JetRec/JetConstitRemover.h"
#include "JetRec/JetConstituentsRetriever.h"
@@ -19,6 +20,8 @@
#include "JetRec/JetPseudojetRetriever.h"
#include "JetRec/JetReclusterer.h"
#include "JetRec/JetRecTool.h"
+#include "JetRec/JetRecursiveSoftDrop.h"
+#include "JetRec/JetSoftDrop.h"
#include "JetRec/JetSorter.h"
#include "JetRec/JetSplitter.h"
#include "JetRec/JetToolRunner.h"
diff --git a/Reconstruction/Jet/JetRec/JetRec/JetRecursiveSoftDrop.h b/Reconstruction/Jet/JetRec/JetRec/JetRecursiveSoftDrop.h
new file mode 100644
index 0000000000000000000000000000000000000000..06b3db2dc545fb951de7ef89790c0b02e38a6e83
--- /dev/null
+++ b/Reconstruction/Jet/JetRec/JetRec/JetRecursiveSoftDrop.h
@@ -0,0 +1,68 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// JetRecursiveSoftDrop.h
+
+#ifndef JetRecursiveSoftDrop_H
+#define JetRecursiveSoftDrop_H
+
+// Jennifer Roloff & Joe Taenzer
+// August 2017
+//
+// Tool to groom jets with recursive softdrop.
+// SoftDrop is described in this paper: arXiv:1402.2657
+// Recursive SoftDrop is described in this Boost2017 contribution: https://indico.cern.ch/event/579660/contributions/2582124/
+// See also: https://fastjet.hepforge.org/trac/browser/contrib/contribs/RecursiveTools/tags/2.0.0-beta1/RecursiveSoftDrop.hh
+
+#include "AsgTools/AsgTool.h"
+#include "JetInterface/IJetGroomer.h"
+#include "JetInterface/IJetFromPseudojet.h"
+#include "AsgTools/ToolHandle.h"
+
+#include "fastjet/ClusterSequence.hh"
+#include "fastjet/contrib/RecursiveSymmetryCutBase.hh"
+#include "fastjet/contrib/RecursiveSoftDrop.hh"
+
+class JetRecursiveSoftDrop
+: public asg::AsgTool,
+ virtual public IJetGroomer {
+ASG_TOOL_CLASS(JetRecursiveSoftDrop, IJetGroomer)
+
+public:
+
+ // Ctor.
+ JetRecursiveSoftDrop(std::string name);
+
+ // Dtor.
+ ~JetRecursiveSoftDrop();
+
+ // Initilization.
+ StatusCode initialize();
+
+ // Groom a jet and add result to a container.
+ int groom(const xAOD::Jet& jin,
+ const PseudoJetContainer&,
+ xAOD::JetContainer& jout) const;
+
+ // Dump to log.
+ void print() const;
+
+private: // data
+
+ // Job options.
+ // Recursive SoftDrop algorithm:
+ // z > zcut * (dR12/R0)^beta
+ // z = min(pT1, pT2)/(pT1+pT2)
+ // R0 = characteristic jet radius
+ // N : algorithm terminates after passing SoftDrop condition N times
+ // (Standard SoftDrop terminates after passing it once)
+ float m_zcut; // pT fraction for retaining subjets
+ float m_beta; // How much to consider angular dependence
+ int m_N; // Number of layers (-1 <> infinite)
+ float m_R0; // Normalization of angular distance, usually the characteristic jet radius (default R0 = 1)
+ ToolHandle<IJetFromPseudojet> m_bld; // Tool to build jets.
+
+};
+
+#endif
diff --git a/Reconstruction/Jet/JetRec/JetRec/JetSoftDrop.h b/Reconstruction/Jet/JetRec/JetRec/JetSoftDrop.h
index 728541d6bfcde3437e9263afcde72dc592a418af..2ed394f9ac1e364ce1438473c02a07d3e7844f30 100644
--- a/Reconstruction/Jet/JetRec/JetRec/JetSoftDrop.h
+++ b/Reconstruction/Jet/JetRec/JetRec/JetSoftDrop.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// JetSoftDrop.h
@@ -55,7 +55,8 @@ private: // data
// z = min(pT1, pT2)/(pT1+pT2)
// R0 = characteristic jet radius
float m_zcut; // pT fraction for retaining subjets
- float m_beta; //
+ float m_beta; // How much to consider angular dependence
+ float m_R0; // Normalization of angular distance, usually the characteristic jet radius (default R0 = 1)
ToolHandle<IJetFromPseudojet> m_bld; // Tool to build jets.
};
diff --git a/Reconstruction/Jet/JetRec/JetRec/selection.xml b/Reconstruction/Jet/JetRec/JetRec/selection.xml
index 4e1ed8885fe59b107285bce99e9c2e6b3f334e05..995fe720c77076f03f0f04675ca921e0c53f3610 100644
--- a/Reconstruction/Jet/JetRec/JetRec/selection.xml
+++ b/Reconstruction/Jet/JetRec/JetRec/selection.xml
@@ -1,5 +1,6 @@
<lcgdict>
<class name="FastJetInterfaceTool"/>
+<class name="JetBottomUpSoftDrop"/>
<class name="JetByVertexFinder"/>
<class name="JetConstitRemover"/>
<class name="JetConstituentsRetriever"/>
@@ -13,6 +14,8 @@
<class name="JetPseudojetRetriever"/>
<class name="JetReclusterer"/>
<class name="JetRecTool"/>
+<class name="JetRecursiveSoftDrop"/>
+<class name="JetSoftDrop"/>
<class name="JetSorter"/>
<class name="JetSplitter"/>
<class name="JetToolRunner"/>
diff --git a/Reconstruction/Jet/JetRec/Root/JetBottomUpSoftDrop.cxx b/Reconstruction/Jet/JetRec/Root/JetBottomUpSoftDrop.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aebea20a9b1a5afdba5133637a3b86c0800171ae
--- /dev/null
+++ b/Reconstruction/Jet/JetRec/Root/JetBottomUpSoftDrop.cxx
@@ -0,0 +1,107 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// JetBottomUpSoftDrop.cxx
+
+#include "JetRec/JetBottomUpSoftDrop.h"
+#include <iomanip>
+#include "fastjet/PseudoJet.hh"
+#include "fastjet/JetDefinition.hh"
+#include "fastjet/Selector.hh"
+#include "fastjet/tools/Filter.hh"
+#include "JetEDM/PseudoJetVector.h"
+
+
+using std::setw;
+using fastjet::PseudoJet;
+using xAOD::JetContainer;
+
+//**********************************************************************
+
+JetBottomUpSoftDrop::JetBottomUpSoftDrop(std::string name)
+ : AsgTool(name), m_bld("",this) {
+ declareProperty("ZCut", m_zcut =0.1);
+ declareProperty("Beta", m_beta =0.0);
+ declareProperty("R0", m_R0 =1.0);
+ declareProperty("JetBuilder", m_bld);
+}
+
+//**********************************************************************
+
+JetBottomUpSoftDrop::~JetBottomUpSoftDrop() {
+}
+
+//**********************************************************************
+
+StatusCode JetBottomUpSoftDrop::initialize() {
+ if ( m_zcut < 0.0 || m_zcut > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for ZCut " << m_zcut);
+ return StatusCode::FAILURE;
+ }
+ if ( m_beta < 0.0 || m_beta > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for Beta " << m_beta);
+ return StatusCode::FAILURE;
+ }
+ if ( m_R0 < 0.0 || m_R0 > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for R0 " << m_R0);
+ return StatusCode::FAILURE;
+ }
+ if ( m_bld.empty() ) {
+ ATH_MSG_ERROR("Unable to retrieve jet builder.");
+ return StatusCode::FAILURE;
+ }
+ return StatusCode::SUCCESS;
+}
+
+//**********************************************************************
+
+int JetBottomUpSoftDrop::groom(const xAOD::Jet& jin,
+ const PseudoJetContainer& pjContainer,
+ xAOD::JetContainer& jets) const {
+ if ( pseudojetRetriever() == nullptr ) {
+ ATH_MSG_WARNING("Pseudojet retriever is null.");
+ return 1;
+ }
+ const PseudoJet* ppjin = pseudojetRetriever()->pseudojet(jin);
+ if ( ppjin == 0 ) {
+ ATH_MSG_WARNING("Jet does not have a pseudojet.");
+ return 1;
+ }
+
+ ////////////////////////
+ //configure bottom up soft drop tool
+ //https://fastjet.hepforge.org/trac/browser/contrib/contribs/RecursiveTools/tags/2.0.0-beta1
+ ////////////////////////
+ fastjet::contrib::BottomUpSoftDrop softdropper(m_beta, m_zcut, m_R0);
+ PseudoJet pjsoftdrop = softdropper(*ppjin);
+ int npsoftdrop = pjsoftdrop.pieces().size();
+ xAOD::Jet* pjet = m_bld->add(pjsoftdrop, pjContainer, jets, &jin);
+
+ pjet->setAttribute<float>("ZCut", m_zcut);
+ pjet->setAttribute<float>("SoftDropBeta", m_beta);
+ pjet->setAttribute<float>("SoftDropR0", m_R0);
+ pjet->setAttribute<int>("NSoftDropSubjets", npsoftdrop);
+
+ ATH_MSG_DEBUG("Properties after softdrop:");
+ ATH_MSG_DEBUG(" ncon: " << pjsoftdrop.constituents().size() << "/"
+ << ppjin->constituents().size());
+ ATH_MSG_DEBUG(" nsub: " << npsoftdrop);
+ if ( pjet == 0 ) {
+ ATH_MSG_ERROR("Unable to add jet to container");
+ } else {
+ ATH_MSG_DEBUG("Added jet to container.");
+ }
+ return 0;
+}
+
+//**********************************************************************
+
+void JetBottomUpSoftDrop::print() const {
+ ATH_MSG_INFO(" Asymmetry measure min: " << m_zcut);
+ ATH_MSG_INFO(" Angular exponent: " << m_beta);
+ ATH_MSG_INFO(" Characteristic jet radius: " << m_R0);
+ ATH_MSG_INFO(" Jet builder: " << m_bld.name());
+}
+
+//**********************************************************************
diff --git a/Reconstruction/Jet/JetRec/Root/JetPruner.cxx b/Reconstruction/Jet/JetRec/Root/JetPruner.cxx
index 56d52dc99ccba4a9ecf94600bc2ed846fd507829..2a7f9cb13c43a2588f276dd612a3a8ff1139129d 100644
--- a/Reconstruction/Jet/JetRec/Root/JetPruner.cxx
+++ b/Reconstruction/Jet/JetRec/Root/JetPruner.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// JetPruner.cxx
@@ -78,8 +78,8 @@ int JetPruner::groom(const xAOD::Jet& jin,
ATH_MSG_VERBOSE(" Pruned cluster sequence: " << pjprun.associated_cluster_sequence());
// Add jet to collection.
xAOD::Jet* pjet = m_bld->add(pjprun, pjContainer, jets, &jin);
- pjet->setAttribute("RCut", m_rcut);
- pjet->setAttribute("ZCut", m_zcut);
+ pjet->setAttribute<float>("RCut", m_rcut);
+ pjet->setAttribute<float>("ZCut", m_zcut);
pjet->setAttribute<int>("TransformType", xAOD::JetTransform::Prune);
ATH_MSG_DEBUG("Properties after pruning:");
ATH_MSG_DEBUG(" ncon: " << pjprun.constituents().size() << "/"
diff --git a/Reconstruction/Jet/JetRec/Root/JetRecursiveSoftDrop.cxx b/Reconstruction/Jet/JetRec/Root/JetRecursiveSoftDrop.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..8cdefda0e2807bb64c9325d2a17366c27d42b129
--- /dev/null
+++ b/Reconstruction/Jet/JetRec/Root/JetRecursiveSoftDrop.cxx
@@ -0,0 +1,112 @@
+/*
+ Copyright (C) 2002-2020c CERN for the benefit of the ATLAS collaboration
+*/
+
+// JetRecursiveSoftDrop.cxx
+
+#include "JetRec/JetRecursiveSoftDrop.h"
+#include <iomanip>
+#include "fastjet/PseudoJet.hh"
+#include "fastjet/JetDefinition.hh"
+#include "JetEDM/PseudoJetVector.h"
+
+
+using std::setw;
+using fastjet::PseudoJet;
+using xAOD::JetContainer;
+
+//**********************************************************************
+
+JetRecursiveSoftDrop::JetRecursiveSoftDrop(std::string name)
+ : AsgTool(name), m_bld("",this) {
+ declareProperty("ZCut", m_zcut =0.1);
+ declareProperty("Beta", m_beta =0.0);
+ declareProperty("N", m_N =-1); //default to infinite layers
+ declareProperty("R0", m_R0 =1.0);
+ declareProperty("JetBuilder", m_bld);
+}
+
+//**********************************************************************
+
+JetRecursiveSoftDrop::~JetRecursiveSoftDrop() {
+}
+
+//**********************************************************************
+
+StatusCode JetRecursiveSoftDrop::initialize() {
+ if ( m_zcut < 0.0 || m_zcut > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for ZCut " << m_zcut);
+ return StatusCode::FAILURE;
+ }
+ if ( m_beta < 0.0 || m_beta > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for Beta " << m_beta);
+ return StatusCode::FAILURE;
+ }
+ if ( m_N < -1.0) {
+ ATH_MSG_ERROR("Invalid value for N " << m_N);
+ return StatusCode::FAILURE;
+ }
+ if ( m_R0 < 0.0 || m_R0 > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for R0 " << m_R0);
+ return StatusCode::FAILURE;
+ }
+ if ( m_bld.empty() ) {
+ ATH_MSG_ERROR("Unable to retrieve jet builder.");
+ return StatusCode::FAILURE;
+ }
+ return StatusCode::SUCCESS;
+}
+
+//**********************************************************************
+
+int JetRecursiveSoftDrop::groom(const xAOD::Jet& jin,
+ const PseudoJetContainer& pjContainer,
+ xAOD::JetContainer& jets) const {
+ if ( pseudojetRetriever() == nullptr ) {
+ ATH_MSG_WARNING("Pseudojet retriever is null.");
+ return 1;
+ }
+ const PseudoJet* ppjin = pseudojetRetriever()->pseudojet(jin);
+ if ( ppjin == 0 ) {
+ ATH_MSG_WARNING("Jet does not have a pseudojet.");
+ return 1;
+ }
+
+ ////////////////////////
+ //configure recursive soft drop tool
+ //https://fastjet.hepforge.org/trac/browser/contrib/contribs/RecursiveTools/tags/2.0.0-beta1
+ ////////////////////////
+ fastjet::contrib::RecursiveSoftDrop softdropper(m_beta, m_zcut, m_N, m_R0);
+ PseudoJet pjsoftdrop = softdropper(*ppjin);
+ int npsoftdrop = pjsoftdrop.pieces().size();
+ xAOD::Jet* pjet = m_bld->add(pjsoftdrop, pjContainer, jets, &jin);
+
+ pjet->setAttribute<float>("RSoftDropZCut", m_zcut);
+ pjet->setAttribute<float>("RSoftDropBeta", m_beta);
+ pjet->setAttribute<int>("RSoftDropN", m_N);
+ pjet->setAttribute<float>("SoftDropR0", m_R0);
+ pjet->setAttribute<int>("NSoftDropSubjets", npsoftdrop);
+
+ ATH_MSG_DEBUG("Properties after softdrop:");
+ ATH_MSG_DEBUG(" ncon: " << pjsoftdrop.constituents().size() << "/"
+ << ppjin->constituents().size());
+ ATH_MSG_DEBUG(" nsub: " << npsoftdrop);
+ if ( pjet == 0 ) {
+ ATH_MSG_ERROR("Unable to add jet to container");
+ } else {
+ ATH_MSG_DEBUG("Added jet to container.");
+ }
+ return 0;
+}
+
+//**********************************************************************
+
+void JetRecursiveSoftDrop::print() const {
+ ATH_MSG_INFO(" Asymmetry measure min: " << m_zcut);
+ ATH_MSG_INFO(" Angular exponent: " << m_beta);
+ ATH_MSG_INFO(" Recursive layers: " << m_N);
+ ATH_MSG_INFO(" Characteristic jet radius: " << m_R0);
+ ATH_MSG_INFO(" Jet builder: " << m_bld.name());
+}
+
+//**********************************************************************
diff --git a/Reconstruction/Jet/JetRec/Root/JetSoftDrop.cxx b/Reconstruction/Jet/JetRec/Root/JetSoftDrop.cxx
index 190b16eeb5d0eca8f643cd1a0db1c47e54511a6b..872770f692af38b3fd54b8660ee6651903216eb0 100644
--- a/Reconstruction/Jet/JetRec/Root/JetSoftDrop.cxx
+++ b/Reconstruction/Jet/JetRec/Root/JetSoftDrop.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// JetSoftDrop.cxx
@@ -25,6 +25,7 @@ JetSoftDrop::JetSoftDrop(std::string name)
//https://indico.cern.ch/event/439039/contributions/2223279/attachments/1311773/1963161/BOOST16_toptagging_CMS.pdf
declareProperty("ZCut", m_zcut =0.1);
declareProperty("Beta", m_beta =0.0);
+ declareProperty("R0", m_R0 =1.0);
declareProperty("JetBuilder", m_bld);
}
@@ -44,6 +45,10 @@ StatusCode JetSoftDrop::initialize() {
ATH_MSG_ERROR("Invalid value for Beta " << m_beta);
return StatusCode::FAILURE;
}
+ if ( m_R0 < 0.0 || m_R0 > 10.0 ) {
+ ATH_MSG_ERROR("Invalid value for R0 " << m_R0);
+ return StatusCode::FAILURE;
+ }
if ( m_bld.empty() ) {
ATH_MSG_ERROR("Unable to retrieve jet builder.");
return StatusCode::FAILURE;
@@ -54,8 +59,8 @@ StatusCode JetSoftDrop::initialize() {
//**********************************************************************
int JetSoftDrop::groom(const xAOD::Jet& jin,
- const PseudoJetContainer& pjContainer,
- xAOD::JetContainer& jets) const {
+ const PseudoJetContainer& pjContainer,
+ xAOD::JetContainer& jets) const {
if ( pseudojetRetriever() == nullptr ) {
ATH_MSG_WARNING("Pseudojet retriever is null.");
return 1;
@@ -70,13 +75,14 @@ int JetSoftDrop::groom(const xAOD::Jet& jin,
//configure soft drop tool
//http://fastjet.hepforge.org/svn/contrib/contribs/RecursiveTools/tags/1.0.0/SoftDrop.hh
////////////////////////
- fastjet::contrib::SoftDrop softdropper(m_beta, m_zcut);
+ fastjet::contrib::SoftDrop softdropper(m_beta, m_zcut, m_R0);
PseudoJet pjsoftdrop = softdropper(*ppjin);
int npsoftdrop = pjsoftdrop.pieces().size();
xAOD::Jet* pjet = m_bld->add(pjsoftdrop, pjContainer, jets, &jin);
//pjet->SetAttribute<int>("TransformType", xAOD::JetTransform::SoftDrop); //xAOD::JetTransform::SoftDrop probably doesn't exist yet
- pjet->setAttribute("ZCut", m_zcut);
- pjet->setAttribute("SoftDropBeta", m_beta);
+ pjet->setAttribute<float>("ZCut", m_zcut);
+ pjet->setAttribute<float>("SoftDropBeta", m_beta);
+ pjet->setAttribute<float>("SoftDropR0", m_R0);
pjet->setAttribute<int>("NSoftDropSubjets", npsoftdrop);
ATH_MSG_DEBUG("Properties after softdrop:");
@@ -96,6 +102,7 @@ int JetSoftDrop::groom(const xAOD::Jet& jin,
void JetSoftDrop::print() const {
ATH_MSG_INFO(" Asymmetry measure min: " << m_zcut);
ATH_MSG_INFO(" Angular exponent: " << m_beta);
+ ATH_MSG_INFO(" Characteristic jet radius: " << m_R0);
ATH_MSG_INFO(" Jet builder: " << m_bld.name());
}
diff --git a/Reconstruction/Jet/JetRec/Root/JetSplitter.cxx b/Reconstruction/Jet/JetRec/Root/JetSplitter.cxx
index ef90b5d512cd6e64a34b4d5ab3531cfe6e95f75a..8a0286206a2678159610241245c4c87e4752ba86 100644
--- a/Reconstruction/Jet/JetRec/Root/JetSplitter.cxx
+++ b/Reconstruction/Jet/JetRec/Root/JetSplitter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// JetSplitter.cxx
@@ -144,16 +144,16 @@ int JetSplitter::groom(const xAOD::Jet& jin,
} else {
ATH_MSG_DEBUG("Added jet to container.");
pjet->setAttribute<int>("TransformType", xAOD::JetTransform::MassDrop);
- pjet->setAttribute("MuMax", m_mumax);
- pjet->setAttribute("YMin", m_ymin);
- pjet->setAttribute("RClus", m_rclus);
+ pjet->setAttribute<float>("MuMax", m_mumax);
+ pjet->setAttribute<float>("YMin", m_ymin);
+ pjet->setAttribute<float>("RClus", m_rclus);
//this has to be a char, because by default bools are converted to chars in perstification. Thus if we run this tool on an exiting collection in a POOL file the type is char.
pjet->setAttribute<char>("BDRS", m_bdrs);
- pjet->setAttribute("NSubjetMax", m_nsubjetmax);
- pjet->setAttribute("DRFilt", drfilt);
- pjet->setAttribute("MuFilt", mufilt);
- pjet->setAttribute("YFilt", yfilt);
- pjet->setAttribute("NSubjet", npclus);
+ pjet->setAttribute<int>("NSubjetMax", m_nsubjetmax);
+ pjet->setAttribute<float>("DRFilt", drfilt);
+ pjet->setAttribute<float>("MuFilt", mufilt);
+ pjet->setAttribute<float>("YFilt", yfilt);
+ pjet->setAttribute<int>("NSubjet", npclus);
}
return 0;
}
diff --git a/Reconstruction/Jet/JetRec/python/JetToolSupport.py b/Reconstruction/Jet/JetRec/python/JetToolSupport.py
index b9edbfc33c026f0b2b759a3bd1b3436f49c6a161..a3f8defa6bdd4bbbb1c73353b66a6929219dc35e 100644
--- a/Reconstruction/Jet/JetRec/python/JetToolSupport.py
+++ b/Reconstruction/Jet/JetRec/python/JetToolSupport.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# JetToolSupport.py
#
@@ -168,12 +168,13 @@ class JetToolManager:
# Build the list of modifiers, replacing the string "calib:XXX:CALIB" with
# the appropriate calibration tool.
- def buildModifiers(self, modifiersin, finder, getters, altname, output, calibOpt):
+ def buildModifiers(self, modifiersin, finder, getters, altname, output, calibOpt, constmods=[]):
from GaudiKernel.Proxy.Configurable import ConfigurableAlgTool
from JetRec.JetRecConf import JetFinder
outmods = []
inmods = self.getModifiers(modifiersin, altname)
ncalib = 0
+ constmodstr = "".join(constmods)
for mod in inmods:
jetlog.info( self.prefix + "Adding modifier " + str(mod) )
mod0 = ""
@@ -234,7 +235,7 @@ class JetToolManager:
sinp = getters[0].Label.split("Origin")[0]
salg = finder.JetAlgorithm
srad = str(int(10*finder.JetRadius))
- cname = output.replace(sinp, "Truth")
+ cname = output.replace(sinp, "Truth").replace(constmodstr, "")
if cname == output:
jetlog.info( sinp, cname, output )
raise TypeError
@@ -252,7 +253,7 @@ class JetToolManager:
sinp = getters[0].Label.split("Origin")[0]
salg = finder.JetAlgorithm
srad = str(int(10*finder.JetRadius))
- cname = output.replace(sinp, "PV0Track")
+ cname = output.replace(sinp, "PV0Track").replace(constmodstr, "")
if cname == output:
jetlog.info( sinp, cname, output )
raise TypeError
@@ -324,7 +325,7 @@ class JetToolManager:
# is the highest.
def addJetFinderTool(self, toolname, alg, radius, ivtx =None,
ghostArea =0.0, ptmin =0.0, rndseed =1,
- variableRMinRadius =-1.0, variableRMassScale =-1.0):
+ variableRMinRadius =-1.0, variableRMassScale =-1.0, constmods=[]):
myname = "JetToolManager:addJetFinderTool: "
if toolname in self.tools:
m = "Tool " + myname + " is already registered"
@@ -396,7 +397,7 @@ class JetToolManager:
ghostArea =0.0, ptmin =0.0, ptminFilter =0.0, rndseed =1,
isTrigger =False, useTriggerStore =False,
variableRMinRadius =-1.0, variableRMassScale =-1.0,
- calibOpt ="", jetPseudojetCopier =""):
+ calibOpt ="", jetPseudojetCopier ="", constmods=[]):
self.msg(2, "Adding finder")
from JetRec.JetRecConf import JetRecTool
if type(gettersin) == str:
@@ -414,14 +415,14 @@ class JetToolManager:
elif gettersin == "pv0track": ivtx = 0 # Find tracks only for 1st vertex
# Retrieve/build the jet finder.
lofinder,hifinder = self.addJetFinderTool(output+"Finder", alg, radius, ivtx, ghostArea, ptmin, rndseed,
- variableRMinRadius, variableRMassScale)
+ variableRMinRadius, variableRMassScale, constmods=constmods)
jetrec = JetRecTool(output)
jetrec.InputPseudoJets = [getter.OutputContainer for getter in getters]
jetrec.JetFinder = hifinder
jetrec.OutputContainer = output
ptminSave = self.ptminFilter
if ptminFilter > 0.0: self.ptminFilter = ptminFilter
- jetrec.JetModifiers = self.buildModifiers(modifiersin, lofinder, getters, gettersin, output, calibOpt)
+ jetrec.JetModifiers = self.buildModifiers(modifiersin, lofinder, getters, gettersin, output, calibOpt, constmods=constmods)
self.autoconfigureModifiers(jetrec.JetModifiers, output)
if consumers != None:
jetrec.JetConsumers = consumers
@@ -564,6 +565,117 @@ class JetToolManager:
self.jetcons += [output]
return jetrec
+ # Create a SoftDrop and rectool.
+ # output = name for output container (and JetRecTool)
+ # beta = Beta used in SoftDrop
+ # zcut = ZCut used in SoftDrop
+ # r0 = R0 used in RecursiveSoftDrop
+ # input = name of the input jet container
+ # modifiersin = list of modifier tools (or name of such in modifiersMap)
+ def addJetSoftDrop(self, output, beta, zcut, r0, input, modifiersin ="groomed",
+ isTrigger =False, useTriggerStore =False, doArea =True):
+ from JetRec.JetRecConf import JetSoftDrop
+ from JetRec.JetRecConf import JetRecTool
+ groomer = JetSoftDrop(output + "Groomer")
+ groomer.ZCut = zcut
+ groomer.Beta = beta
+ groomer.R0 = r0
+ if doArea:
+ groomer.JetBuilder = self.jetBuilderWithArea
+ else:
+ groomer.JetBuilder = self.jetBuilderWithoutArea
+ self += groomer
+ jetrec = JetRecTool(output)
+ jetrec.JetGroomer = groomer
+ jetrec.InputContainer = input
+ jetrec.OutputContainer = output
+ jetrec.JetModifiers = self.getModifiers(modifiersin)
+ self.autoconfigureModifiers(jetrec.JetModifiers, output)
+ jetrec.Trigger = isTrigger or useTriggerStore
+ jetrec.Timer = jetFlags.timeJetRecTool()
+ self += jetrec
+ if isTrigger:
+ self.trigjetrecs += [jetrec]
+ else:
+ self.jetrecs += [jetrec]
+ self.jetcons += [output]
+ return jetrec
+
+ # Create a BottomUpSoftDrop and rectool.
+ # output = name for output container (and JetRecTool)
+ # beta = Beta used in BottomUpSoftDrop
+ # zcut = ZCut used in BottomUpSoftDrop
+ # r0 = R0 used in BottomUpSoftDrop
+ # input = name of the input jet container
+ # modifiersin = list of modifier tools (or name of such in modifiersMap)
+ def addJetBottomUpSoftDrop(self, output, beta, zcut, r0, input, modifiersin ="groomed",
+ isTrigger =False, useTriggerStore =False, doArea =True):
+ from JetRec.JetRecConf import JetBottomUpSoftDrop
+ from JetRec.JetRecConf import JetRecTool
+
+ groomer = JetBottomUpSoftDrop(output + "Groomer")
+ groomer.ZCut = zcut
+ groomer.Beta = beta
+ groomer.R0 = r0
+ if doArea:
+ groomer.JetBuilder = self.jetBuilderWithArea
+ else:
+ groomer.JetBuilder = self.jetBuilderWithoutArea
+ self += groomer
+ jetrec = JetRecTool(output)
+ jetrec.JetGroomer = groomer
+ jetrec.InputContainer = input
+ jetrec.OutputContainer = output
+ jetrec.JetModifiers = self.getModifiers(modifiersin)
+ self.autoconfigureModifiers(jetrec.JetModifiers, output)
+ jetrec.Trigger = isTrigger or useTriggerStore
+ jetrec.Timer = jetFlags.timeJetRecTool()
+ self += jetrec
+ if isTrigger:
+ self.trigjetrecs += [jetrec]
+ else:
+ self.jetrecs += [jetrec]
+ self.jetcons += [output]
+ return jetrec
+
+ # Create a RecursiveSoftDrop and rectool.
+ # output = name for output container (and JetRecTool)
+ # beta = Beta used in RecursiveSoftDrop
+ # zcut = ZCut used in RecursiveSoftDrop
+ # r0 = R0 used in RecursiveSoftDrop
+ # input = name of the input jet container
+ # modifiersin = list of modifier tools (or name of such in modifiersMap)
+ def addJetRecursiveSoftDrop(self, output, beta, zcut, N, r0, input, modifiersin ="groomed",
+ isTrigger =False, useTriggerStore =False, doArea =True):
+ from JetRec.JetRecConf import JetRecursiveSoftDrop
+ from JetRec.JetRecConf import JetRecTool
+
+ groomer = JetRecursiveSoftDrop(output + "Groomer")
+ groomer.ZCut = zcut
+ groomer.Beta = beta
+ groomer.N = N
+ groomer.R0 = r0
+ if doArea:
+ groomer.JetBuilder = self.jetBuilderWithArea
+ else:
+ groomer.JetBuilder = self.jetBuilderWithoutArea
+ self += groomer
+ jetrec = JetRecTool(output)
+ jetrec.JetGroomer = groomer
+ jetrec.InputContainer = input
+ jetrec.OutputContainer = output
+ jetrec.JetModifiers = self.getModifiers(modifiersin)
+ self.autoconfigureModifiers(jetrec.JetModifiers, output)
+ jetrec.Trigger = isTrigger or useTriggerStore
+ jetrec.Timer = jetFlags.timeJetRecTool()
+ self += jetrec
+ if isTrigger:
+ self.trigjetrecs += [jetrec]
+ else:
+ self.jetrecs += [jetrec]
+ self.jetcons += [output]
+ return jetrec
+
# Create a jet reclusterer and rectool.
# output = name for output container (and JetRecTool)
# alg = akgorithm name (Kt, CamKt, AntiKt)
@@ -593,13 +705,13 @@ class JetToolManager:
ghostArea =0.0, ptmin =0.0, ptminFilter =0.0, rndseed =1,
isTrigger =False, useTriggerStore =False,
variableRMinRadius =-1.0, variableRMassScale =-1.0,
- calibOpt ="", jetPseudojetCopier =""):
+ calibOpt ="", jetPseudojetCopier ="", constmods=[]):
self.msg(2, "Adding reclusterer")
from JetRec.JetRecConf import JetRecTool
from JetRec.JetRecConf import JetReclusterer
# Retrieve/build the jet finder.
lofinder,hifinder = self.addJetFinderTool(output+"Finder", alg, radius, ivtx, ghostArea, ptmin, rndseed,
- variableRMinRadius, variableRMassScale)
+ variableRMinRadius, variableRMassScale, constmods=constmods)
reclname = output + "Reclusterer"
groomer = JetReclusterer(
reclname,
@@ -630,7 +742,7 @@ class JetToolManager:
# output = name for input container
# modifiersin = list of modifier tools (or name of such in modifiersMap)
def addJetCopier(self, output, input, modifiersin, ptminFilter =0.0, radius =0.0, alg ="", inp ="",
- isTrigger=False, useTriggerStore=False, calibOpt ="", shallow =True):
+ isTrigger=False, useTriggerStore=False, calibOpt ="", shallow =True, constmods=[]):
from JetRec.JetRecConf import JetRecTool
jetrec = JetRecTool(output)
jetrec.InputContainer = input
@@ -643,7 +755,7 @@ class JetToolManager:
class get:
Label = inp
getters = [get]
- jetrec.JetModifiers = self.buildModifiers(modifiersin, finder, getters, None, output, calibOpt)
+ jetrec.JetModifiers = self.buildModifiers(modifiersin, finder, getters, None, output, calibOpt, constmods=constmods)
self.autoconfigureModifiers(jetrec.JetModifiers, output)
self.ptminFilter = ptminSave
jetrec.Trigger = isTrigger or useTriggerStore
diff --git a/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx b/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
index bc1988eef2711cb477c5cedbee0cf4f921bb7184..ace4fc6f397d107f577d71c9fad87e3b8ee104e6 100644
--- a/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
+++ b/Reconstruction/Jet/JetRec/src/components/JetRec_entries.cxx
@@ -16,6 +16,9 @@
#include "JetRec/JetSplitter.h"
#include "JetRec/JetTrimmer.h"
#include "JetRec/JetPruner.h"
+#include "JetRec/JetSoftDrop.h"
+#include "JetRec/JetBottomUpSoftDrop.h"
+#include "JetRec/JetRecursiveSoftDrop.h"
#include "JetRec/JetReclusterer.h"
#include "JetRec/FastJetInterfaceTool.h"
@@ -39,6 +42,9 @@ DECLARE_COMPONENT( JetFilterTool )
DECLARE_COMPONENT( JetSplitter )
DECLARE_COMPONENT( JetTrimmer )
DECLARE_COMPONENT( JetPruner )
+DECLARE_COMPONENT( JetSoftDrop )
+DECLARE_COMPONENT( JetBottomUpSoftDrop )
+DECLARE_COMPONENT( JetRecursiveSoftDrop )
DECLARE_COMPONENT( JetReclusterer )
DECLARE_COMPONENT( FastJetInterfaceTool )
DECLARE_COMPONENT( JetPseudojetRetriever )