Commit 4ee3f488 authored by Federica Fabbri's avatar Federica Fabbri Committed by Nils Erik Krumnack
Browse files

21.2 f fabbri fix ghost track wp usage

parent a712a6f7
......@@ -136,7 +136,7 @@ namespace top {
///-- Ghost Track Jets --///
if (topConfig->useLargeRJetGhostTrack() && topConfig->useLargeRJets()) {
objectSelection->jetGhostTrackSelectionLargeR(new top::JetGhostTrackSelection(topConfig->ghostTrackspTLargeR(),2.5,topConfig->ghostTracksVertexAssociationLargeR(),topConfig->largeRjetPtGhostTracks(),topConfig->largeRjetEtaGhostTracks(),false));
objectSelection->jetGhostTrackSelectionLargeR(new top::JetGhostTrackSelection(topConfig->ghostTrackspT(),2.5,topConfig->ghostTracksVertexAssociation(),topConfig->largeRjetPtGhostTracks(),topConfig->largeRjetEtaGhostTracks(),false));
}
///-- Tracks --///
......
......@@ -88,7 +88,7 @@ namespace top {
if (asg::ToolStore::contains<InDet::InDetTrackSelectionTool>(m_TrkSelNameLargeR)) {
m_trackseltoolLargeR = asg::ToolStore::get<InDet::InDetTrackSelectionTool>(m_TrkSelNameLargeR);
} else {
auto selTool = std::make_unique<InDet::InDetTrackSelectionTool>( m_TrkSelNameLargeR ,m_config->ghostTracksQualityLargeR());
auto selTool = std::make_unique<InDet::InDetTrackSelectionTool>( m_TrkSelNameLargeR ,m_config->ghostTracksQuality());
top::check(selTool -> initialize(), "Failed to initialize InDetTrackSelectionTool for GA tracks in LargeR jets");
m_trackseltoolLargeR = selTool.release();
ATH_MSG_INFO("Creating selection tool " + m_TrkSelNameLargeR);
......
......@@ -216,15 +216,6 @@ namespace top {
registerParameter("LargeRJetEtaGhostTracks",
"Jet eta threshold for ghost track systematic variations calculation. Default 2.0",
"2.0");
registerParameter("GhostTrackspTLargeR",
"PT of the ghost tracks associated large-R jets (in MeV). Default 500 MeV.",
"500.");
registerParameter("GhostTracksVertexAssociationLargeR",
"WP of the ghost track vertex association (for largeR jets). Option: none, nominal and tight. Default nominal.",
"nominal");
registerParameter("GhostTracksQualityLargeR",
"WP of the ghost track quality (for largeR jets). Option: TightPrimary, LoosePrimary. Loose, NoCut. Default TightPrimary.",
"TightPrimary");
registerParameter("JetUncertainties_NPModel",
"AllNuisanceParameters, CategoryReduction (default), GlobalReduction, StrongReduction - for JetUncertainties",
......
......@@ -278,10 +278,6 @@ namespace top {
m_ghostTrackspT(500.),
m_ghostTracksVertexAssociation("nominal"),
m_ghostTracksQuality("TightPrimary"),
m_ghostTrackspTLargeR(500.),
m_ghostTracksVertexAssociationLargeR("nominal"),
m_ghostTracksQualityLargeR("TightPrimary"),
m_largeRJetPtcut(25000.),
m_largeRJetEtacut(2.5),
......@@ -1392,10 +1388,6 @@ namespace top {
this->ghostTrackspT(std::stof(settings->value("GhostTrackspT")));
this->ghostTracksVertexAssociation(settings->value("GhostTracksVertexAssociation"));
this->ghostTracksQuality(settings->value("GhostTracksQuality"));
this->ghostTrackspTLargeR(std::stof(settings->value("GhostTrackspTLargeR")));
this->ghostTracksVertexAssociationLargeR(settings->value("GhostTracksVertexAssociationLargeR"));
this->ghostTracksQualityLargeR(settings->value("GhostTracksQualityLargeR"));
this->trackPtcut(std::stof(settings->value("TrackPt")));
this->trackEtacut(std::stof(settings->value("TrackEta")));
......
......@@ -1130,23 +1130,6 @@ namespace top {
}
}
inline virtual void ghostTrackspTLargeR(const float pt) {
if (!m_configFixed) {
m_ghostTrackspTLargeR = pt;
}
}
inline virtual void ghostTracksVertexAssociationLargeR(const std::string& vertexassociation) {
if (!m_configFixed) {
m_ghostTracksVertexAssociationLargeR = vertexassociation;
}
}
inline virtual void ghostTracksQualityLargeR(const std::string& ghostTracksQuality) {
if (!m_configFixed) {
m_ghostTracksQualityLargeR = ghostTracksQuality;
}
}
inline virtual float jetPtcut() const {return m_jetPtcut;}
inline virtual float jetEtacut() const {return m_jetEtacut;}
......@@ -1155,10 +1138,6 @@ namespace top {
inline virtual const std::string& ghostTracksVertexAssociation() const {return m_ghostTracksVertexAssociation;}
inline virtual const std::string& ghostTracksQuality() const {return m_ghostTracksQuality;}
inline virtual float ghostTrackspTLargeR() const {return m_ghostTrackspTLargeR;}
inline virtual const std::string& ghostTracksVertexAssociationLargeR() const {return m_ghostTracksVertexAssociationLargeR;}
inline virtual const std::string& ghostTracksQualityLargeR() const {return m_ghostTracksQualityLargeR;}
inline virtual float jetPtGhostTracks() const {return m_jetPtGhostTracks;}
inline virtual float jetEtaGhostTracks() const {return m_jetEtaGhostTracks;}
......@@ -2361,10 +2340,6 @@ namespace top {
std::string m_ghostTracksVertexAssociation;
std::string m_ghostTracksQuality;
float m_ghostTrackspTLargeR;
std::string m_ghostTracksVertexAssociationLargeR;
std::string m_ghostTracksQualityLargeR;
// Large R jet configuration
float m_largeRJetPtcut; // large R jet object selection pT cut
float m_largeRJetEtacut; // large R jet object selection (abs) eta cut
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment