diff --git a/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h b/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h
index 50ded5fd4265ce7eda3aa91cbff5fa26053994ac..f14d27742687e2ba58de93c443b940e2bbc7ebe0 100644
--- a/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h
+++ b/Reconstruction/Jet/JetRecTools/JetRecTools/JetConstituentModSequence.h
@@ -75,6 +75,12 @@ protected:
StatusCode
copyModRecord(const SG::ReadHandleKey<T>&,
const SG::WriteHandleKey<T>&) const;
+
+ // temporary trigger helper needed until we can
+ // decommission TrigHLTJetRec classes
+ template<class T, class Taux, class Tsingle>
+ StatusCode
+ copyModForTrigger(const T&) const;
};
template<class T>
@@ -106,5 +112,28 @@ JetConstituentModSequence::copyModRecord(const SG::ReadHandleKey<T>& inKey,
return StatusCode::SUCCESS;
}
+template<class T, class Taux, class Tsingle>
+StatusCode
+JetConstituentModSequence::copyModForTrigger(const T& originals) const
+{
+
+ // This is the trigger case, revert to a deep copy of the input container.
+ // Create the new container and its auxiliary store.
+ T* constitCopy = new T();
+ Taux* constitCopyAux = new Taux();
+ constitCopy->setStore( constitCopyAux ); //< Connect the two
+
+ for(const Tsingle* orig_constit : originals) {
+ Tsingle* theconstit = new Tsingle();
+ constitCopy->push_back( theconstit );
+ *theconstit= *orig_constit; // copies auxdata from one auxstore to the other
+ }
+
+ for (auto t : m_modifiers) {ATH_CHECK(t->process(constitCopy));}
+
+ // Update the output container pointer
+ m_trigOutputConstits = constitCopy;
+ return StatusCode::SUCCESS;
+}
#endif
diff --git a/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx b/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx
index 4a8b4b1b0fd3e7f84616d2f8c523a55970f7f09d..e2e17de28ffb820351aed16c8bf60521156e1391 100644
--- a/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx
+++ b/Reconstruction/Jet/JetRecTools/Root/JetConstituentModSequence.cxx
@@ -7,6 +7,7 @@
// Will later add the intermediate step
#include "JetRecTools/JetConstituentModSequence.h"
+#include "xAODCaloEvent/CaloClusterAuxContainer.h"
JetConstituentModSequence::JetConstituentModSequence(const std::string &name):
asg::AsgTool(name),
@@ -19,7 +20,7 @@ JetConstituentModSequence::JetConstituentModSequence(const std::string &name):
declareProperty("OutputContainer", m_outputContainer, "The output container for the sequence.");
declareProperty("InputType", m_inputType, "The xAOD type name for the input container.");
declareProperty("Modifiers", m_modifiers, "List of IJet tools.");
- declareProperty("Trigger", m_trigger=false);
+ declareProperty("Trigger", m_trigger=false);
declareProperty("SaveAsShallow", m_saveAsShallow=true, "Save as shallow copy");
}
@@ -72,19 +73,29 @@ StatusCode JetConstituentModSequence::initialize() {
}
int JetConstituentModSequence::execute() const {
- if (m_trigger){return 0;}
// Create the shallow copy according to the input type
switch(m_inputType){
case xAOD::Type::CaloCluster: {
- auto sc = copyModRecord(m_inClusterKey,
- m_outClusterKey);
- if(!sc.isSuccess()){return 1;}
+ if (m_trigger){
+ auto clustersin = dynamic_cast<const xAOD::CaloClusterContainer*>(m_trigInputConstits);
+ if(clustersin==nullptr) {
+ ATH_MSG_ERROR("Failed to cast trigInputConstits to CaloCluster");
+ return(3);
+ }
+ auto sc = copyModForTrigger<xAOD::CaloClusterContainer,xAOD::CaloClusterAuxContainer,xAOD::CaloCluster>(*clustersin);
+ if(!sc.isSuccess()){return 1;}
+ } else {
+ auto sc = copyModRecord(m_inClusterKey,
+ m_outClusterKey);
+ if(!sc.isSuccess()){return 1;}
+ }
break;
}
case xAOD::Type::ParticleFlow: {
+ if (m_trigger){return 2;}
auto sc = copyModRecordPFO();
if(!sc.isSuccess()){return 1;}
break;
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt
index 8e60a3038f7a97d9fa84988805446e3948591add..ec07e72ecc6437029c8ec9b59e02660fcae8b858 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/CMakeLists.txt
@@ -17,6 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
Reconstruction/Jet/JetEDM
Reconstruction/Jet/JetInterface
Reconstruction/Jet/JetRec
+ Reconstruction/Jet/JetRecTools
Trigger/TrigEvent/TrigCaloEvent
Trigger/TrigEvent/TrigNavStructure
Trigger/TrigEvent/TrigParticle
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NegativeEnergyRejectionTool.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NonPositiveEnergyRejectionTool.h
similarity index 72%
rename from Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NegativeEnergyRejectionTool.h
rename to Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NonPositiveEnergyRejectionTool.h
index e8a4f11838ed64d609fed0ddb7527cf3025a51b0..719ce2933ae7c9f31c2e7abf27ecb09307067325 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NegativeEnergyRejectionTool.h
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/NonPositiveEnergyRejectionTool.h
@@ -9,21 +9,21 @@
// P Sherwood March 2018
-/// \class NegativeEnergyRejectionTool
+/// \class NonPositiveEnergyRejectionTool
///
/// Tool to select IParticles.
#include "TrigHLTJetRec/IIParticleRejectionTool.h"
#include "AsgTools/AsgTool.h"
-class NegativeEnergyRejectionTool :
+class NonPositiveEnergyRejectionTool :
public asg::AsgTool, virtual public IIParticleRejectionTool{
- ASG_TOOL_CLASS(NegativeEnergyRejectionTool, IIParticleRejectionTool)
+ ASG_TOOL_CLASS(NonPositiveEnergyRejectionTool, IIParticleRejectionTool)
public:
- NegativeEnergyRejectionTool(const std::string& name);
- virtual ~NegativeEnergyRejectionTool() override {}
+ NonPositiveEnergyRejectionTool(const std::string& name);
+ virtual ~NonPositiveEnergyRejectionTool() override {}
virtual StatusCode initialize() override;
virtual StatusCode finalize() override;
@@ -33,7 +33,6 @@ class NegativeEnergyRejectionTool :
virtual std::size_t rejected() const override;
private:
- bool m_skipNegativeEnergy{true};
std::size_t m_tested{0};
std::size_t m_rejected{0};
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h
index 31528c321137a192e4f2ff7d658c8112a41bdea1..473e371a60b81f82ef5019606c2b2723dcf82030 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/TrigHLTJetRec/TrigHLTSoftKiller.h
@@ -8,6 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrigInterfaces/FexAlgo.h"
+#include "JetRecTools/JetConstituentModSequence.h"
class TrigHLTSoftKiller : public HLT::FexAlgo
{
@@ -22,9 +23,11 @@ class TrigHLTSoftKiller : public HLT::FexAlgo
HLT::ErrorCode hltFinalize();
private:
- // TODO Add SoftKiller ToolHandle and related here
- std::string m_outputCollectionLabel;
+ ToolHandle<IJetConstituentModifier> m_skWeightTool;
+ ToolHandle<IJetExecuteTool> m_skclustModSeqTool;
+ std::string m_outputCollectionLabel;
+ std::string m_clusterCalib;
};
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py b/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py
index bfdbbf2ba168cad28f98627419d871647c9236f6..46246ad5243050656bc997f9cd6659ec3f186c59 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/python/TrigHLTJetRecConfig.py
@@ -12,7 +12,8 @@ from GaudiKernel.Constants import (VERBOSE,
import TrigHLTJetRecConf
from TrigHLTJetRec.TrigHLTJetRecConf import (IParticleNullRejectionTool,
- IParticlePtEtaRejectionTool,)
+ IParticlePtEtaRejectionTool,
+ NonPositiveEnergyRejectionTool)
# from JetRec.JetRecConf import JetRecTool
# from JetRec.JetRecConf import (JetFromPseudojetMT,)
@@ -1103,6 +1104,31 @@ def _getIParticleNullRejectionTool(toolname, **kwds):
return rejecter
+def _getNonPositiveEnergyRejectionTool(toolname, **kwds):
+
+ # set up a tool to select all pseudo jets
+ # declare jtm as global as this function body may modify it
+ # with the += operator
+ global jtm
+
+ # Build a new list of jet inputs. original: mygetters = [jtm.lcget]
+ try:
+ rejecter = getattr(jtm, toolname)
+ except AttributeError:
+ # Add the PseudoJetSelectorAll to the JetTool Manager,
+ # which pushes it to the ToolSvc in __iadd__
+ # This is done in the same as PseudoJetGetter is added in
+ # JetRecStandardTools.py.
+ # The 'Label' must be one of the values found in JetContainerInfo.h
+ rejecter = NonPositiveEnergyRejectionTool(
+ name=toolname, **kwds)
+ jtm += rejecter
+ rejecter = getattr(jtm, toolname)
+ print 'TrigHLTJetRecConfig._getNonPositiveEnergyRectionTool '\
+ 'Added rejecter "%s" to jtm' % toolname
+
+ return rejecter
+
def _getIParticlePtEtaRejectionTool(toolname, **kwds):
@@ -1164,8 +1190,8 @@ class TrigHLTJetRecFromCluster(TrigHLTJetRecConf.TrigHLTJetRecFromCluster):
# self.iIParticleSelector = _getIParticleSelectorAll(
# 'iIParticleSelectorAll')
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
secondary_label = ''
# FTK specific: do we want FTK? Set label to GhostTrack.
@@ -1245,8 +1271,8 @@ class TrigHLTJetRecGroomer(TrigHLTJetRecConf.TrigHLTJetRecGroomer):
# 3/18 IParticle selection moved to TriggerJetBuildTool
# self.iIParticleSelector = _getIParticleSelectorAll(
# 'iParticleSelectorAll')
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
# Groomer builds jets from clusters and then grooms them
@@ -1263,7 +1289,7 @@ class TrigHLTJetRecGroomer(TrigHLTJetRecConf.TrigHLTJetRecGroomer):
do_minimalist_setup=do_minimalist_setup,
iParticleRejectionTool=iIParticleRejecter,
name=name+'notrim',
- do_substructure=do_substructure,
+ do_substructure=False, #do_substructure,
OutputLevel=OutputLevel,
)
@@ -1310,15 +1336,14 @@ class TrigHLTJetRecFromJet(TrigHLTJetRecConf.TrigHLTJetRecFromJet):
TrigHLTJetRecConf.TrigHLTJetRecFromJet.__init__(self, name=name)
self.OutputLevel = OutputLevel
- self.OutputLevel = OutputLevel
self.cluster_calib = cluster_calib
# self.pseudoJetGetter = _getTriggerPseudoJetGetter(cluster_calib)
name = 'iIParticleEtaPtRejecter_%d_%d' % (int(10 * etaMaxCut),
int(ptMinCut))
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
concrete_type = 'Jet'
@@ -1375,8 +1400,8 @@ class TrigHLTJetRecFromTriggerTower(
# int(ptMinCut)),
# **{'etaMax': etaMaxCut, 'ptMin': ptMinCut})
- iIParticleRejecter = _getIParticleNullRejectionTool(
- 'iIParticleNullRejectionTool', OutputLevel=OutputLevel)
+ iIParticleRejecter = _getNonPositiveEnergyRejectionTool(
+ 'nonPositiveEnergyRejectionTool', OutputLevel=OutputLevel)
@@ -1534,6 +1559,8 @@ class TrigHLTEnergyDensity(TrigHLTJetRecConf.TrigHLTEnergyDensity):
self.energyDensity = 0
+from JetRecTools.JetRecToolsConf import (JetConstituentModSequence, SoftKillerWeightTool, ClusterAtEMScaleTool, VoronoiWeightTool)
+
class TrigHLTSoftKiller(TrigHLTJetRecConf.TrigHLTSoftKiller):
"""Supply a specific grid configuration for SoftKiller"""
@@ -1549,12 +1576,43 @@ class TrigHLTSoftKiller(TrigHLTJetRecConf.TrigHLTSoftKiller):
TrigHLTJetRecConf.TrigHLTSoftKiller.__init__(self,name=name)
self.OutputLevel = OutputLevel
- self.output_collection_label = output_collection_label
+ self.output_collection_label = output_collection_label+ '_' + name + '_'+cluster_calib
- # TODO create and configure offline SoftKiller tool here, pass it to our tool
# Use cluster_calib, sk_grid_param_eta, and sk_grid_param_phi to configure the offline tool
print "SK: %s, %f, %f"%(cluster_calib,sk_grid_param_eta,sk_grid_param_phi)
+ # Temp hardcode enum value as this is code that will be dropped
+ xaodtype_calocluster = 1
+
+ modifiers = []
+ # We only want an EM tool if we are working with EM clusters
+ # The tool should be used before calling SoftKiller (prepend to list)
+ if cluster_calib == "EM":
+ emTool = ClusterAtEMScaleTool('emTool_'+name+'_'+cluster_calib, InputType=xaodtype_calocluster)
+ jtm.add(emTool)
+ self.emTool = emTool
+ modifiers.append(self.emTool)
+
+ global jtm
+ skTool = SoftKillerWeightTool( name+cluster_calib, SKGridSize=0.6, isCaloSplit=False, SKRapMin=0, SKRapMax=2.5, InputType=xaodtype_calocluster)
+ jtm.add(skTool)
+ self.skWeightTool = skTool
+
+ voronoiTool = VoronoiWeightTool('voronoiTool'+name+'_'+cluster_calib, doSpread = False, nSigma = 0, InputType=xaodtype_calocluster)
+ jtm.add(voronoiTool)
+ self.voronoiTool = voronoiTool
+ modifiers += [self.voronoiTool, self.skWeightTool]
+
+ skclustModSeq = JetConstituentModSequence('ClustModifSequence_'+name+'_'+cluster_calib,
+ InputContainer = "CaloCalTopoClusters",
+ OutputContainer = self.output_collection_label,
+ InputType=xaodtype_calocluster,
+ Trigger = True,
+ Modifiers = modifiers
+ )
+ jtm.add(skclustModSeq)
+ self.skclustModSeqTool = skclustModSeq
+
print "SK clusters from clusters"
# Track Moment helper class
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
deleted file mode 100644
index 40d1c344acb0ffa8b382ecca2ea13669c962a075..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NegativeEnergyRejectionTool.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "TrigHLTJetRec/NegativeEnergyRejectionTool.h"
-
-
-NegativeEnergyRejectionTool::NegativeEnergyRejectionTool(const std::string& name):
- AsgTool(name) {
-}
-
-StatusCode NegativeEnergyRejectionTool::initialize() {
- ATH_MSG_INFO("Initializing " << name() << ".");
- return StatusCode::SUCCESS;
-}
-
-
-bool NegativeEnergyRejectionTool::operator()(const xAOD::IParticle* ip) {
- ATH_MSG_DEBUG("Entering operator()()...");
-
- ++m_tested;
-
- bool null = (ip == 0);
- bool negativeE = m_skipNegativeEnergy && ip->e() <= 0.0;
- if (null || negativeE){
- ++m_rejected;
- return true;
- }
- return false;
-}
-
-
-StatusCode NegativeEnergyRejectionTool::finalize() {
- ATH_MSG_INFO("Finalizing " << name() << ".");
- return StatusCode::SUCCESS;
-}
-
-
-std::size_t NegativeEnergyRejectionTool::tested() const {return m_tested;}
-std::size_t NegativeEnergyRejectionTool::rejected() const {return m_rejected;}
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NonPositiveEnergyRejectionTool.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NonPositiveEnergyRejectionTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c48cda14d0ca1092185327cf595737923374842e
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/NonPositiveEnergyRejectionTool.cxx
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+#include "TrigHLTJetRec/NonPositiveEnergyRejectionTool.h"
+
+
+NonPositiveEnergyRejectionTool::NonPositiveEnergyRejectionTool(const std::string& name):
+ AsgTool(name) {
+}
+
+StatusCode NonPositiveEnergyRejectionTool::initialize() {
+ ATH_MSG_INFO("Initializing " << name() << ".");
+ return StatusCode::SUCCESS;
+}
+
+
+bool NonPositiveEnergyRejectionTool::operator()(const xAOD::IParticle* ip) {
+ ATH_MSG_DEBUG("Entering operator()()...");
+
+ ++m_tested;
+
+ bool null = (ip == 0);
+ bool positiveE = ip->e() > FLT_MIN;
+ if (null || !positiveE){
+ ++m_rejected;
+ return true;
+ }
+ return false;
+}
+
+
+StatusCode NonPositiveEnergyRejectionTool::finalize() {
+ ATH_MSG_INFO("Finalizing " << name() << ".");
+ return StatusCode::SUCCESS;
+}
+
+
+std::size_t NonPositiveEnergyRejectionTool::tested() const {return m_tested;}
+std::size_t NonPositiveEnergyRejectionTool::rejected() const {return m_rejected;}
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx
index 99c57591b6baeb6b47b96bf5acb553cc4757fc1e..6b8018cbe53fd52256e851de9995232ea283ec6e 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTJetRecGroomer.cxx
@@ -90,7 +90,7 @@ TrigHLTJetRecGroomer::build(fastjet::ClusterSequence*& cs,
ATH_MSG_DEBUG("Ungroomed/groomed jet number " << iJet << " has constituents of " << ungroomedJets->at(iJet)->numConstituents() << "/" << trimmedJets->at(iJet)->numConstituents() << ", pT ratio is " << orig_pt << "/" << trim_pt << " = " << ratio << " , constscale ratio is " << orig_const_pt << "/" << trim_const_pt << " = " << ratio_const << " , emscale ratio is " << orig_em_pt << "/" << trim_em_pt << " = " << ratio_em);
}
- */
+ */
// Get rid of the intermediate (ungroomed) jets
auto ungroomedStore = ungroomedJets->getStore();
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx
index 76bfb4d56c46ef2107ca4b3253150c8333597e97..afa60b0044d74a9efdbbe7cc25be9a54f77f3071 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/TrigHLTSoftKiller.cxx
@@ -8,11 +8,13 @@
#include "TrigHLTJetRec/TrigHLTSoftKiller.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "xAODBase/IParticleContainer.h"
TrigHLTSoftKiller::TrigHLTSoftKiller(const std::string& name, ISvcLocator* pSvcLocator)
: HLT::FexAlgo(name, pSvcLocator)
{
declareProperty( "output_collection_label", m_outputCollectionLabel);
+ declareProperty("skclustModSeqTool",m_skclustModSeqTool);
}
TrigHLTSoftKiller::~TrigHLTSoftKiller()
@@ -23,7 +25,15 @@ HLT::ErrorCode TrigHLTSoftKiller::hltInitialize()
ATH_MSG_INFO("Initializing " << name() << "...");
- // TODO Retrieve any needed ToolHandles here, like the SoftKiller tool
+ StatusCode sc = m_skclustModSeqTool.retrieve();
+
+ if (sc.isSuccess())
+ ATH_MSG_INFO("Retrieved skclustModSeqTool: " << m_skclustModSeqTool->name());
+ else
+ {
+ ATH_MSG_ERROR("Failed to retrieve the skclustModSeqTool: " << m_skclustModSeqTool->name());
+ return HLT::ERROR;
+ }
ATH_MSG_INFO("Initialization successful");
@@ -47,12 +57,12 @@ HLT::ErrorCode TrigHLTSoftKiller::hltExecute(const HLT::TriggerElement* inputTE,
ATH_MSG_DEBUG("inputTE->getId(): " << inputTE->getId());
// Get the input container
- const xAOD::CaloClusterContainer* clusters = nullptr;
- HLT::ErrorCode status = getFeature(inputTE,clusters);
+ const xAOD::CaloClusterContainer* inputclusters = nullptr;
+ HLT::ErrorCode status = getFeature(inputTE,inputclusters);
if (status == HLT::OK)
{
- if (clusters != nullptr)
- ATH_MSG_DEBUG("Retrieved input cluster container of size " << clusters->size());
+ if (inputclusters != nullptr)
+ ATH_MSG_DEBUG("Retrieved input cluster container of size " << inputclusters->size());
else
{
ATH_MSG_ERROR("Retrieved NULL input cluster container");
@@ -65,19 +75,47 @@ HLT::ErrorCode TrigHLTSoftKiller::hltExecute(const HLT::TriggerElement* inputTE,
return HLT::ERROR;
}
+ JetConstituentModSequence *skclustModSeqTool = const_cast<JetConstituentModSequence*>(dynamic_cast<const JetConstituentModSequence*>(&*m_skclustModSeqTool));
+ const xAOD::IParticleContainer* IP_inputclusters = dynamic_cast<const xAOD::IParticleContainer*> (inputclusters);
+ skclustModSeqTool->setInputClusterCollection(IP_inputclusters);
+ //skclustModSeqTool->setInputClusterCollection(inputclusters);
+ int process_status = skclustModSeqTool->execute();
+ const xAOD::CaloClusterContainer* outputclusters = dynamic_cast<const xAOD::CaloClusterContainer*>(skclustModSeqTool->getOutputClusterCollection());
+
+ if (process_status == 0)
+ {
+ if (outputclusters != nullptr)
+ ATH_MSG_DEBUG("Processed cluster container of size " << outputclusters->size());
+ else
+ {
+ ATH_MSG_ERROR("SoftKillerWeightTool returned NULL input cluster container");
+ return HLT::ERROR;
+ }
+ }
+ else
+ {
+ ATH_MSG_ERROR("Failed to retrieve processed cluster container");
+ return HLT::ERROR;
+ }
+
+ ////////// FOR DEBUGGING PURPOSES
+ //SG::AuxElement::ConstAccessor<float> weightAcc("PUWeight"); // Handle for PU weighting here
+ //for (size_t icl = 0; icl < outputclusters->size(); ++icl)
+ // if (weightAcc(*(outputclusters->at(icl))) < 1.e-6)
+ // ATH_MSG_INFO("Cluster SK weight: " << weightAcc(*(outputclusters->at(icl))) << ", pT = " << outputclusters->at(icl)->pt());
-
- // Apply SoftKiller and store the output in clustersSK
- const xAOD::CaloClusterContainer* clustersSK = clusters; // TODO change this to the SK cluster output
- // TODO add SK here
-
+ ATH_MSG_DEBUG("writing results");
// Write the resulting container
+ auto auxStore = outputclusters->getStore();
std::string key = "";
- status = recordAndAttachFeature(outputTE,clustersSK,key,m_outputCollectionLabel);
+ status = recordAndAttachFeature(outputTE,outputclusters,key,m_outputCollectionLabel);
if (status == HLT::OK)
+ {
ATH_MSG_DEBUG("Attached SK cluster container to output TE");
+ delete auxStore;
+ }
else
ATH_MSG_ERROR("Failed to attach SK cluster container to output TE, status " << status);
return status;
diff --git a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
index 547893ebbfa1952701514f0796bb6d8749ace510..b07dae3b28f8f95757f120b4df5a0c7aa7e8330b 100644
--- a/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigHLTJetRec/src/components/TrigHLTJetRec_entries.cxx
@@ -23,18 +23,17 @@
#include "TrigHLTJetRec/TriggerJetBuildTool.h"
#include "TrigHLTJetRec/TriggerJetGroomerTool.h"
-
#include "TrigHLTJetRec/IParticleNullRejectionTool.h"
#include "TrigHLTJetRec/IParticlePtEtaRejectionTool.h"
#include "TrigHLTJetRec/EMTopoRejectionTool.h"
#include "TrigHLTJetRec/PFlowRejectionTool.h"
-#include "TrigHLTJetRec/NegativeEnergyRejectionTool.h"
+#include "TrigHLTJetRec/NonPositiveEnergyRejectionTool.h"
DECLARE_COMPONENT(IParticleNullRejectionTool)
DECLARE_COMPONENT(IParticlePtEtaRejectionTool)
DECLARE_COMPONENT(EMTopoRejectionTool)
DECLARE_COMPONENT(PFlowRejectionTool)
-DECLARE_COMPONENT(NegativeEnergyRejectionTool)
+DECLARE_COMPONENT(NonPositiveEnergyRejectionTool)
DECLARE_COMPONENT( TrigHLTJetRecFromCluster )
DECLARE_COMPONENT( TrigHLTJetRecFromJet )
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index 1860061ee18421d06dbcf97e3b8a767f4c52adab..cc3b00049c213c7ab3baf137fd4dc36d79b44ac2 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -610,6 +610,10 @@ TriggerHLTList = [
('xAOD::JetContainer#HLT_a4sktclcwnojcalibFS', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetTrigAuxContainer#HLT_a4sktclcwnojcalibFSAux.', 'BS ESD AODFULL', 'Jet'),
+ # SoftKiller
+ ('xAOD::JetContainer#HLT_a4_sktclcwnojcalibFS', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetTrigAuxContainer#HLT_a4_sktclcwnojcalibFSAux.', 'BS ESD AODFULL', 'Jet'),
+
#GSC
('xAOD::JetContainer#HLT_GSCJet', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
('xAOD::JetTrigAuxContainer#HLT_GSCJetAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
index 19fbda2c9b69cc991d50212a0186f11f4970d32b..5894c321ffd3ab5048b2cb6f295ee21457077e1e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
@@ -99,6 +99,10 @@ def _get_energy_density_radius():
"""Provide a common source for the energy density akt radius"""
return 0.4
+def _get_soft_killer_grid_size():
+ """Provide a common source for the SoftKiller grid size"""
+ return 0.4,0.4
+
class AlgFactory(object):
def __init__(self, chain_config):
@@ -645,6 +649,30 @@ class AlgFactory(object):
return [Alg(factory, (), kwds)]
+ def softKillerAlg(self):
+ factory = 'TrigHLTSoftKiller'
+
+ # assign a name which identifies the fex sequence and
+ # the python class to be instantiated.
+ sk_grid_param_eta,sk_grid_param_phi = _get_soft_killer_grid_size()
+
+ name = '"%s_%s%s"' % (
+ factory,
+ str(int(10*sk_grid_param_eta))+str(int(10*sk_grid_param_phi)),
+ self.fex_params.cluster_calib,
+ )
+
+ # we do not carry the SoftKiller grid sizes
+ # so hard wire it here (to be fixed)
+ kwds = {'name': name,
+ 'cluster_calib': '"%s"' %self.fex_params.cluster_calib_fex,
+ 'sk_grid_param_eta': sk_grid_param_eta,
+ 'sk_grid_param_phi': sk_grid_param_phi
+ }
+
+ return [Alg(factory, (), kwds)]
+
+
def dataScoutingAlg1(self, manual_attrs):
factory = 'ScoutingStreamWriter'
manual_attrs = manual_attrs
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
index 3dd7f4fa65860fbb0c92c1ad8c89e12d72e345c0..f50e03545c4b806befa4c70c08f8d556d2de2330 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
@@ -77,7 +77,7 @@ def _check_values(chain_parts):
raise RuntimeError(msg)
dataTypes = [p['dataType'] for p in chain_parts]
- bad = [r for r in dataTypes if r not in ('TT', 'tc', 'ion')]
+ bad = [r for r in dataTypes if r not in ('TT', 'tc', 'ion', 'sktc')]
if bad:
msg = '%s unknown dataType(s): %s' % (err_hdr, ' '.join(bad))
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
index a765f83ddb5181fccfb79a9daf9e2600069070e5..dd23eca9b51b0863f1ad1f825c6d47964bc7750c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
@@ -91,6 +91,7 @@ class JetSequencesBuilder(object):
'cmfs1': self.make_cmfs1, # cell maker full scan
'cmfs2': self.make_cmfs2, # cluster maker full scan
'ed': self.make_ed, # energy density
+ 'sk': self.make_sk, # SoftKiller
'ftk': self.make_ftk, # run algos for ftk track finding and xaod conversion
'tm': self.make_tm, # track moments helper
'jr': self.make_jr_clusters, # jet rec
@@ -161,9 +162,14 @@ class JetSequencesBuilder(object):
('tc', 'PS', False, 'notrk'): ['ps', 'cm', 'jr'],
('ion', 'FS', False, 'notrk'): ['fs2','cmfs1','hicm','hijr'],
('TT', 'FS', False, 'notrk'): ['tt', 'jt'],
- ('tc', 'FS', True, 'notrk'): ['fs2', 'cmfs1', 'cmfs2','ed', 'tr']}.get((data_type,
- scan_type,
- do_trimming,trkopt), [])
+ ('tc', 'FS', True, 'notrk'): ['fs2', 'cmfs1', 'cmfs2','ed', 'tr'],
+ # SoftKiller topoclusters, no need for EventDensity for rho*area subtraction
+ ('sktc','FS',False, 'notrk'): ['fs2','cmfs1','cmfs2','sk','jr'],
+ ('sktc','FS',False, 'ftk'): ['fs2','cmfs1','cmfs2','sk','ftk','tm','jr'],
+ ('sktc','FS',False,' ftkrefit'): ['fs2','cmfs1','cmfs2','sk','ftk','tm','jr'],
+ }.get((data_type,
+ scan_type,
+ do_trimming,trkopt), [])
if not seq_order:
msg = '%s._make_sequence_list: cannot determine sequence'\
@@ -312,6 +318,16 @@ class JetSequencesBuilder(object):
return AlgList(alg_list=self.alg_factory.trackmoment_helpers(), alias=alias)
+ def make_sk(self):
+ """Return SoftKiller Alg"""
+ fex_params = self.chain_config.menu_data.fex_params
+ alias = 'softkiller_%s' % fex_params.cluster_calib
+
+ algs = []
+ [algs.extend(f()) for f in (self.alg_factory.softKillerAlg,)]
+
+ return AlgList(algs,alias=alias)
+
def make_cm(self):
"""Return cellmaker for non partial scan running.
CellMaker does not use certain read-out optimization,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py
index c795faae88102729931067c27b048c09d55b01b2..d0f17e660d2df90e16ae327b877b7a6ad2ab7a0d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/jetDefInstantiator.py
@@ -43,6 +43,7 @@ from TrigHLTJetRec.TrigHLTJetRecConfig import (TrigHLTJetDiagnostics_named,
TrigHLTHypoDiagnostics_named,
TrigHLTJetDebug,
TrigHLTEnergyDensity,
+ TrigHLTSoftKiller,
TrigHLTJetDSSelector,
TrigHLTTrackMomentHelpers,)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
index 0426c0ba1d8cec0a3449efb8703d0bacd053b8e4..9d546c5bab985b8521a59c358313037bb236413b 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
@@ -254,6 +254,14 @@ def setupMenu():
['j175_lcw_subjesIS', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1],
['j420_subjesIS', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1],
['j420_lcw_subjesIS', 'L1_J100', [], [PhysicsStream], ['Rate:SingleJet', 'BW:Jet'], -1],
+
+ # SoftKiller test and comparison chains
+ ['j60_sktc_em_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_em_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_em_sub', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_sktc_lcw_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_lcw_nojcalib', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j60_tc_lcw_sub', 'L1_J20', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
# data scouting
['j0_perf_ds1_L1All', 'L1_All', [], ['DataScouting_05_Jets'], ['RATE:Cosmic_Jets_DS', 'BW:Jet'], -1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index ecafb3edeb6b2608fba0087abd5e00c449935a29..05193311046d990f6603e37a81df3ad05504ba5e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -115,7 +115,7 @@ JetChainParts = {
'cleanLA','cleanTA','cleanLLPA', 'noCleaning'
],
'recoAlg' : ["a3","a4", "a10", "a10r", "a10t"],
- 'dataType' : ['TT', 'tc', 'cc', 'ion'],
+ 'dataType' : ['TT', 'tc', 'cc', 'ion', 'sktc'],
'calib' : ["had","lcw","em"],
'jetCalib' : ["jes","sub","subjes","subjesIS", "nojcalib"],
'scan' : ['FS','PS'],