diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoTool.cxx
deleted file mode 100644
index 85c3044aed4e3d1e3ba80035e4e79b9358b5a17b..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoTool.cxx
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigHLTJetHypoTool.h"
-#include "xAODJet/JetContainer.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/groupsMatcherFactory.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/lineSplitter.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h"
-
-#include <limits>
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-TrigHLTJetHypoTool::TrigHLTJetHypoTool( const std::string& type,
- const std::string& name,
- const IInterface* parent ): AthAlgTool( type, name, parent ), m_id(name) {
-
- declareProperty("AcceptAll", m_acceptAll=false);
- declareProperty("chain_name", m_chainName="Unknown");
-
- // cleaning
- declareProperty("cleaningAlg", m_cleaningAlg = "noCleaning");
-
- // matching. Legal: maximumBipartite, orderedCollections, selectedJets
- declareProperty("matchingAlg", m_matchingAlg = "maximumBipartite");
-
- //basic cleaning
- declareProperty("n90CleaningThreshold", m_n90Threshold = 2 );
- declareProperty("presamplerCleaningThreshold", m_presamplerThreshold = 0.9 );
- declareProperty("negativeECleaningThreshold", m_negativeEThreshold = -60e3 ); // 60 GeV
- declareProperty("qmeanCleaningThreshold", m_qmeanThreshold = 0.8 );
- declareProperty("HECQCleaningThreshold", m_hecQThreshold = 0.5 );
- declareProperty("HECfCleaningThreshold", m_hecFThreshold = 0.5 );
- declareProperty("LArQCleaningThreshold", m_larQThreshold = 0.8 );
- declareProperty("EMfCleaningThreshold", m_emFThreshold = 0.95 );
- //loose cleaning
- declareProperty("fracSamplingMaxLooseThreshold", m_fSampMaxLooseThreshold = 0.8 );
- declareProperty("etaLooseThreshold", m_etaLooseThreshold = 2.0 );
- declareProperty("EMfLowLooseThreshold", m_emfLowLooseThreshold = 0.10 );
- declareProperty("EMfHighLooseThreshold", m_emfHighLooseThreshold = 0.99 );
- declareProperty("HECfLooseThreshold", m_hecfLooseThreshold = 0.85 );
- //tight cleaning
- declareProperty("fracSamplingMaxTightThreshold", m_fSampMaxTightThreshold = 0.8 );
- declareProperty("etaTightThreshold", m_etaTightThreshold = 2.0 );
- declareProperty("EMfLowTightThreshold", m_emfLowTightThreshold = 0.10 );
- declareProperty("EMfHighTightThreshold", m_emfHighTightThreshold = 0.99 );
- declareProperty("HECfTightThreshold", m_hecfTightThreshold = 0.85 );
- //long-lived particle cleaning
- declareProperty("fracSamplingMaxLlpThreshold", m_fSampMaxLlpThreshold = 0.85 );
- declareProperty("negativeELlpThreshold", m_negELlpThreshold = 10e3 ); // 10 GeV
- declareProperty("HECfLlpThreshold", m_hecfLlpThreshold = 0.5 );
- declareProperty("HECQLlpThreshold", m_hecqLlpThreshold = 0.5 );
- declareProperty("AverageLArQFLlpThreshold", m_avLarQFLlpThreshold = 0.8*65535 );
-
-
- // Monitored variables...
- /*
- declareMonitoredVariable("NJet", m_njet);
- declareMonitoredVariable("Et", m_et);
- declareMonitoredVariable("Eta", m_eta);
- declareMonitoredVariable("Phi", m_phi);
- */
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-StatusCode TrigHLTJetHypoTool::queryInterface( const InterfaceID& riid,
- void** ppvIf )
-{
- if ( riid == ITrigHLTJetHypoTool::interfaceID() ) {
- *ppvIf = (ITrigHLTJetHypoTool*)this;
- addRef();
- return StatusCode::SUCCESS;
- }
-
- return AthAlgTool::queryInterface( riid, ppvIf );
-}
-
-StatusCode TrigHLTJetHypoTool::initialize(){
- ATH_MSG_INFO("in initialize()");
-
- // make and store the jet cleaners
- setCleaners();
-
-
- ATH_CHECK(checkVals());
-
- setConditions();
- // setJetGrouper();
-
- ATH_CHECK(!m_conditions.empty());
-
- auto matcher = groupsMatcherFactory(m_conditions);
- auto grouper = getJetGrouper();
- auto helper = TrigHLTJetHypoHelper2(m_cleaners,
- std::move(grouper),
- std::move(matcher));
-
-
- // print out the TrigHLTJetHypoHelper configuration
- ATH_MSG_INFO("Initializing TrigHLTJetHypoTool for chain "
- << m_chainName);
- std::string line = helper.toString();
- std::vector<std::string> lines = lineSplitter(line, '\n');
-
- for(auto l : lines){
- ATH_MSG_INFO(l);
- }
-
- ATH_MSG_DEBUG("Tool configured for chain/id: " << m_id);
-
- return StatusCode::SUCCESS;
-}
-
-
-
-StatusCode
-TrigHLTJetHypoTool::decide(const xAOD::JetContainer* jets,
- bool& pass) const {
- ATH_MSG_DEBUG("Executing " << name() << "...");
- ATH_CHECK(jets != nullptr);
-
- // resetCounters();
-
- HypoJetVector hypoJets(jets->size());
-
- std::transform(jets -> begin(),
- jets -> end(),
- hypoJets.begin(),
- xAODJetAsIJetFactory());
-
- // make a new CleanerMatcher every event
- auto matcher = groupsMatcherFactory(m_conditions);
- auto grouper = getJetGrouper();
- auto helper = TrigHLTJetHypoHelper2(m_cleaners,
- std::move(grouper),
- std::move(matcher));
-
- /* apply cleaning and hypothesis alg */
- ATH_MSG_DEBUG("hypo helper start... "
- << name()
- << " no of jets ... "
- << jets->size()
- << "...");
-
- // steady_clock::time_point t = steady_clock::now();
-
- try{
- pass = !jets->empty() && (m_acceptAll || helper.pass(hypoJets));
- } catch(std::exception& e){
- ATH_MSG_ERROR("Exception raised by the TrigHLTJetHypoHelper2: "
- << e.what());
- return StatusCode::FAILURE;
- }
-
- // accumulateTime(steady_clock::now() - t);
-
- ATH_MSG_DEBUG("hypo testing done... " << name() << "...");
-
- if(m_dumpJets){writeDebug(pass, helper.passedJets(), helper.failedJets());}
-
- // delete the xAOD::Jet wrappers
- for(auto i : hypoJets){delete i;}
-
- return StatusCode::SUCCESS;
-}
-
-
-void TrigHLTJetHypoTool::setCleaners() {
-
- if (m_cleaningAlg != "noCleaning"){
-
- CleanerFactory cleanerFactory(//basic cleaning
- m_n90Threshold,
- m_presamplerThreshold,
- m_negativeEThreshold,
- //loose cleaning
- m_fSampMaxLooseThreshold,
- m_etaLooseThreshold,
- m_emfLowLooseThreshold,
- m_emfHighLooseThreshold,
- m_hecfLooseThreshold,
- //tight cleaning
- m_fSampMaxTightThreshold,
- m_etaTightThreshold,
- m_emfLowTightThreshold,
- m_emfHighTightThreshold,
- m_hecfTightThreshold,
- //long-lived particle cleaning
- m_fSampMaxLlpThreshold,
- m_negELlpThreshold,
- m_hecfLlpThreshold,
- m_hecqLlpThreshold,
- m_avLarQFLlpThreshold,
- m_cleaningAlg);
-
- m_cleaners.push_back(cleanerFactory.make());
- }
-
- auto cleaners = getCleaners(); // sub class supplied cleaners
- m_cleaners.insert(m_cleaners.end(), cleaners.begin(), cleaners.end());
- ATH_MSG_INFO("No of Cleaners " << m_cleaners.size());
-}
-
-/*
-void TrigHLTJetHypoTool::bumpCounters(bool pass, int multiplicity){
- if (pass){
- ++m_accepted;
- m_njet = multiplicity;
- } else {
- ++m_rejected;
- }
- }
-*/
-
-void TrigHLTJetHypoTool::writeDebug(bool pass,
- const HypoJetVector& passedJets,
- const HypoJetVector& failedJets
- ) const{
- ATH_MSG_INFO("Writing debug start" << name() << "...");
-
- if(pass){
- std::cout<<name()<< " event passed \n";
- } else {
- std::cout<<name()<< " event failed \n";
- }
-
- for (auto j : passedJets) {
- auto p4 = j->p4();
- std::cout<<"\nHYPODUMP passed TrigHLTJetHypoTool Et: "
- << p4.Et()
- << " eta "
- << j->eta()
- << " px "
- << p4.Px()
- << " py "
- << p4.Py()
- << " pz "
- << p4.Pz()
- << " E "
- << p4.E()
- << '\n';
- }
-
- for (auto j : failedJets) {
- auto p4 = j->p4();
- std::cout<<"\nHYPODUMP failed TrigHLTJetHypoTool Et: "
- << p4.Et()
- << " eta "
- << j->eta()
- << " px "
- << p4.Px()
- << " py "
- << p4.Py()
- << " pz "
- << p4.Pz()
- << " E "
- << p4.E()
- << '\n';
- }
-
-}
-
-/*
-void TrigHLTJetHypoTool::resetCounters(){
- m_njet = std::numeric_limits<int>::max();
- m_et = std::numeric_limits<double>::max();
- m_eta = std::numeric_limits<double>::max();
- m_phi = std::numeric_limits<double>::max();
-}
-
-void TrigHLTJetHypoTool::accumulateTime(nanoseconds duration) noexcept{
-
- auto dtime = duration_cast<microseconds>(duration);
- auto counts = dtime.count();
- // countssq = counts*counts;
-
- if (m_nCalls == 0){
- m_nCalls = 1;
- m_chainTimeAv = counts;
- // m_chainTimeSquareAv = countssq;
- return;
- }
-
- m_nCalls += 1;
- m_chainTimeAv = (m_chainTimeAv * (m_nCalls - 1) + counts)/m_nCalls;
-*/
-/* error in here somewhere
- m_chainTimeSquareAv +=
- (m_chainTimeSquareAv * (m_nCalls - 1) + countssq)/m_nCalls;
-*/
-/*
-}
-*/
-void TrigHLTJetHypoTool::setConditions() {
- m_conditions = getConditions();
-}
-
-TrigCompositeUtils::DecisionID TrigHLTJetHypoTool::decisionId() const{
- return m_id.numeric();
-}
-
-
-
-/*
-void TrigHLTJetHypoTool::setJetGrouper() {
- m_grouper = getJetGrouper();
-}
-*/
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoTool.h
deleted file mode 100755
index 634da5414ef550264977085f16c1dbcbee1ad39a..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoTool.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_TRIGHLTJETHYPOTOOL_H
-#define TRIGHLTJETHYPO_TRIGHLTJETHYPOTOOL_H
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "TrigHLTJetHypo/ITrigHLTJetHypoTool.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ICleaner.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerBridge.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJetGrouper.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/TrigHLTJetHypoHelper2.h"
-#include "DecisionHandling/HLTIdentifier.h"
-
-#include "xAODJet/Jet.h"
-
-#include <string>
-#include <chrono>
-
-class TrigHLTJetHypoTool : virtual public ITrigHLTJetHypoTool,
-// virtual public AthAlgTool {
- public AthAlgTool {
- public:
- TrigHLTJetHypoTool(const std::string&,
- const std::string&,
- const IInterface* );
-
- // to allow access to the IHelloTool interface
- virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvIf ) override;
- virtual StatusCode initialize() override;
- virtual StatusCode decide(const xAOD::JetContainer*, bool&) const override;
-
- virtual TrigCompositeUtils::DecisionID decisionId() const override;
-
- protected:
-
- // set values provided by sub classes
- void setConditions();
- // void setJetGrouper();
-
- // methods provided by subclasses:
- virtual std::vector<std::shared_ptr<ICleaner>> getCleaners() const = 0;
- virtual std::unique_ptr<IJetGrouper> getJetGrouper() const = 0;
- virtual Conditions getConditions() const = 0;
- virtual StatusCode checkVals() const = 0;
-
- void addCleaner(const CleanerBridge&);
-
- private:
-
- void setCleaners();
-
- void writeDebug(bool,
- const HypoJetVector&,
- const HypoJetVector&) const;
-
- void accumulateTime(std::chrono::nanoseconds) noexcept;
-
- std::string m_chainName; // used for configuration of dimass chains
-
- // Switch to accept all the events.
- bool m_acceptAll{false};
-
- // Switch on Monitoring:
- bool m_doMonitoring{false};
-
- // switch on cleaning
- std::string m_cleaningAlg; // determines cleaner obj
- std::string m_matchingAlg; // determines matcher obj;
-
-
- // Cleaning parameters
- //basic cleaning
- float m_n90Threshold{0.};
- float m_presamplerThreshold{0.};
- float m_hecFThreshold{0.};
- float m_hecQThreshold{0.};
- float m_qmeanThreshold{0.};
- float m_negativeEThreshold{0.};
- float m_emFThreshold{0.};
- float m_larQThreshold{0.};
- //loose cleaning
- float m_fSampMaxLooseThreshold{0.};
- float m_etaLooseThreshold{0.};
- float m_emfLowLooseThreshold{0.};
- float m_emfHighLooseThreshold{0.};
- float m_hecfLooseThreshold{0.};
- //Tight cleaning
- float m_fSampMaxTightThreshold{0.};
- float m_etaTightThreshold{0.};
- float m_emfLowTightThreshold{0.};
- float m_emfHighTightThreshold{0.};
- float m_hecfTightThreshold{0.};
- //Long-lived particle cleaning
- float m_fSampMaxLlpThreshold{0.};
- float m_negELlpThreshold{0.};
- float m_hecfLlpThreshold{0.};
- float m_hecqLlpThreshold{0.};
- float m_avLarQFLlpThreshold{0.};
-
- HLT::Identifier m_id;
-
- std::vector<CleanerBridge> m_cleaners;
- // std::shared_ptr<IJetGrouper> m_grouper;
- Conditions m_conditions;
-
- double m_chainTimeAv{0.}; //std::chrono
- // double m_chainTimeSquareAv{0.}; //std::chrono
- unsigned int m_nCalls{0};
-
- bool m_dumpJets{false};
-};
-
-std::vector<double> getEtThresholds(const std::vector<double>& dEtas,
- const std::vector<double>& etThresholds);
-
-
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_DijetMassDEtaTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_DijetMassDEtaTool.cxx
deleted file mode 100644
index 7f8f3f5aad0cc401c2508c8c47ef4b138b069aaf..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_DijetMassDEtaTool.cxx
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ********************************************************************
-//
-// NAME: TrigHLTJet_DijetMassDEtaTool.cxx
-// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
-//
-// AUTHOR: P Sherwood
-//
-// ********************************************************************
-
-#include "GaudiKernel/StatusCode.h"
-#include "TrigHLTJetHypo_DijetMassDEtaTool.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/conditionsFactory2.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsSorter.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h"
-
-
-TrigHLTJetHypo_DijetMassDEtaTool::TrigHLTJetHypo_DijetMassDEtaTool(const std::string& type,
- const std::string& name,
- const IInterface* parent):
- TrigHLTJetHypoTool(type, name, parent) {
-
- declareProperty("EtThresholds", m_EtThresholds );
- declareProperty("dEta_mins", m_dEtaMins);
- declareProperty("dEta_maxs", m_dEtaMaxs);
- declareProperty("eta_mins", m_etaMins);
- declareProperty("eta_maxs", m_etaMaxs);
- declareProperty("mass_mins", m_massMins);
- declareProperty("mass_maxs", m_massMaxs);
- declareProperty("asymmetricEtas", m_asymmetricEtas);
-}
-
-TrigHLTJetHypo_DijetMassDEtaTool::~TrigHLTJetHypo_DijetMassDEtaTool(){
-}
-
-
- Conditions TrigHLTJetHypo_DijetMassDEtaTool::getConditions() const {
-
- // emulate old behaviour of TriggerMenu to set the min Et for the jets.
- // These limits are being set in the C++ code to discourage
- // firther changes. A new hypo strategy is under development to replce this
- // one.
- auto dmax = std::numeric_limits<double>::max();
-
- std::vector<double> etaMins {0., 0.}; // default from the run 1 hypo
- std::vector<double> etaMaxs {dmax, dmax}; // C++ default from Run 1
- std::vector<double> etThresholds = getEtThresholds(m_dEtaMins,
- m_EtThresholds);
- ATH_MSG_DEBUG("in setDijetMassDEtaConditions dEtamins:");
- for(auto em : m_dEtaMins){ATH_MSG_DEBUG(em);}
- ATH_MSG_DEBUG("in setDijetMassDEtaConditions m_EtThresholds:");
- for(auto et : m_EtThresholds){ATH_MSG_DEBUG(et);}
- ATH_MSG_DEBUG("in setDijetMassDEtaConditions etThresholds:");
- for(auto et : etThresholds){ATH_MSG_DEBUG(et);}
-
-
- auto conditions = conditionsFactoryDijetEtaMass(etaMins, etaMaxs,
- etThresholds,
- m_dEtaMins, m_dEtaMaxs,
- m_massMins, m_massMaxs);
-
- std::sort(conditions.begin(), conditions.end(), ConditionsSorter());
- return conditions;
- }
-
-
-
-std::unique_ptr<IJetGrouper> TrigHLTJetHypo_DijetMassDEtaTool::getJetGrouper() const{
-
- return std::make_unique<CombinationsGrouper>(2);
-}
-
-
-StatusCode TrigHLTJetHypo_DijetMassDEtaTool::checkVals() const {
-
- if (m_EtThresholds.size() != m_etaMins.size() or
- m_EtThresholds.size() != m_etaMaxs.size() or
- m_asymmetricEtas.size() != m_etaMaxs.size()){
-
- ATH_MSG_ERROR(name()
- << ": mismatch between number of thresholds "
- << "and eta min, max boundaries or asymmetric eta flags: "
- << m_EtThresholds.size() << " "
- << m_etaMins.size() << " "
- << m_etaMaxs.size() << " "
- << m_asymmetricEtas.size() << " "
- );
-
- return StatusCode::FAILURE;
- }
-
- bool multOK = m_EtThresholds.size() > 1;
- bool ystarOK = (m_dEtaMins.size() < 2);
- bool massOK = (m_massMins.size() < 2);
- bool atLeastOne = m_dEtaMins.size() > 0 or m_massMins.size() > 0;
-
- if (not multOK){
- ATH_MSG_ERROR(name() << ": size error, expect >= 2 ");
- ATH_MSG_ERROR(name() << "Et thresholds " << m_EtThresholds);
- }
-
- if (not ystarOK){
- ATH_MSG_ERROR(name() << ": size error, expect 0 or 1");
- ATH_MSG_ERROR(name() << " dEta_mins " << m_dEtaMins.size());
- ATH_MSG_ERROR(name() << " dEta_maxs " << m_dEtaMaxs.size());
- }
-
- if (not massOK){
- ATH_MSG_ERROR(name() << ": size error, expect 0 or 1");
- ATH_MSG_ERROR(name() << " mass_mins " << m_massMins.size());
- ATH_MSG_ERROR(name() << " mass_maxs " << m_massMaxs.size());
- }
-
-
- if(not atLeastOne){
- ATH_MSG_ERROR(name() << " neither mass nor deta limits given");
- }
-
- return StatusCode(multOK and ystarOK and massOK and atLeastOne);
-}
-
-
-std::vector<std::shared_ptr<ICleaner>>
-TrigHLTJetHypo_DijetMassDEtaTool::getCleaners () const {
- std::vector<std::shared_ptr<ICleaner>> v;
- return v;
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_DijetMassDEtaTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_DijetMassDEtaTool.h
deleted file mode 100644
index 2bc969766d240df696747e64ebe60dbfef3a3d3f..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_DijetMassDEtaTool.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_DIJETMASSDETATOOL_H
-#define TRIGHLTJETHYPO_DIJETMASSDETATOOL_H
-/********************************************************************
- *
- * NAME: Trighltjethypo_DijetMassDetaTool.h
- * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
- *
- * AUTHOR: P. Sherwood
- *
- *
- *********************************************************************/
-
-#include "TrigHLTJetHypoTool.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
-
-class TrigHLTJetHypo_DijetMassDEtaTool : virtual public ITrigHLTJetHypoTool,
- public TrigHLTJetHypoTool {
-
- public:
-
- TrigHLTJetHypo_DijetMassDEtaTool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
-
- ~TrigHLTJetHypo_DijetMassDEtaTool();
-
-
- std::vector<std::shared_ptr<ICleaner>> getCleaners() const override;
- Conditions getConditions() const override;
- std::unique_ptr<IJetGrouper> getJetGrouper() const override;
-
- private:
-
- std::vector<double> m_EtThresholds;
- std::vector<double> m_etaMins;
- std::vector<double> m_etaMaxs;
- std::vector<int> m_asymmetricEtas;
- std::vector<double> m_massMins;
- std::vector<double> m_massMaxs;
- std::vector<double> m_dEtaMins;
- std::vector<double> m_dEtaMaxs;
-
- StatusCode checkVals() const override;
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_EtaEtTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_EtaEtTool.cxx
deleted file mode 100644
index c58ba37642ed303d77c5a1c76acf2f140a8f46cd..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_EtaEtTool.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ********************************************************************
-//
-// NAME: TrigHLTJet_EtaEtTool.cxx
-// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
-//
-// AUTHOR: P Sherwood
-//
-// ********************************************************************
-
-#include "TrigHLTJetHypo_EtaEtTool.h"
-
-#include "GaudiKernel/StatusCode.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/conditionsFactory2.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsSorter.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h"
-
-
-TrigHLTJetHypo_EtaEtTool::TrigHLTJetHypo_EtaEtTool(const std::string& type,
- const std::string& name,
- const IInterface* parent):
- TrigHLTJetHypoTool(type, name, parent) {
-
- declareProperty("EtThresholds", m_EtThresholds ); // Default: 40 GeV
- declareProperty("eta_mins", m_etaMins);
- declareProperty("eta_maxs", m_etaMaxs);
- declareProperty("asymmetricEtas", m_asymmetricEtas);
-}
-
-
-TrigHLTJetHypo_EtaEtTool::~TrigHLTJetHypo_EtaEtTool(){
-}
-
-
-Conditions TrigHLTJetHypo_EtaEtTool::getConditions() const {
- auto conditions = conditionsFactoryEtaEt(m_etaMins,
- m_etaMaxs,
- m_EtThresholds,
- m_asymmetricEtas);
- std::sort(conditions.begin(), conditions.end(), ConditionsSorter());
-
- return conditions;
- }
-
-
-std::unique_ptr<IJetGrouper> TrigHLTJetHypo_EtaEtTool::getJetGrouper() const {
- return std::make_unique<SingleJetGrouper>();
-}
-
-StatusCode TrigHLTJetHypo_EtaEtTool::checkVals() const {
- if (m_EtThresholds.size() != m_etaMins.size() or
- m_EtThresholds.size() != m_etaMaxs.size() or
- m_asymmetricEtas.size() != m_etaMaxs.size()){
-
- ATH_MSG_ERROR(name()
- << ": mismatch between number of thresholds "
- << "and eta min, max boundaries or asymmetric eta flags: "
- << m_EtThresholds.size() << " "
- << m_etaMins.size() << " "
- << m_etaMaxs.size() << " "
- << m_asymmetricEtas.size() << " "
- );
-
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-std::vector<std::shared_ptr<ICleaner>>
-TrigHLTJetHypo_EtaEtTool::getCleaners() const {
- std::vector<std::shared_ptr<ICleaner>> v;
- return v;
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_EtaEtTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_EtaEtTool.h
deleted file mode 100644
index bda15ca57adc896769b72ecbb8224a14512f6ba9..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_EtaEtTool.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_ETAETTOOL_H
-#define TRIGHLTJETHYPO_ETAETTOOL_H
-/********************************************************************
- *
- * NAME: Trighltjethypo_EtaEtTool.h
- * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
- *
- * AUTHOR: P. Sherwood
- *
- *
- *********************************************************************/
-
-#include "TrigHLTJetHypoTool.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
-
-class TrigHLTJetHypo_EtaEtTool: virtual public ITrigHLTJetHypoTool,
- public TrigHLTJetHypoTool {
- public:
-
- TrigHLTJetHypo_EtaEtTool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
- ~TrigHLTJetHypo_EtaEtTool();
-
- std::vector<std::shared_ptr<ICleaner>> getCleaners() const override;
- std::unique_ptr<IJetGrouper> getJetGrouper() const override;
- Conditions getConditions() const override;
-
- private:
- // vectors with Et thresholds, eta mins and eta maxs
- // (thresh, eta min, eta max) triplets will be converted to Conditon objs.
- std::vector<double> m_EtThresholds;
- std::vector<double> m_etaMins;
- std::vector<double> m_etaMaxs;
- std::vector<int> m_asymmetricEtas;
-
- StatusCode checkVals() const override;
-
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_SMCTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_SMCTool.cxx
deleted file mode 100644
index 04beb2e0a94b429f19b837fe6e4027ff926624fd..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_SMCTool.cxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ********************************************************************
-//
-// NAME: TrigHLTJet_SMCTool.cxx
-// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
-//
-//
-// ********************************************************************
-
-#include "GaudiKernel/StatusCode.h"
-#include "TrigHLTJetHypo_SMCTool.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/conditionsFactory2.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsSorter.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h"
-
-
-TrigHLTJetHypo_SMCTool::TrigHLTJetHypo_SMCTool(const std::string& type,
- const std::string& name,
- const IInterface* parent):
- TrigHLTJetHypoTool(type, name, parent) {
-
- declareProperty("EtThresholds", m_EtThresholds );
- declareProperty("eta_mins", m_etaMins);
- declareProperty("eta_maxs", m_etaMaxs);
- declareProperty("asymmetricEtas", m_asymmetricEtas);
- declareProperty("smc_mins", m_JetMassMin );
- declareProperty("smc_maxs", m_JetMassMax);
-}
-
-
-TrigHLTJetHypo_SMCTool::~TrigHLTJetHypo_SMCTool(){
-}
-
-
-Conditions TrigHLTJetHypo_SMCTool::getConditions() const {
-
- std::vector<double> JetMassMin_d = getStringBoundaries(m_JetMassMin);
- std::vector<double> JetMassMax_d = getStringBoundaries(m_JetMassMax);
-
- auto conditions = conditionsFactorysinglemass(m_etaMins,
- m_etaMaxs,
- m_EtThresholds,
- JetMassMin_d,
- JetMassMax_d);
- std::sort(conditions.begin(), conditions.end(), ConditionsSorter());
-
- return conditions;
-}
-
-std::vector<double> TrigHLTJetHypo_SMCTool::getStringBoundaries (const std::vector<std::string>& stv) const {
-
- std::vector<double> JetMassLimit;
-
- for (auto st : stv){
-
- if (st.find("-INF") != std::string::npos) {JetMassLimit.push_back(std::numeric_limits<double>::lowest());}
-
- else if (st.find("INF") != std::string::npos) {JetMassLimit.push_back(std::numeric_limits<double>::max());}
-
- else {JetMassLimit.push_back(std::stod(st)*s_GeV);}
-
- }
-
- return JetMassLimit;
-
-}
-
-
-
-std::unique_ptr<IJetGrouper> TrigHLTJetHypo_SMCTool::getJetGrouper() const {
- return std::make_unique<SingleJetGrouper>();
-}
-
-StatusCode TrigHLTJetHypo_SMCTool::checkVals() const {
-
- if (m_EtThresholds.size() != m_etaMins.size() or
- m_EtThresholds.size() != m_etaMaxs.size() or
- m_JetMassMin.size() != m_EtThresholds.size() or
- m_JetMassMax.size() != m_EtThresholds.size()) {
-
- ATH_MSG_ERROR(name()
- << ": mismatch between number of thresholds, "
- << " eta_min, eta_max, JetMassMin, JetMassMax boundaries: "
- << m_EtThresholds.size() << " "
- << m_etaMins.size() << " "
- << m_etaMaxs.size() << " "
- << m_JetMassMin.size() << " "
- << m_JetMassMin.size() << " "
- );
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-std::vector<std::shared_ptr<ICleaner>> TrigHLTJetHypo_SMCTool::getCleaners() const {
- std::vector<std::shared_ptr<ICleaner>> v;
- return v;
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_SMCTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_SMCTool.h
deleted file mode 100644
index 2edc08655cf18c924754a814bc64fd78ce3b3b2a..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_SMCTool.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_SMCTOOL_H
-#define TRIGHLTJETHYPO_SMCTOOL_H
-/********************************************************************
- *
- * NAME: Trighltjethypo_SMC.h
- * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
- *
- * AUTHOR: G. Marceca
- *
- *
- *********************************************************************/
-
-#include "TrigHLTJetHypoTool.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
-
-class TrigHLTJetHypo_SMCTool : public TrigHLTJetHypoTool {
-
- public:
-
- TrigHLTJetHypo_SMCTool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
- ~TrigHLTJetHypo_SMCTool();
-
- std::vector<std::shared_ptr<ICleaner>> getCleaners() const override;
- std::unique_ptr<IJetGrouper> getJetGrouper() const override;
- Conditions getConditions() const override;
- StatusCode checkVals() const override;
-
- std::vector<double> getStringBoundaries (const std::vector<std::string>& stv) const;
-
- private:
- // vectors with Et thresholds, eta mins, eta maxs, mass min and mass max
- // (thresh, eta min, eta max, mass min, mass max) triplets will bbe converted to Conditon objs.
- std::vector<double> m_EtThresholds;
- std::vector<double> m_etaMins;
- std::vector<double> m_etaMaxs;
- std::vector<std::string> m_JetMassMin;
- std::vector<std::string> m_JetMassMax;
- std::vector<int> m_asymmetricEtas;
-
- static constexpr float s_GeV = 1000.;
-
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_TLATool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_TLATool.cxx
deleted file mode 100644
index caa94c1ed0380c742d6df0bba538af039e70b36e..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_TLATool.cxx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ********************************************************************
-//
-// NAME: TrigHLTJet_TLATool.cxx
-// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
-//
-// AUTHOR: P Sherwood
-//
-// ********************************************************************
-
-#include "GaudiKernel/StatusCode.h"
-#include "TrigHLTJetHypo_TLATool.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/conditionsFactory2.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsSorter.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IndexedJetsGrouper.h"
-
-
-TrigHLTJetHypo_TLATool::TrigHLTJetHypo_TLATool(const std::string& type,
- const std::string& name,
- const IInterface* parent):
- TrigHLTJetHypoTool(type, name, parent) {
-
-
- //TLA style jet indices
- declareProperty("ystar_mins", m_ystarMins);
- declareProperty("ystar_maxs", m_ystarMaxs);
- declareProperty("eta_mins", m_etaMins);
- declareProperty("eta_maxs", m_etaMaxs);
- declareProperty("mass_mins", m_massMins);
- declareProperty("mass_maxs", m_massMaxs);
- declareProperty("jetvec_indices", m_jetvec_indices);
-}
-
-TrigHLTJetHypo_TLATool::~TrigHLTJetHypo_TLATool(){
-}
-
-
-Conditions TrigHLTJetHypo_TLATool::getConditions() const {
-
-
- auto conditions = conditionsFactoryTLA(m_etaMins, m_etaMaxs,
- m_ystarMins, m_ystarMaxs,
- m_massMins, m_massMaxs);
-
- std::sort(conditions.begin(), conditions.end(), ConditionsSorter());
- return conditions;
- }
-
-
-std::unique_ptr<IJetGrouper> TrigHLTJetHypo_TLATool::getJetGrouper() const {
- return std::make_unique<IndexedJetsGrouper>(m_jetvec_indices);
-}
-
-
-StatusCode TrigHLTJetHypo_TLATool::checkVals() const {
-
- if (1 != m_etaMins.size() or
- 1 != m_etaMaxs.size() or
- 1 != m_ystarMins.size() or
- 1 != m_ystarMaxs.size() or
- 1 != m_massMins.size() or
- 1 != m_massMaxs.size()){
-
-
- ATH_MSG_ERROR(name()
- << ": size != 1: "
- << "eta_mins" << m_etaMins.size() << " "
- << "eta_maxs" << m_etaMaxs.size() << " "
- << "ystar_mins" << m_ystarMins.size() << " "
- << "ystar_maxs" << m_ystarMaxs.size() << " "
- << "mass_mins" << m_massMins.size() << " "
- << "mass_maxs" << m_massMaxs.size());
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-std::vector<std::shared_ptr<ICleaner>> TrigHLTJetHypo_TLATool::getCleaners () const {
- std::vector<std::shared_ptr<ICleaner>> v;
- return v;
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_TLATool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_TLATool.h
deleted file mode 100644
index ac5169e041941454c9c6e0c7caa5b0a30907879c..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypo_TLATool.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_TLATOOL_H
-#define TRIGHLTJETHYPO_TLATOOL_H
-/********************************************************************
- *
- * NAME: Trighltjethypo_TLATool.h
- * PACKAGE: Trigger/TrigHypothesisg/TrigHLTJetHypo
- *
- * AUTHOR: P. Sherwood
- *
- *
- *********************************************************************/
-
-#include "TrigHLTJetHypoTool.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
-
-class TrigHLTJetHypo_TLATool : virtual public ITrigHLTJetHypoTool,
- public TrigHLTJetHypoTool {
-
- public:
-
- TrigHLTJetHypo_TLATool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
- ~TrigHLTJetHypo_TLATool();
-
- std::vector<std::shared_ptr<ICleaner>> getCleaners() const override;
- std::unique_ptr<IJetGrouper> getJetGrouper() const override;
- Conditions getConditions() const override;
- StatusCode checkVals() const override;
-
- private:
-
- // vector of indices find ofssets into the jet vector,
- // and other Condition variables used for TLA style hypos.
- std::vector<double> m_ystarMins;
- std::vector<double> m_ystarMaxs;
- std::vector<double> m_massMins;
- std::vector<double> m_massMaxs;
- std::vector<double> m_etaMins;
- std::vector<double> m_etaMaxs;
- std::vector<unsigned int> m_jetvec_indices; //indexed jets
-
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool_EtaEt.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool_EtaEt.cxx
deleted file mode 100644
index 198ddd0f446d7c4fbd3b20f50229069fed9a4ee1..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool_EtaEt.cxx
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ********************************************************************
-//
-// NAME: TrigHLTJet_EtaEtTool.cxx
-// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
-//
-// AUTHOR: P Sherwood
-//
-// ********************************************************************
-
-#include "TrigJetHypoTool_EtaEt.h"
-
-#include "GaudiKernel/StatusCode.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/conditionsFactory2.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsSorter.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/SingleJetGrouper.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/groupsMatcherFactory.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h"
-
-TrigJetHypoTool_EtaEt::TrigJetHypoTool_EtaEt(const std::string& name):
- asg::AsgTool(name), m_id(name) {
-
- declareProperty("EtThresholds", m_EtThresholds );
- declareProperty("eta_mins", m_etaMins);
- declareProperty("eta_maxs", m_etaMaxs);
- declareProperty("asymmetricEtas", m_asymmetricEtas);
-
-
- declareProperty("AcceptAll", m_acceptAll=false);
- declareProperty("chain_name", m_chainName="Unknown");
-
- // cleaning
- declareProperty("cleaningAlg", m_cleaningAlg = "noCleaning");
-
- // matching. Legal: maximumBipartite, orderedCollections, selectedJets
- declareProperty("matchingAlg", m_matchingAlg = "maximumBipartite");
-
- //basic cleaning
- declareProperty("n90CleaningThreshold", m_n90Threshold = 2 );
- declareProperty("presamplerCleaningThreshold", m_presamplerThreshold = 0.9 );
- declareProperty("negativeECleaningThreshold", m_negativeEThreshold = -60e3 ); // 60 GeV
- declareProperty("qmeanCleaningThreshold", m_qmeanThreshold = 0.8 );
- declareProperty("HECQCleaningThreshold", m_hecQThreshold = 0.5 );
- declareProperty("HECfCleaningThreshold", m_hecFThreshold = 0.5 );
- declareProperty("LArQCleaningThreshold", m_larQThreshold = 0.8 );
- declareProperty("EMfCleaningThreshold", m_emFThreshold = 0.95 );
- //loose cleaning
- declareProperty("fracSamplingMaxLooseThreshold", m_fSampMaxLooseThreshold = 0.8 );
- declareProperty("etaLooseThreshold", m_etaLooseThreshold = 2.0 );
- declareProperty("EMfLowLooseThreshold", m_emfLowLooseThreshold = 0.10 );
- declareProperty("EMfHighLooseThreshold", m_emfHighLooseThreshold = 0.99 );
- declareProperty("HECfLooseThreshold", m_hecfLooseThreshold = 0.85 );
- //tight cleaning
- declareProperty("fracSamplingMaxTightThreshold", m_fSampMaxTightThreshold = 0.8 );
- declareProperty("etaTightThreshold", m_etaTightThreshold = 2.0 );
- declareProperty("EMfLowTightThreshold", m_emfLowTightThreshold = 0.10 );
- declareProperty("EMfHighTightThreshold", m_emfHighTightThreshold = 0.99 );
- declareProperty("HECfTightThreshold", m_hecfTightThreshold = 0.85 );
- //long-lived particle cleaning
- declareProperty("fracSamplingMaxLlpThreshold", m_fSampMaxLlpThreshold = 0.85 );
- declareProperty("negativeELlpThreshold", m_negELlpThreshold = 10e3 ); // 10 GeV
- declareProperty("HECfLlpThreshold", m_hecfLlpThreshold = 0.5 );
- declareProperty("HECQLlpThreshold", m_hecqLlpThreshold = 0.5 );
- declareProperty("AverageLArQFLlpThreshold",
- m_avLarQFLlpThreshold = 0.8*65535);
-
-
- // Monitored variables...
- /*
- declareMonitoredVariable("NJet", m_njet);
- declareMonitoredVariable("Et", m_et);
- declareMonitoredVariable("Eta", m_eta);
- declareMonitoredVariable("Phi", m_phi);
- */
-}
-
-
-TrigJetHypoTool_EtaEt::~TrigJetHypoTool_EtaEt(){
-}
-
-StatusCode TrigJetHypoTool_EtaEt::initialize(){
- return StatusCode::SUCCESS;
-}
-
-StatusCode TrigJetHypoTool_EtaEt::finalize(){
- return StatusCode::SUCCESS;
-}
-
-StatusCode TrigJetHypoTool_EtaEt::decide(const xAOD::JetContainer* jets,
- bool& pass) const{
-
- HypoJetVector hypoJets(jets->size());
-
- std::transform(jets -> begin(),
- jets -> end(),
- hypoJets.begin(),
- xAODJetAsIJetFactory());
-
- // make a new CleanerMatcher every event
- auto matcher = groupsMatcherFactory(m_conditions);
- auto grouper = getJetGrouper();
- auto helper = TrigHLTJetHypoHelper2(m_cleaners,
- std::move(grouper),
- std::move(matcher));
-
- /* apply cleaning and hypothesis alg */
- ATH_MSG_DEBUG("hypo helper start... " << m_chainName
- << " no of jets ... "
- << jets->size()
- << "...");
-
- // steady_clock::time_point t = steady_clock::now();
-
- try{
- pass = !jets->empty() && (m_acceptAll || helper.pass(hypoJets));
- } catch(std::exception& e){
- ATH_MSG_ERROR("Exception raised by the TrigHLTJetHypoHelper2: "
- << e.what());
- return StatusCode::FAILURE;
- }
-
- // accumulateTime(steady_clock::now() - t);
-
- ATH_MSG_DEBUG("hypo testing done chain " << m_chainName
- << " no of input jets " << jets->size()
- << " pass " << pass );
-
- if(m_dumpJets){writeDebug(pass, helper.passedJets(), helper.failedJets());}
-
- // delete the xAOD::Jet wrappers
- for(auto i : hypoJets){delete i;}
-
- return StatusCode::SUCCESS;
-}
-
-
-
-Conditions TrigJetHypoTool_EtaEt::getConditions() const {
- auto conditions = conditionsFactoryEtaEt(m_etaMins,
- m_etaMaxs,
- m_EtThresholds,
- m_asymmetricEtas);
- std::sort(conditions.begin(), conditions.end(), ConditionsSorter());
-
- return conditions;
-}
-
-
-std::unique_ptr<IJetGrouper> TrigJetHypoTool_EtaEt::getJetGrouper() const {
- return std::make_unique<SingleJetGrouper>();
-}
-
-StatusCode TrigJetHypoTool_EtaEt::checkVals() const {
- if (m_EtThresholds.size() != m_etaMins.size() or
- m_EtThresholds.size() != m_etaMaxs.size() or
- m_asymmetricEtas.size() != m_etaMaxs.size()){
-
- ATH_MSG_ERROR(name()
- << ": mismatch between number of thresholds "
- << "and eta min, max boundaries or asymmetric eta flags: "
- << m_EtThresholds.size() << " "
- << m_etaMins.size() << " "
- << m_etaMaxs.size() << " "
- << m_asymmetricEtas.size() << " "
- );
-
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-std::vector<std::shared_ptr<ICleaner>>
-TrigJetHypoTool_EtaEt::getCleaners() const {
- std::vector<std::shared_ptr<ICleaner>> v;
- return v;
-}
-
-
-void TrigJetHypoTool_EtaEt::setCleaners() {
-
- if (m_cleaningAlg != "noCleaning"){
-
- CleanerFactory cleanerFactory(//basic cleaning
- m_n90Threshold,
- m_presamplerThreshold,
- m_negativeEThreshold,
- //loose cleaning
- m_fSampMaxLooseThreshold,
- m_etaLooseThreshold,
- m_emfLowLooseThreshold,
- m_emfHighLooseThreshold,
- m_hecfLooseThreshold,
- //tight cleaning
- m_fSampMaxTightThreshold,
- m_etaTightThreshold,
- m_emfLowTightThreshold,
- m_emfHighTightThreshold,
- m_hecfTightThreshold,
- //long-lived particle cleaning
- m_fSampMaxLlpThreshold,
- m_negELlpThreshold,
- m_hecfLlpThreshold,
- m_hecqLlpThreshold,
- m_avLarQFLlpThreshold,
- m_cleaningAlg);
-
- m_cleaners.push_back(cleanerFactory.make());
- }
-
- auto cleaners = getCleaners(); // sub class supplied cleaners
- m_cleaners.insert(m_cleaners.end(), cleaners.begin(), cleaners.end());
- ATH_MSG_INFO("No of Cleaners " << m_cleaners.size());
-}
-
-void TrigJetHypoTool_EtaEt::writeDebug(bool pass,
- const HypoJetVector& passedJets,
- const HypoJetVector& failedJets
- ) const{
- ATH_MSG_INFO("Writing debug start" << m_chainName << "...");
-
- if(pass){
- std::cout<<m_chainName<< " event passed \n";
- } else {
- std::cout<<m_chainName<< " event failed \n";
- }
-
- for (auto j : passedJets) {
- auto p4 = j->p4();
- std::cout<<"\nHYPODUMP passed TrigJetHypoToolImp Et: "
- << p4.Et()
- << " eta "
- << j->eta()
- << " px "
- << p4.Px()
- << " py "
- << p4.Py()
- << " pz "
- << p4.Pz()
- << " E "
- << p4.E()
- << '\n';
- }
-
- for (auto j : failedJets) {
- auto p4 = j->p4();
- std::cout<<"\nHYPODUMP failed TrigJetHypoToolImp Et: "
- << p4.Et()
- << " eta "
- << j->eta()
- << " px "
- << p4.Px()
- << " py "
- << p4.Py()
- << " pz "
- << p4.Pz()
- << " E "
- << p4.E()
- << '\n';
- }
-
-}
-
-
-TrigCompositeUtils::DecisionID TrigJetHypoTool_EtaEt::decisionId() const{
- return m_id.numeric();
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool_EtaEt.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool_EtaEt.h
deleted file mode 100644
index 64d83ab9ab042c32d98e9007e369632f60f19c69..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoTool_EtaEt.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGJETHYPOTOOL_ETAET_H
-#define TRIGJETHYPOTOOL_ETAET_H
-/********************************************************************
- *
- * NAME: TrigJetHypo_EtaEtTool.h
- * PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
- *
- * AUTHOR: P. Sherwood
- *
- *
- *********************************************************************/
-
-#include "AsgTools/AsgTool.h"
-#include "TrigHLTJetHypo/ITrigJetHypoTool.h"
-#include "TrigHLTJetHypoTool.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/ConditionsDefs.h"
-#include "DecisionHandling/HLTIdentifier.h"
-
-
-class TrigJetHypoTool_EtaEt:
-public asg::AsgTool, virtual public ITrigJetHypoTool{
-ASG_TOOL_CLASS(TrigJetHypoTool_EtaEt, ITrigJetHypoTool)
-
-public:
-
-TrigJetHypoTool_EtaEt(const std::string& name);
-virtual ~TrigJetHypoTool_EtaEt() override;
-virtual StatusCode initialize() override;
-virtual StatusCode finalize() override;
-
- // ITrigJetHypo interface
-virtual StatusCode decide(const xAOD::JetContainer*, bool&) const override;
-virtual TrigCompositeUtils::DecisionID decisionId() const override;
-
-
- private:
-// vectors with Et thresholds, eta mins and eta maxs
-// (thresh, eta min, eta max) triplets will be converted to Conditon objs.
-std::vector<double> m_EtThresholds;
-std::vector<double> m_etaMins;
-std::vector<double> m_etaMaxs;
-std::vector<int> m_asymmetricEtas;
-bool m_acceptAll;
-std::string m_chainName;
-std::string m_matchingAlg; // determines matcher obj;
-
-Conditions m_conditions;
-
-bool m_dumpJets{false};
-
-HLT::Identifier m_id;
-
-StatusCode checkVals() const;
-std::vector<std::shared_ptr<ICleaner>> getCleaners() const;
-std::unique_ptr<IJetGrouper> getJetGrouper() const;
-Conditions getConditions() const;
-void setCleaners();
-
-void writeDebug(bool,
- const HypoJetVector&,
- const HypoJetVector&) const;
-
-
-
-private:
-
-std::vector<CleanerBridge> m_cleaners;
-std::string m_cleaningAlg;
-
-// Cleaning parameters
-//basic cleaning
-float m_n90Threshold{0.};
-float m_presamplerThreshold{0.};
-float m_hecFThreshold{0.};
-float m_hecQThreshold{0.};
-float m_qmeanThreshold{0.};
-float m_negativeEThreshold{0.};
-float m_emFThreshold{0.};
-float m_larQThreshold{0.};
-//loose cleaning
-float m_fSampMaxLooseThreshold{0.};
-float m_etaLooseThreshold{0.};
-float m_emfLowLooseThreshold{0.};
-float m_emfHighLooseThreshold{0.};
-float m_hecfLooseThreshold{0.};
-//Tight cleaning
-float m_fSampMaxTightThreshold{0.};
-float m_etaTightThreshold{0.};
-float m_emfLowTightThreshold{0.};
-float m_emfHighTightThreshold{0.};
-float m_hecfTightThreshold{0.};
-//Long-lived particle cleaning
-float m_fSampMaxLlpThreshold{0.};
-float m_negELlpThreshold{0.};
-float m_hecfLlpThreshold{0.};
-float m_hecqLlpThreshold{0.};
-float m_avLarQFLlpThreshold{0.};
-
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
index ae11950e5f222d8f6880732ae220fac2a61eda35..961cda808e279f60c26ca29ea9f705ad72b78b79 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
@@ -4,12 +4,7 @@
#include "TrigHLTJetHypo/TrigEFDPhiMetJetAllTE.h"
// #include "TrigHLTJetHypo/TrigHLTJetHypo_HT.h"
-#include "../TrigHLTJetHypo_EtaEtTool.h"
-#include "../TrigHLTJetHypo_DijetMassDEtaTool.h"
-#include "../TrigHLTJetHypo_SMCTool.h"
-#include "../TrigHLTJetHypo_TLATool.h"
#include "../TrigJetHypoAlg.h"
-#include "../TrigJetHypoTool_EtaEt.h"
#include "../TrigJetHypoToolConfig_EtaEt.h"
#include "../TrigJetHypoToolMT.h"
@@ -20,13 +15,5 @@ DECLARE_COMPONENT( TrigJetHypoAlg )
DECLARE_COMPONENT( TrigEFRazorAllTE )
DECLARE_COMPONENT( TrigEFDPhiMetJetAllTE )
-DECLARE_COMPONENT( TrigHLTJetHypo_EtaEtTool )
-DECLARE_COMPONENT( TrigHLTJetHypo_DijetMassDEtaTool )
-DECLARE_COMPONENT( TrigHLTJetHypo_SMCTool )
-DECLARE_COMPONENT( TrigHLTJetHypo_TLATool )
-
-
-DECLARE_COMPONENT( TrigJetHypoTool_EtaEt )
-
DECLARE_COMPONENT(TrigJetHypoToolMT)
DECLARE_COMPONENT(TrigJetHypoToolConfig_EtaEt)