diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx
index ff97796a970f0a5be71262c388709d03c5f25f65..333893ea36dec62a6bc0221092da7e7a1ea35f97 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Electrons.cxx
@@ -67,15 +67,15 @@ StatusCode SUSYObjDef_xAOD::MergeElectrons(const xAOD::ElectronContainer & elect
if (electrons.empty()) return StatusCode::SUCCESS;
for (const xAOD::Electron* electron: electrons) {
if (ElectronsToRemove.find(electron) != ElectronsToRemove.end()){
- ATH_MSG_DEBUG("Removing electron from output collection (isLRT?) : (" << (int)electron->auxdecor<char>("isLRT") << ")" );
- ATH_MSG_DEBUG( "ELECTRON cl eta: " << electron->caloCluster()->eta() );
- ATH_MSG_DEBUG( "ELECTRON cl phi: " << electron->caloCluster()->phi() );
+ ATH_MSG_DEBUG( "Removing electron from output collection (isLRT?) : ("<< static_cast<int>(electron->auxdecor<char>("isLRT")) << ")" );
+ ATH_MSG_DEBUG( "ELECTRON cl eta: " << electron->caloCluster()->eta());
+ ATH_MSG_DEBUG( "ELECTRON cl phi: " << electron->caloCluster()->phi());
continue;
// add electron into output
} else {
- ATH_MSG_DEBUG("Adding electron to output collection (isLRT?) : (" << (int)electron->auxdecor<char>("isLRT") << ")" );
- ATH_MSG_DEBUG( "ELECTRON cl eta: " << electron->caloCluster()->eta() );
- ATH_MSG_DEBUG( "ELECTRON cl phi: " << electron->caloCluster()->phi() );
+ ATH_MSG_DEBUG( "Adding electron to output collection (isLRT?) : (" << static_cast<int>(electron->auxdecor<char>("isLRT")) << ")" );
+ ATH_MSG_DEBUG( "ELECTRON cl eta: " << electron->caloCluster()->eta());
+ ATH_MSG_DEBUG( "ELECTRON cl phi: " << electron->caloCluster()->phi());
newElectron = new xAOD::Electron(*electron);
ElementLink<xAOD::ElectronContainer> eleLink;
@@ -120,8 +120,8 @@ StatusCode SUSYObjDef_xAOD::GetElectrons(xAOD::ElectronContainer*& copy, xAOD::S
m_elecLRTORTool->checkOverlap(*prompt_electrons, *lrt_electrons, ElectronsToRemove);
// Decorate muons with prompt/LRT
- for (const xAOD::Electron* el : *prompt_electrons) dec_isLRT(*el) = 0;
- for (const xAOD::Electron* el : *lrt_electrons) dec_isLRT(*el) = 1;
+ for (const xAOD::Electron* el : *prompt_electrons) dec_isLRT(*el) = 0;
+ for (const xAOD::Electron* el : *lrt_electrons) dec_isLRT(*el) = 1;
// Create merged StdWithLRTElectrons container
outputCol->reserve(prompt_electrons->size() + lrt_electrons->size());
@@ -235,18 +235,18 @@ StatusCode SUSYObjDef_xAOD::FillElectron(xAOD::Electron& input, float etcut, flo
input.trackParticle()->summaryValue(el_nPixHits, xAOD::numberOfPixelHits);
input.trackParticle()->summaryValue(el_nSCTHits, xAOD::numberOfSCTHits);
- ATH_MSG_INFO( "ELECTRON eta: " << input.eta() );
- ATH_MSG_INFO( "ELECTRON phi: " << input.phi() );
- ATH_MSG_INFO( "ELECTRON cl eta: " << input.caloCluster()->eta() );
- ATH_MSG_INFO( "ELECTRON cl phi: " << input.caloCluster()->phi() );
- ATH_MSG_INFO( "ELECTRON cl e: " << input.caloCluster()->e() );
- ATH_MSG_INFO( "ELECTRON trk eta: " << input.trackParticle()->eta() );
- ATH_MSG_INFO( "ELECTRON trk phi: " << input.trackParticle()->phi() );
- ATH_MSG_INFO( "ELECTRON author: " << input.author() );
- ATH_MSG_INFO( "ELECTRON OQ: " << acc_OQ(input) );
- ATH_MSG_INFO( "ELECTRON nPixHits: " << (int) el_nPixHits );
- ATH_MSG_INFO( "ELECTRON nSCTHits: " << (int) el_nSCTHits );
- ATH_MSG_INFO( "ELECTRON deadHVTools: " << pass_deadHVTool );
+ ATH_MSG_INFO( "ELECTRON eta: " << input.eta());
+ ATH_MSG_INFO( "ELECTRON phi: " << input.phi());
+ ATH_MSG_INFO( "ELECTRON cl eta: " << input.caloCluster()->eta());
+ ATH_MSG_INFO( "ELECTRON cl phi: " << input.caloCluster()->phi());
+ ATH_MSG_INFO( "ELECTRON cl e: " << input.caloCluster()->e());
+ ATH_MSG_INFO( "ELECTRON trk eta: " << input.trackParticle()->eta());
+ ATH_MSG_INFO( "ELECTRON trk phi: " << input.trackParticle()->phi());
+ ATH_MSG_INFO( "ELECTRON author: " << input.author());
+ ATH_MSG_INFO( "ELECTRON OQ: " << acc_OQ(input));
+ ATH_MSG_INFO( "ELECTRON nPixHits: " << static_cast<int>(el_nPixHits));
+ ATH_MSG_INFO( "ELECTRON nSCTHits: " << static_cast<int>(el_nSCTHits));
+ ATH_MSG_INFO( "ELECTRON deadHVTools: " << static_cast<bool>(pass_deadHVTool));
}
if (!pass_deadHVTool) return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Jets.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Jets.cxx
index 388ed3b324e16a15096be81ca8ca1e412e3b9751..077cbee11370e37dabc2af9c608e8d5b242bc21c 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Jets.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Jets.cxx
@@ -646,7 +646,7 @@ namespace ST {
ATH_MSG_INFO( "JET AverageLArQF: " << AverageLArQF );
}
- ATH_MSG_VERBOSE( "JET isbad?: " << (int) acc_bad(input) );
+ ATH_MSG_VERBOSE( "JET isbad?: " << static_cast<int>(acc_bad(input)));
return isgoodjet;
}
@@ -676,7 +676,7 @@ namespace ST {
ATH_MSG_VERBOSE("Jet cleaning is available only for EMTopo jet collection (InputType == 1), your jet collection: " << m_jetInputType );
}
- ATH_MSG_VERBOSE( "JET isbad?: " << (int) acc_bad(input) );
+ ATH_MSG_VERBOSE( "JET isbad?: " << static_cast<int>(acc_bad(input)));
return acc_bad(input);
}
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Muons.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Muons.cxx
index 01c2f90f93a18685c331d0d554cb6160021a74c0..d3d132b2edd98b9fef28fb13ec7cb68b7f4e64f1 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Muons.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/Muons.cxx
@@ -257,21 +257,21 @@ StatusCode SUSYObjDef_xAOD::FillMuon(xAOD::Muon& input, float ptcut, float etacu
track->summaryValue( nTRTOutliers, xAOD::numberOfTRTOutliers);
}
- ATH_MSG_INFO( "MUON pt: " << input.pt() );
- ATH_MSG_INFO( "MUON eta: " << input.eta() );
- ATH_MSG_INFO( "MUON phi: " << input.phi() );
- ATH_MSG_INFO( "MUON comb: " << (int)(input.muonType() == xAOD::Muon::Combined) );
- ATH_MSG_INFO( "MUON sTag: " << (int)(input.muonType() == xAOD::Muon::SegmentTagged));
- ATH_MSG_INFO( "MUON loose: " << (int)(input.quality() == xAOD::Muon::Loose ) );
- ATH_MSG_INFO( "MUON bHit: " << (int) nBLHits );
- ATH_MSG_INFO( "MUON pHit: " << (int) nPixHits );
- ATH_MSG_INFO( "MUON pDead: " << (int) nPixelDeadSensors );
- ATH_MSG_INFO( "MUON pHole: " << (int) nPixHoles );
- ATH_MSG_INFO( "MUON sHit: " << (int) nSCTHits);
- ATH_MSG_INFO( "MUON sDead: " << (int) nSCTDeadSensors );
- ATH_MSG_INFO( "MUON sHole: " << (int) nSCTHoles );
- ATH_MSG_INFO( "MUON tHit: " << (int) nTRTHits );
- ATH_MSG_INFO( "MUON tOut: " << (int) nTRTOutliers );
+ ATH_MSG_INFO( "MUON pt: " << input.pt() );
+ ATH_MSG_INFO( "MUON eta: " << input.eta() );
+ ATH_MSG_INFO( "MUON phi: " << input.phi() );
+ ATH_MSG_INFO( "MUON comb: " << (input.muonType() == xAOD::Muon::Combined));
+ ATH_MSG_INFO( "MUON sTag: " << (input.muonType() == xAOD::Muon::SegmentTagged));
+ ATH_MSG_INFO( "MUON loose:" << (input.quality() == xAOD::Muon::Loose));
+ ATH_MSG_INFO( "MUON bHit: " << static_cast<int>( nBLHits ));
+ ATH_MSG_INFO( "MUON pHit: " << static_cast<int>( nPixHits ));
+ ATH_MSG_INFO( "MUON pDead:" << static_cast<int>( nPixelDeadSensors ));
+ ATH_MSG_INFO( "MUON pHole:" << static_cast<int>( nPixHoles ));
+ ATH_MSG_INFO( "MUON sHit: " << static_cast<int>( nSCTHits));
+ ATH_MSG_INFO( "MUON sDead:" << static_cast<int>( nSCTDeadSensors ));
+ ATH_MSG_INFO( "MUON sHole:" << static_cast<int>( nSCTHoles ));
+ ATH_MSG_INFO( "MUON tHit: " << static_cast<int>( nTRTHits ));
+ ATH_MSG_INFO( "MUON tOut: " << static_cast<int>( nTRTOutliers ));
const xAOD::TrackParticle* idtrack =
input.trackParticle( xAOD::Muon::InnerDetectorTrackParticle );
@@ -279,7 +279,7 @@ StatusCode SUSYObjDef_xAOD::FillMuon(xAOD::Muon& input, float ptcut, float etacu
if ( !idtrack) {
ATH_MSG_VERBOSE( "No ID track!! " );
} else {
- ATH_MSG_VERBOSE( "ID track pt: " << idtrack->pt() );
+ ATH_MSG_VERBOSE( "ID track pt: " << idtrack->pt());
}
}
@@ -333,14 +333,14 @@ bool SUSYObjDef_xAOD::IsSignalMuon(const xAOD::Muon & input, float ptcut, float
dec_signal(input) = true;
if (m_muId == 4) { //i.e. HighPt muons
- ATH_MSG_VERBOSE( "IsSignalMuon: mu pt " << input.pt()
- << " signal? " << (int) acc_signal(input)
- << " isolation? " << (int) acc_isol(input)
- << " passedHighPtCuts? " << (int) acc_passedHighPtCuts(input));
+ ATH_MSG_VERBOSE( "IsSignalMuon: mu pt " << input.pt()
+ << " signal? " << static_cast<int>(acc_signal(input))
+ << " isolation? " << static_cast<int>(acc_isol(input))
+ << " passedHighPtCuts? " << static_cast<int>(acc_passedHighPtCuts(input)));
} else {
- ATH_MSG_VERBOSE( "IsSignalMuon: mu pt " << input.pt()
- << " signal? " << (int) acc_signal(input)
- << " isolation? " << (int) acc_isol(input));
+ ATH_MSG_VERBOSE( "IsSignalMuon: mu pt " << input.pt()
+ << " signal? " << static_cast<int>( acc_signal(input))
+ << " isolation? " << static_cast<int>( acc_isol(input)));
// Don't show HighPtFlag ... we didn't set it!
}
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx
index 093c4ec006e31805d5ed64fd96dd0be7cd1fef1b..1cd97045b60214588f9a9fe4e665ae2a8032069b 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYObjDef_xAOD.cxx
@@ -1028,7 +1028,7 @@ StatusCode SUSYObjDef_xAOD::autoconfigurePileupRWTool(const std::string& PRWfile
}
// Retrieve the input file
- int DSID_INT = (int) dsid;
+ int DSID_INT = static_cast<int>(dsid);
prwConfigFile += "DSID" + std::to_string(DSID_INT/1000) + "xxx/pileup_" + mcCampaignMD + "_dsid" + std::to_string(DSID_INT) + "_" + simType + ".root";
if (RPVLLmode) prwConfigFile = TString(prwConfigFile).ReplaceAll(".root","_rpvll.root").Data();
@@ -1144,7 +1144,7 @@ void SUSYObjDef_xAOD::configFromFile(bool& property, const std::string& propname
rEnv.GetTable()->Remove( rEnv.GetTable()->FindObject(propname.c_str() ) );
return;
}
- property = rEnv.GetValue(propname.c_str(), (int) defaultValue);
+ property = rEnv.GetValue(propname.c_str(), static_cast<int>(defaultValue));
ATH_MSG_INFO( "configFromFile(): Loaded property \"" << propname << "\" with value " << property );
// Remove the item from the table
rEnv.GetTable()->Remove( rEnv.GetTable()->FindObject(propname.c_str() ) );
@@ -1227,21 +1227,21 @@ StatusCode SUSYObjDef_xAOD::readConfig()
if (m_jetInputType == xAOD::JetInput::Uncategorized) {
m_jetInputType = xAOD::JetInput::Type(rEnv.GetValue("Jet.InputType", 9));
- ATH_MSG_INFO( "readConfig(): Loaded property Jet.InputType with value " << (int)m_jetInputType);
+ ATH_MSG_INFO( "readConfig(): Loaded property Jet.InputType with value " << static_cast<int>(m_jetInputType));
}
// Remove the item from the table
rEnv.GetTable()->Remove( rEnv.GetTable()->FindObject("Jet.InputType") );
if (m_muId == static_cast<int>(xAOD::Muon::Quality(xAOD::Muon::VeryLoose))) {
int muIdTmp = rEnv.GetValue("Muon.Id", 1);
- m_muId = (muIdTmp<4 ? (int)xAOD::Muon::Quality(muIdTmp) : muIdTmp);
+ m_muId = (muIdTmp<4 ? static_cast<int>(xAOD::Muon::Quality(muIdTmp)) : muIdTmp);
ATH_MSG_INFO( "readConfig(): Loaded property Muon.Id with value " << m_muId);
// Remove the item from the table
rEnv.GetTable()->Remove( rEnv.GetTable()->FindObject("Muon.Id") );
}
if (m_muIdBaseline == static_cast<int>(xAOD::Muon::Quality(xAOD::Muon::VeryLoose))) {
int muIdTmp = rEnv.GetValue("MuonBaseline.Id", 1);
- m_muIdBaseline = (muIdTmp<4 ? (int)xAOD::Muon::Quality(muIdTmp) : muIdTmp);
+ m_muIdBaseline = (muIdTmp<4 ? static_cast<int>(xAOD::Muon::Quality(muIdTmp)) : muIdTmp);
ATH_MSG_INFO( "readConfig(): Loaded property MuonBaseline.Id with value " << m_muIdBaseline);
// Remove the item from the table
rEnv.GetTable()->Remove( rEnv.GetTable()->FindObject("MuonBaseline.Id") );
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYToolsInit.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYToolsInit.cxx
index 6bf7e6fa57a3761dc711dbe5f94dc2bb6ac3b1eb..e7e380e83fb720a789d18fbc1eb1d2c315f398a9 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYToolsInit.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/Root/SUSYToolsInit.cxx
@@ -82,7 +82,7 @@ using namespace ST;
std::vector< std::string > corrFileNameList = {CORRFILE}; \
ATH_CHECK( TOOLHANDLE.setProperty("CorrectionFileNameList", corrFileNameList) ); \
if(!isData()) \
- ATH_CHECK (TOOLHANDLE.setProperty("ForceDataType", (int) data_type) ); \
+ ATH_CHECK (TOOLHANDLE.setProperty("ForceDataType", static_cast<int>(data_type))); \
ATH_CHECK( TOOLHANDLE.setProperty("CorrelationModel", m_EG_corrModel) ); \
ATH_CHECK( TOOLHANDLE.setProperty("OutputLevel", this->msg().level()) ); \
ATH_CHECK( TOOLHANDLE.initialize() ); \
@@ -94,7 +94,7 @@ using namespace ST;
ATH_MSG_INFO( "Will now set key \"" << KEYNAME << "\" to value \"" << KEY << "\" when configuring an AsgElectronEfficiencyCorrectionTool" ); \
ATH_CHECK( TOOLHANDLE.setProperty(KEYNAME, KEY) ); \
if(!isData()) \
- ATH_CHECK (TOOLHANDLE.setProperty("ForceDataType", (int) data_type) ); \
+ ATH_CHECK (TOOLHANDLE.setProperty("ForceDataType", static_cast<int>(data_type))); \
ATH_CHECK( TOOLHANDLE.setProperty("CorrelationModel", m_EG_corrModel) ); \
ATH_CHECK( TOOLHANDLE.setProperty("OutputLevel", this->msg().level()) ); \
ATH_CHECK( TOOLHANDLE.initialize() ); \
@@ -523,16 +523,16 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
std::string muQualBaseline = "";
switch (m_muIdBaseline) {
- case (int)xAOD::Muon::Quality(xAOD::Muon::VeryLoose): muQualBaseline = "VeryLoose";
+ case xAOD::Muon::VeryLoose: muQualBaseline = "VeryLoose";
ATH_MSG_WARNING("No muon scale factors are available for VeryLoose working point.");
break;
- case (int)xAOD::Muon::Quality(xAOD::Muon::Loose): muQualBaseline = "Loose"; break;
- case (int)xAOD::Muon::Quality(xAOD::Muon::Medium): muQualBaseline = "Medium"; break;
- case (int)xAOD::Muon::Quality(xAOD::Muon::Tight): muQualBaseline = "Tight"; break;
- case 4: muQualBaseline = "HighPt"; break;
- case 5: muQualBaseline = "LowPt"; break;
- case 6: muQualBaseline = "LowPtMVA"; break;
- case 7: muQualBaseline = "HighPt3Layers"; break;
+ case xAOD::Muon::Loose: muQualBaseline = "Loose"; break;
+ case xAOD::Muon::Medium: muQualBaseline = "Medium"; break;
+ case xAOD::Muon::Tight: muQualBaseline = "Tight"; break;
+ case 4: muQualBaseline = "HighPt"; break;
+ case 5: muQualBaseline = "LowPt"; break;
+ case 6: muQualBaseline = "LowPtMVA"; break;
+ case 7: muQualBaseline = "HighPt3Layers"; break;
default:
ATH_MSG_ERROR("Invalid muon working point provided: " << m_muIdBaseline << ". Cannot initialise!");
return StatusCode::FAILURE;
@@ -585,16 +585,16 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
std::string muQual = "";
switch (m_muId) {
- case (int)xAOD::Muon::Quality(xAOD::Muon::VeryLoose): muQual = "VeryLoose";
+ case xAOD::Muon::VeryLoose: muQual = "VeryLoose";
ATH_MSG_WARNING("No muon scale factors are available for VeryLoose working point.");
break;
- case (int)xAOD::Muon::Quality(xAOD::Muon::Loose): muQual = "Loose"; break;
- case (int)xAOD::Muon::Quality(xAOD::Muon::Medium): muQual = "Medium"; break;
- case (int)xAOD::Muon::Quality(xAOD::Muon::Tight): muQual = "Tight"; break;
- case 4: muQual = "HighPt"; break;
- case 5: muQual = "LowPt"; break;
- case 6: muQual = "LowPtMVA"; break;
- case 7: muQual = "HighPt3Layers"; break;
+ case xAOD::Muon::Loose: muQual = "Loose"; break;
+ case xAOD::Muon::Medium: muQual = "Medium"; break;
+ case xAOD::Muon::Tight: muQual = "Tight"; break;
+ case 4: muQual = "HighPt"; break;
+ case 5: muQual = "LowPt"; break;
+ case 6: muQual = "LowPtMVA"; break;
+ case 7: muQual = "HighPt3Layers"; break;
default:
ATH_MSG_ERROR("Invalid muon working point provided: " << m_muId << ". Cannot initialise!");
return StatusCode::FAILURE;
@@ -960,10 +960,10 @@ StatusCode SUSYObjDef_xAOD::SUSYToolsInit()
(EleIso.find("Tight_VarRad")!=std::string::npos)||
(EleIso.find("Loose_VarRad")!=std::string::npos))) {
if (isAtlfast()) ATH_MSG_WARNING("(AsgElectronEfficiencyCorrectionTool/"+toolName+"). Your selected electron Iso WP (" + EleIso + ") don't have AFII SF. Falling back to FullSim");
- ATH_CHECK( m_elecEfficiencySFTool_iso.setProperty("ForceDataType", (int) PATCore::ParticleDataType::Full) );
+ ATH_CHECK( m_elecEfficiencySFTool_iso.setProperty("ForceDataType", static_cast<int>(PATCore::ParticleDataType::Full)));
}
else if (!isData()){
- ATH_CHECK( m_elecEfficiencySFTool_iso.setProperty("ForceDataType", (int) data_type) );
+ ATH_CHECK( m_elecEfficiencySFTool_iso.setProperty("ForceDataType", static_cast<int>(data_type)));
}
ATH_CHECK( m_elecEfficiencySFTool_iso.setProperty("CorrelationModel", m_EG_corrModel) );
ATH_CHECK( m_elecEfficiencySFTool_iso.setProperty("OutputLevel", this->msg().level()) );
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
index bdfd8c9a4777b83d87becc26da9e6bf1c8c73f49..71c45c76cb33e7e7916fa0c3d3a89df456833b52 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
@@ -450,7 +450,7 @@ StatusCode ApplySUSYTools::execute()
bool isbjet = m_objTool->IsBJet(*p);
if( doPrint ) ATH_MSG_DEBUG("Systematic jet pt " <<sysname <<" "
<<p->pt() <<" "
- <<(int)p->auxdata<char>("baseline")
+ <<static_cast<int>(p->auxdata<char>("baseline"))
<<" " <<isbad <<" " <<issig <<" " <<isbjet);
if( p->auxdata<char>("baseline") && p->pt() > m_jetPtCut ){
(*jetCutMask)[pIndex] = true;
@@ -493,8 +493,8 @@ StatusCode ApplySUSYTools::execute()
for (const auto& fatjet : *fatjets_nominal) {
ATH_MSG_DEBUG("--------------------------------------");
ATH_MSG_DEBUG("Recorded fat jet pt = " << fatjet->pt()*0.001 << " ,"
- << " Wtag = " << (int)fatjet->auxdata<int>("Wtag") << " ,"
- << " Ztag = " << (int)fatjet->auxdata<int>("Ztag"));
+ << " Wtag = " << static_cast<int>(fatjet->auxdata<int>("Wtag")) << " ,"
+ << " Ztag = " << static_cast<int>(fatjet->auxdata<int>("Ztag")));
}
}
}//endif doFatJets
@@ -822,7 +822,7 @@ StatusCode ApplySUSYTools::execute()
//bool issig = m_objTool->IsSignalTau(*p, m_tauPt, m_tauEta);
if( doPrint ) ATH_MSG_DEBUG("Systematic tau pt " <<sysname <<" "
<<p->pt() <<" " <<ptorig <<" "
- <<(int)p->auxdata<char>("baseline"));
+ <<static_cast<int>(p->auxdata<char>("baseline")));
if( p->auxdata<char>("baseline") ){
if( doPrint && sysname == "Nominal" ){
ATH_MSG_DEBUG("Accepted Nominal tau pt " <<p->pt());
@@ -888,7 +888,7 @@ StatusCode ApplySUSYTools::execute()
bool issig = m_objTool->IsSignalPhoton(*p, m_photonPt);
if( doPrint ) ATH_MSG_DEBUG("Systematic photon pt " <<sysname <<" "
<<p->pt() <<" " <<ptorig <<" "
- <<(int)p->auxdata<char>("baseline") <<" "
+ <<static_cast<int>(p->auxdata<char>("baseline")) <<" "
<<issig);
if( p->auxdata<char>("baseline") ){
if( doPrint && sysname == "Nominal" ){
@@ -1120,7 +1120,7 @@ StatusCode ApplySUSYTools::execute()
for(const auto& p : (*p_Electrons) ){
dec_match(*p) = m_objTool->IsTrigMatched(p, key);
if( doPrint ) ATH_MSG_DEBUG("e match " <<p->pt() <<" " <<p->eta() <<" "
- <<(int)dec_match(*p));
+ <<static_cast<int>(dec_match(*p)));
}
}
@@ -1130,7 +1130,7 @@ StatusCode ApplySUSYTools::execute()
for(const auto& p : (*p_Muons) ){
dec_match(*p) = m_objTool->IsTrigMatched(p, key);
if( doPrint ) ATH_MSG_DEBUG("mu match " <<p->pt() <<" " <<p->eta() <<" "
- <<(int)dec_match(*p));
+ <<static_cast<int>(dec_match(*p)));
}
}
@@ -1140,7 +1140,7 @@ StatusCode ApplySUSYTools::execute()
for(const auto& p : (*p_Photons) ){
dec_match(*p) = m_objTool->IsTrigMatched(p, key);
if( doPrint ) ATH_MSG_DEBUG("g match " <<p->pt() <<" " <<p->eta() <<" "
- <<(int)dec_match(*p));
+ <<static_cast<int>(dec_match(*p)));
}
}
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx
index e9c2973ca2c3aa68c88909ede55cf478d31eab8a..089d15c68edc6e771b405abc5c966fd4617d567b 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/SUSYToolsAlg.cxx
@@ -112,7 +112,7 @@ StatusCode SUSYToolsAlg::initialize() {
ATH_CHECK( m_SUSYTools.setProperty("DataSource",m_dataSource) );
ATH_CHECK(m_SUSYTools.setProperty("PRWLumiCalcFiles", m_PRWLumiCalcFiles) );
ATH_CHECK(m_SUSYTools.setProperty("OutputLevel", this->msg().level()) );
- ATH_CHECK(m_SUSYTools.setProperty("DebugMode", ((int)(this->msg().level())<3?true:false )));
+ ATH_CHECK(m_SUSYTools.setProperty("DebugMode", (static_cast<int>(this->msg().level())<3?true:false )));
if (m_usePRWAutoconfig){
ATH_CHECK(m_SUSYTools.setProperty("AutoconfigurePRWTool", true) );
ATH_CHECK(m_SUSYTools.setProperty("mcCampaign", m_mcCampaign) );
@@ -1024,8 +1024,8 @@ StatusCode SUSYToolsAlg::execute() {
}
}
}
- ATH_MSG_VERBOSE( " Electron passing baseline selection?" << (int) el->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Electron passing signal selection?" << (int) el->auxdata<char>("signal") );
+ ATH_MSG_VERBOSE( " Electron passing baseline selection? " << static_cast<int>( el->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Electron passing signal selection? " << static_cast<int>( el->auxdata<char>("signal")));
if (el->auxdata< char >("signal") == 1)
ATH_MSG_VERBOSE( " Electron weight " << el->auxdata<double>("effscalefact") );
@@ -1058,8 +1058,8 @@ StatusCode SUSYToolsAlg::execute() {
}
}
}
- ATH_MSG_VERBOSE( " Photon passing baseline selection?" << (int) ph->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Photon passing signal selection?" << (int) ph->auxdata<char>("signal") );
+ ATH_MSG_VERBOSE( " Photon passing baseline selection? " << static_cast<int>(ph->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Photon passing signal selection? " << static_cast<int>(ph->auxdata<char>("signal")));
if (ph->auxdata< char >("signal") == 1)
ATH_MSG_VERBOSE( " Photon weight " << ph->auxdata<double>("effscalefact") );
}
@@ -1091,9 +1091,9 @@ StatusCode SUSYToolsAlg::execute() {
}
}
}
- ATH_MSG_VERBOSE( " Muon passing baseline selection?" << (int) mu->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Muon passing signal selection?" << (int) mu->auxdata<char>("signal") );
- ATH_MSG_VERBOSE( " Muon is a cosmic ray?" << (int) mu->auxdata<char>("cosmic") );
+ ATH_MSG_VERBOSE( " Muon passing baseline selection? " << static_cast<int>(mu->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Muon passing signal selection? " << static_cast<int>(mu->auxdata<char>("signal")));
+ ATH_MSG_VERBOSE( " Muon is a cosmic ray? " << static_cast<int>(mu->auxdata<char>("cosmic")));
if (mu->auxdata< char >("signal") == 1)
ATH_MSG_VERBOSE( " Muon weight " << mu->auxdata<double>("effscalefact") );
}
@@ -1117,14 +1117,14 @@ StatusCode SUSYToolsAlg::execute() {
if (m_slices["jet"]) {
ATH_MSG_DEBUG("Working on jets");
for ( const auto& jet : *jets ) {
- ATH_MSG_VERBOSE( " Jet is bad? " << (int) jet->auxdata<char>("bad") );
- ATH_MSG_VERBOSE( " Jet is baseline ? " << (int) jet->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Jet passes OR ? " << (int) jet->auxdata<char>("passOR") );
+ ATH_MSG_VERBOSE( " Jet is bad? " << static_cast<int>(jet->auxdata<char>("bad")));
+ ATH_MSG_VERBOSE( " Jet is baseline ? " << static_cast<int>(jet->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Jet passes OR ? " << static_cast<int>(jet->auxdata<char>("passOR")));
if (jet->auxdata<char>("passOR")) {
if (m_slices["bjet"] && (isNominal || syst_affectsJets || syst_affectsBTag)) {
m_SUSYTools->IsBJet(*jet);
}
- ATH_MSG_VERBOSE( " Jet is bjet ? " << (int) jet->auxdata<char>("bjet") );
+ ATH_MSG_VERBOSE( " Jet is bjet ? " << static_cast<int>(jet->auxdata<char>("bjet")));
}
}
@@ -1169,9 +1169,9 @@ StatusCode SUSYToolsAlg::execute() {
if( m_slices["fjet"] && doFatJets ) {
ATH_MSG_DEBUG("Working on fat jets");
for ( const auto& fatjet : *fatjets ) {
- ATH_MSG_VERBOSE( " Jet is bad? " << (int) fatjet->auxdata<char>("bad") );
- ATH_MSG_VERBOSE( " Jet is baseline ? " << (int) fatjet->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Jet passes OR ? " << (int) fatjet->auxdata<char>("passOR") );
+ ATH_MSG_VERBOSE( " Jet is bad? " << static_cast<int>(fatjet->auxdata<char>("bad")));
+ ATH_MSG_VERBOSE( " Jet is baseline ? " << static_cast<int>(fatjet->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Jet passes OR ? " << static_cast<int>(fatjet->auxdata<char>("passOR")));
}
float fatjet_weight(1.);
@@ -1198,9 +1198,9 @@ StatusCode SUSYToolsAlg::execute() {
if( m_slices["tjet"] && doTrkJets ) {
ATH_MSG_DEBUG("Working on trk jets");
for ( const auto& trkjet : *trkjets ) {
- ATH_MSG_VERBOSE( " Jet is bad? " << (int) trkjet->auxdata<char>("bad") );
- ATH_MSG_VERBOSE( " Jet is baseline ? " << (int) trkjet->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Jet passes OR ? " << (int) trkjet->auxdata<char>("passOR") );
+ ATH_MSG_VERBOSE( " Jet is bad? " << static_cast<int>(trkjet->auxdata<char>("bad")));
+ ATH_MSG_VERBOSE( " Jet is baseline ? " << static_cast<int>(trkjet->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Jet passes OR ? " << static_cast<int>(trkjet->auxdata<char>("passOR")));
}
float trkjet_weight(1.);
@@ -1234,8 +1234,8 @@ StatusCode SUSYToolsAlg::execute() {
}
}
}
- ATH_MSG_VERBOSE( " Tau passing baseline selection?" << (int) ta->auxdata<char>("baseline") );
- ATH_MSG_VERBOSE( " Tau passing signal selection?" << (int) ta->auxdata<char>("signal") );
+ ATH_MSG_VERBOSE( " Tau passing baseline selection? " << static_cast<int>(ta->auxdata<char>("baseline")));
+ ATH_MSG_VERBOSE( " Tau passing signal selection? " << static_cast<int>(ta->auxdata<char>("signal")));
if (ta->auxdata< char >("signal") == 1)
ATH_MSG_VERBOSE( " Tau weight " << ta->auxdata<double>("effscalefact") );
}