Commit efcaab8b authored by Jonathan Bossio's avatar Jonathan Bossio Committed by Graeme Stewart
Browse files

New name convention of jet moments for JMS for small-R jets (JetCalibTools-00-04-68)

	JetCalibTools-00-04-68
	* Implementation of specific naming convention of jet moments for the JMS of small-R jets
	(AntiK4EMTopo and AntiK4LCTopo)

2016-06-29 J. Bossio <jbossios@cern.ch>
	trunk
	* Using CalibArea-00-04-65
parent 367f256a
......@@ -337,7 +337,11 @@ StatusCode JMSCorrection::calibrateImpl(xAOD::Jet& jet, JetEventInfo&) const {
xAOD::JetConstituentVector constituents = jet.getConstituents();
int nconstituents = constituents.size();
float trackSumMass;
if( !jet.getAttribute<float>("TrackSumMass",trackSumMass) ) {
std::string TrackSumMassStr = "TrackSumMass";
if(m_jetAlgo=="AntiKt4EMTopo" || m_jetAlgo=="AntiKt4LCTopo") TrackSumMassStr = "DFCommonJets_TrackSumMass";
std::string TrackSumPtStr = "TrackSumPt";
if(m_jetAlgo=="AntiKt4EMTopo" || m_jetAlgo=="AntiKt4LCTopo") TrackSumPtStr = "DFCommonJets_TrackSumPt";
if( !jet.getAttribute<float>(TrackSumMassStr,trackSumMass) ) {
if(!m_combination){
//ATH_MSG_WARNING("Failed to retrieve TrackSumMass! Track Assisted Mass Correction will NOT be applied\n\n");
if(m_warning_counter_mTACorr==0) ATH_MSG_WARNING("Failed to retrieve TrackSumMass! Track Assisted Mass Correction will NOT be applied\n\n");
......@@ -349,7 +353,7 @@ StatusCode JMSCorrection::calibrateImpl(xAOD::Jet& jet, JetEventInfo&) const {
}
}
float trackSumPt;
if( !jet.getAttribute<float>("TrackSumPt",trackSumPt) ) {
if( !jet.getAttribute<float>(TrackSumPtStr,trackSumPt) ) {
if(!m_combination){
//ATH_MSG_WARNING("Failed to retrieve TrackSumPt! Track Assisted Mass Correction will NOT be applied\n\n");
if(m_warning_counter_mTACorr==0) ATH_MSG_WARNING("Failed to retrieve TrackSumPt! Track Assisted Mass Correction will NOT be applied\n\n");
......
......@@ -110,7 +110,7 @@ StatusCode JetCalibrationTool::initializeTool(const std::string& name) {
}
if ( config.EqualTo("") || !config ) { ATH_MSG_FATAL("No configuration file specified."); return StatusCode::FAILURE; }
m_calibAreaTag.insert(0,"CalibArea-00-04-65/"); // Hard-coding the CalibArea tag
m_calibAreaTag.insert(0,"CalibArea-00-04-67/"); // Hard-coding the CalibArea tag
if(calibSeq.Contains("DEV")){
m_devMode = true;
ATH_MSG_WARNING("Dev Mode is ON!!! \n\n");
......
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