diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/CMakeLists.txt b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/CMakeLists.txt
index 713db11f8e6eebbbeba291ee1fd251ce3e340f46..c80df8fdb43a0e9ea4d13d2a52dbea800a40ce17 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/CMakeLists.txt
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_add_library( TopObjectSelectionTools
TriggerAnalysisInterfaces JetAnalysisInterfacesLib AssociationUtilsLib
TrigConfInterfaces TrigDecisionToolLib TriggerMatchingToolLib
TrigTauMatchingLib InDetTrackSelectionToolLib ElectronPhotonSelectorToolsLib
- JetReclusteringLib TauAnalysisToolsLib TopEvent TopConfiguration
+ TauAnalysisToolsLib TopEvent TopConfiguration
TopSystematicObjectMaker
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODEventInfo xAODMissingET
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/RCJetMC15.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/RCJetMC15.cxx
deleted file mode 100644
index d15dfe6b45f9c11b47663857c140d53b32578587..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/RCJetMC15.cxx
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**************************************************************
-//
-// Created: 19 January 2016
-// Last Updated: 22 February 2016
-//
-// Daniel Marley
-// demarley@umich.edu
-// University of Michigan, Ann Arbor, MI
-//
-// File for initializing and making re-clustered jets.
-//
-***************************************************************/
-#include "TopObjectSelectionTools/RCJetMC15.h"
-
-#include "TopConfiguration/TopConfig.h"
-#include "AsgTools/AsgTool.h"
-#include "AthContainers/ConstDataVector.h"
-
-#include "xAODJet/JetContainer.h"
-#include "xAODJet/JetAuxContainer.h"
-#include "xAODEventInfo/EventInfo.h"
-#include "xAODCore/ShallowCopy.h"
-#include "xAODBase/IParticleHelpers.h"
-#include "PATInterfaces/SystematicsUtil.h"
-
-
-
-RCJetMC15::RCJetMC15( const std::string& name ) :
- asg::AsgTool( name ),
- m_name(name),
- m_config(nullptr),
- m_ptcut(0.),
- m_etamax(0.),
- m_trim(0.),
- m_radius(0.),
- m_minradius(0.),
- m_massscale(0.),
- m_egamma("EG_"),
- m_jetsyst("JET_"),
- m_muonsyst("MUONS_"),
- m_InJetContainerBase( "AntiKt4EMTopoJets_RC"),
- m_OutJetContainerBase("AntiKtRCJets"),
- m_InputJetContainer( "AntiKt4EMTopoJets_RC"),
- m_OutputJetContainer( "AntiKtRCJets"),
- m_loose_hashValue(2),
- m_unique_syst(false){
- declareProperty( "config" , m_config );
- declareProperty( "VarRCjets", m_VarRCjets=false);
- declareProperty( "VarRCjets_rho", m_VarRCjets_rho="");
- declareProperty( "VarRCjets_mass_scale",m_VarRCjets_mass_scale="");
- }
-
-
-RCJetMC15::~RCJetMC15() {}
-
-
-StatusCode RCJetMC15::initialize(){
- /* Initialize the re-clustered jets */
- ATH_MSG_INFO(" Initializing Re-clustered jets ");
-
- // load the necessary parameters from the Dynamic Keys in the config file
- top::ConfigurationSettings* configSettings = top::ConfigurationSettings::get();
-
- m_name = m_VarRCjets_rho+m_VarRCjets_mass_scale;
- if (m_VarRCjets){
- m_ptcut = std::stof(configSettings->value("VarRCJetPt")); // 100 GeV
- m_etamax = std::stof(configSettings->value("VarRCJetEta")); // 2.5
- m_trim = std::stof(configSettings->value("VarRCJetTrim")); // 0.05 (5% jet pT)
- m_radius = std::stof(configSettings->value("VarRCJetMaxRadius")); // 1.2 (min=0.4)
- m_minradius = 0.4; // 0.4 default (until we have smaller jets!)
- std::string original_rho(m_VarRCjets_rho);
- std::replace( original_rho.begin(), original_rho.end(), '_', '.');
- float rho = std::stof(original_rho);
- float m_scale = mass_scales.at(m_VarRCjets_mass_scale);
- m_massscale = rho*m_scale*1e-3; // e.g., 2*m_top; in [GeV]!
- }
- else{
- m_ptcut = std::stof( configSettings->value("RCJetPt") ); // for initialize [GeV] & passSelection
- m_etamax = std::stof( configSettings->value("RCJetEta") ); // for passSelection
- m_trim = std::stof( configSettings->value("RCJetTrim") ); // for initialize
- m_radius = std::stof( configSettings->value("RCJetRadius") ); // for initialize
- m_minradius = -1.0;
- m_massscale = -1.0;
- }
-
- for (auto treeName : *m_config->systAllTTreeNames()) {
- // only make a new tool if it is the nominal systematic or one that could affect small-r jets (el, mu, jet)
- std::string hash_name("");
-
- if ( isUniqueSyst(treeName.second) ){
-
- if (treeName.second.compare("nominal")!=0) hash_name = treeName.second; // no extra strings for nominal (so all other non-unique systs have same name as nominal)
-
- m_InputJetContainer = m_InJetContainerBase+hash_name+m_name;
- m_OutputJetContainer = m_OutJetContainerBase+hash_name+m_name;
-
- // build a jet re-clustering tool for each case
- JetReclusteringTool* tool = new JetReclusteringTool(treeName.second+m_name);
- top::check(tool->setProperty("InputJetContainer", m_InputJetContainer),"Failed inputjetcontainer initialize reclustering tool");
- top::check(tool->setProperty("OutputJetContainer", m_OutputJetContainer),"Failed outputjetcontainer initialize reclustering tool");
- top::check(tool->setProperty("ReclusterRadius", m_radius),"Failed re-clustering radius initialize reclustering tool");
- top::check(tool->setProperty("RCJetPtMin", m_ptcut*1e-3),"Failed ptmin [GeV] initialize reclustering tool");
- top::check(tool->setProperty("RCJetPtFrac", m_trim),"Failed pT fraction initialize reclustering tool");
- top::check(tool->setProperty("VariableRMinRadius", m_minradius),"Failed VarRC min radius initialize reclustering tool");
- top::check(tool->setProperty("VariableRMassScale", m_massscale),"Failed VarRC mass scale initialize reclustering tool");
- top::check(tool->initialize(),"Failed to initialize reclustering tool");
-
- m_jetReclusteringTool.insert({treeName.first,tool}); // insert the re-clustering tool into map
- // this stores a tool for each systematic based on hash value
-
- // map of container names to access in event saver
- m_inputContainerNames.insert({treeName.first,m_InputJetContainer});
- m_outputContainerNames.insert({treeName.first,m_OutputJetContainer});
-
- // make a re-clustering tool for 'loose' events, too.
- if (m_config->doLooseEvents()){
- JetReclusteringTool* tool_loose = new JetReclusteringTool(treeName.second+m_name+"_Loose");
- top::check(tool_loose->setProperty("InputJetContainer", m_InputJetContainer+"_Loose"),"Failed inputjetcontainer reclustering tool");
- top::check(tool_loose->setProperty("OutputJetContainer", m_OutputJetContainer+"_Loose"),"Failed outputjetcontainer loose initialize reclustering tool");
- top::check(tool_loose->setProperty("ReclusterRadius", m_radius),"Failed re-clustering radius initialize reclustering tool");
- top::check(tool_loose->setProperty("RCJetPtMin", m_ptcut*1e-3),"Failed ptmin [GeV] reclustering tool");
- top::check(tool_loose->setProperty("RCJetPtFrac", m_trim),"Failed pT fraction initialize reclustering tool");
- top::check(tool_loose->setProperty("VariableRMinRadius", m_minradius),"Failed VarRC min radius initialize reclustering tool");
- top::check(tool_loose->setProperty("VariableRMassScale", m_massscale),"Failed VarRC mass scale initialize reclustering tool");
- top::check(tool_loose->initialize(),"Failed to initialize reclustering tool");
-
- m_jetReclusteringTool.insert({m_loose_hashValue*treeName.first,tool_loose}); // making up a number as index for the loose event
- // map of container names to access in event saver
- m_inputContainerNames.insert({m_loose_hashValue*treeName.first,m_InputJetContainer+"_Loose"});
- m_outputContainerNames.insert({m_loose_hashValue*treeName.first,m_OutputJetContainer+"_Loose"});
- } // end if loose
- } // end if unique syst
- else{
-
-
- m_InputJetContainer = m_InJetContainerBase+m_name;
- m_OutputJetContainer = m_OutJetContainerBase+m_name;
-
- // map of container names to access in event saver
- if(m_config->doLooseEvents()){
- m_inputContainerNames.insert({m_loose_hashValue*treeName.first,m_InputJetContainer+"_Loose"});
- m_outputContainerNames.insert({m_loose_hashValue*treeName.first,m_OutputJetContainer+"_Loose"});
- }
- else{
- m_inputContainerNames.insert({treeName.first,m_InputJetContainer});
- m_outputContainerNames.insert({treeName.first,m_OutputJetContainer});
- }
-
- }
- } // end for loop over systematics
-
- ATH_MSG_INFO(" Re-clustered jets initialized ");
-
- return StatusCode::SUCCESS;
-} // end initialize()
-
-
-
-StatusCode RCJetMC15::execute(const top::Event& event) {
- /*
- Make the jet container (if necessary) and execute the re-clustering tool
- https://svnweb.cern.ch/trac/atlasoff/browser/PhysicsAnalysis/TopPhys/xAOD/TopEvent/trunk/Root/TopEventMaker.cxx#L31
- */
- m_InputJetContainer = inputContainerName( event.m_hashValue, event.m_isLoose );
- m_OutputJetContainer = rcjetContainerName( event.m_hashValue, event.m_isLoose );
-
-
- // -- Save the jet container to the TStore (only if it doesn't already exist!)
- // -- Then, we can access it with the re-clustering tool further down
- if (!evtStore()->contains<xAOD::JetContainer>(m_InputJetContainer)) {
- // Save the nominal container once, and each jet systematic container once
- // Make the new jet container (only do this if we have to!)
- // 22 Feb 2016:
- // Code significantly shortened to make this container
- // thanks to email exchange between Davide Gerbaudo & Attila Krasznahorkay
-
- typedef ConstDataVector< xAOD::JetContainer > CJets;
- std::unique_ptr< CJets > rcjets( new CJets( event.m_jets.begin(), event.m_jets.end(), SG::VIEW_ELEMENTS ) );
- top::check( evtStore()->tds()->record( std::move( rcjets ), m_InputJetContainer ), "Failed to put jets in TStore for re-clustering" );
- } // end if jet container exists
-
-
- // --- EXECUTE --- //
- // only execute if the jet container doesn't exist
- // (do not re-make the 'nominal' jet container over & over again!)
- if (!evtStore()->contains<xAOD::JetContainer>(m_OutputJetContainer)) {
- int hash_factor = (event.m_isLoose) ? m_loose_hashValue : 1;
-
- // tools only exist for unique systematics & nominal (save time/space)!
- m_tool_iterator tool_iter = m_jetReclusteringTool.find( hash_factor*event.m_hashValue );
-
- // if this is a unique systematic or nominal, execute from the tool; else execute nominal
- if (tool_iter!=m_jetReclusteringTool.end())
- tool_iter->second->execute();
- else
- m_jetReclusteringTool.at(hash_factor*m_config->nominalHashValue())->execute();
- }
-
- return StatusCode::SUCCESS;
-} // end execute()
-
-
-
-StatusCode RCJetMC15::finalize() {
- /*Delete the re-clustering tool*/
- for ( auto& x: m_jetReclusteringTool )
- delete x.second;
- m_jetReclusteringTool.clear();
-
- return StatusCode::SUCCESS;
-}
-
-
-bool RCJetMC15::isUniqueSyst( const std::string syst_name ){
- /*
- Check if the given systematic (besides nominal) needs a unique container
- Keep this in one function so it easier to update than having multiple checks everywhere.
- Only need jet containers for EGamma, Muon, Jet and Nominal systematics
- */
- m_unique_syst = (syst_name.find(m_egamma) == 0 ||
- syst_name.find(m_muonsyst) == 0 ||
- syst_name.find(m_jetsyst) == 0 ||
- syst_name.compare("nominal")==0);
-
- return m_unique_syst;
-}
-
-
-std::string RCJetMC15::inputContainerName( std::size_t hash_value, bool isLooseEvent ){
- /* Return the name of the input container */
- std::string this_container_name("");
- if (isLooseEvent)
- hash_value *= m_loose_hashValue; // loose events have a slightly different hash value to keep track of
-
- m_iterator iter = m_inputContainerNames.find( hash_value );
-
- if (iter!=m_inputContainerNames.end())
- this_container_name = iter->second;
- else
- this_container_name = m_InJetContainerBase;
-
- return this_container_name;
-}
-
-
-std::string RCJetMC15::rcjetContainerName( std::size_t hash_value, bool isLooseEvent ){
- /* Return the name of the rcjet container for a given systematic */
- std::string this_container_name("");
- if (isLooseEvent)
- hash_value *= m_loose_hashValue; // loose events have a slightly different hash value
-
- m_iterator iter = m_outputContainerNames.find( hash_value );
-
- if (iter!=m_outputContainerNames.end())
- this_container_name = iter->second;
- else
- this_container_name = m_OutJetContainerBase;
-
- return this_container_name;
-}
-
-
-bool RCJetMC15::passSelection(const xAOD::Jet& jet) const {
- /*
- Check if the re-clustered jet passes selection.
- Right now, this only does something for |eta| because
- pT is taken care of in the re-clustering tool. When
- small-r jet mass is available (calibrated+uncertainties),
- we can cut on that.
- */
- // [pT] calibrated to >~ 22 GeV (23 Jan 2016)
- if (jet.pt() < m_ptcut)
- return false;
-
- // [|eta|] calibrated < 2.5
- if (std::fabs(jet.eta()) > m_etamax)
- return false;
-
- // small-r jet mass not calibrated and no uncertainties
-
- return true;
-}
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/RCJetMC15.h b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/RCJetMC15.h
deleted file mode 100644
index 090ccf592f8fbb1554d404214dc1ded6d17c8ebc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/TopObjectSelectionTools/RCJetMC15.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef RCJETMC15_H_
-#define RCJETMC15_H_
-
-#include "TopEvent/Event.h"
-#include "TopEvent/EventTools.h"
-#include "TopEvent/TopEventMaker.h"
-#include "TopEvent/SystematicEvent.h"
-#include "TopConfiguration/ConfigurationSettings.h"
-
-#include "AsgTools/AsgTool.h"
-#include "AsgTools/ToolHandle.h"
-#include "xAODRootAccess/TEvent.h"
-#include "xAODRootAccess/TStore.h"
-#include "xAODRootAccess/TActiveStore.h"
-#include "xAODCore/ShallowCopy.h"
-#include "xAODJet/JetContainer.h"
-#include "xAODJet/JetAuxContainer.h"
-
-#include "JetReclustering/JetReclusteringTool.h"
-#include <unordered_map>
-#include <unordered_set>
-#include <memory>
-#include <set>
-#include <list>
-#include <vector>
-
-// Forward declaration(s):
-namespace xAOD{
- class SystematicEvent;
-}
-
-namespace top{
- class TopConfig;
- class Event;
-}
-
-class RCJetMC15 final : public asg::AsgTool{
-public:
- //Default - so root can load based on a name
- explicit RCJetMC15(const std::string& name);
-
- //Default - so we can clean up
- ~RCJetMC15();
-
- // Delete Standard constructors
- RCJetMC15(const RCJetMC15& rhs) = delete;
- RCJetMC15(RCJetMC15&& rhs) = delete;
- RCJetMC15& operator=(const RCJetMC15& rhs) = delete;
-
- //Run once at the start of the job
- StatusCode initialize();
-
- //Run for every event (in every systematic) that needs saving
- StatusCode execute(const top::Event& event);
-
- //Clean-up remaining things
- StatusCode finalize();
-
- //Check if systematic needs a unique container
- bool isUniqueSyst( std::string syst_name );
-
- //Access all of the container names from the Event Saver
- std::string inputContainerName( std::size_t hash_value, bool isLooseEvent );
- std::string rcjetContainerName( std::size_t hash_value, bool isLooseEvent );
-
- bool passSelection(const xAOD::Jet& jet) const;
-
-
-private:
-
- std::string m_name;
-
- std::shared_ptr<top::TopConfig> m_config;
- bool m_VarRCjets;
- std::string m_VarRCjets_rho;
- std::string m_VarRCjets_mass_scale;
- float m_ptcut; // in GeV
- float m_etamax;
- float m_trim;
- float m_radius;
- float m_minradius;
- float m_massscale;
-
- std::string m_egamma;
- std::string m_jetsyst;
- std::string m_muonsyst;
-
- std::string m_InJetContainerBase;
- std::string m_OutJetContainerBase;
- std::string m_InputJetContainer;
- std::string m_OutputJetContainer;
- int m_loose_hashValue;
- bool m_unique_syst;
-
- typedef std::map<std::size_t,std::string>::iterator m_iterator;
- std::map<std::size_t,std::string> m_inputContainerNames;
- std::map<std::size_t,std::string> m_outputContainerNames;
-
- std::map<std::string,float> mass_scales = {
- {"m_t",172500.},
- {"m_w",80385.},
- {"m_z",91188.},
- {"m_h",125090.}};
-
- //re-clustered jets
- // -> need unordered map for systematics
- std::unordered_map<std::size_t, JetReclusteringTool*> m_jetReclusteringTool;
- typedef std::unordered_map<std::size_t, JetReclusteringTool*>::iterator m_tool_iterator;
-
-};
-
-#endif