diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/TopxAODAlg.h b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/TopxAODAlg.h index 77a2543c39f2d05ad8b462b64c7caef9baa74afc..2d0a4d6f5bcea80dd6823f98139ea1ba9475c814 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/TopxAODAlg.h +++ b/PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/TopAnalysis/TopxAODAlg.h @@ -81,9 +81,7 @@ private: // re-calculation of the sum unsigned int m_entry = 0u; unsigned int m_firstEvent = 0u; - unsigned int m_totalYield = 0u; unsigned int m_totalYieldSoFar = 0u; - unsigned int m_skippedEventsSoFar = 0u; unsigned int m_eventSavedReco = 0u; unsigned int m_eventSavedRecoLoose = 0u; unsigned int m_eventSavedTruth = 0u; diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ElectronScaleFactorCalculator.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ElectronScaleFactorCalculator.cxx index 5a378bb24fb928eb9e90d9e335627d1b290fd62c..bc9231f35ec0b7d4a0c4889a62d46df1339ead98 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ElectronScaleFactorCalculator.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/ElectronScaleFactorCalculator.cxx @@ -1002,7 +1002,6 @@ namespace top { double SF_Isol(1.), SF_IsolLoose(1.); /// --Trigger-- /// - int count = 0; for (const CP::SystematicSet& isyst : m_systTriggerCorrModel) { top::check(m_electronEffSFTriggerCorrModel->applySystematicVariation(isyst), @@ -1031,8 +1030,6 @@ namespace top { vec_SF_TriggerLoose_UP.emplace_back(SF_TriggerLoose); vec_Eff_Trigger_UP.emplace_back(EFF_Trigger); vec_Eff_TriggerLoose_UP.emplace_back(EFF_TriggerLoose); - - count++; } // Do some sanity check @@ -1068,7 +1065,6 @@ namespace top { m_systNominal), "Failed to set systematic"); /// --Reco-- /// - count = 0; for (const CP::SystematicSet& isyst : m_systRecoCorrModel) { top::check(m_electronEffSFRecoCorrModel->applySystematicVariation(isyst), "Failed to set systematic"); @@ -1077,7 +1073,6 @@ namespace top { vec_SF_Reco_DOWN.emplace_back(SF_Reco); vec_SF_Reco_UP.emplace_back(SF_Reco); - ++count; } if (vec_SF_Reco_DOWN.size() != vec_SF_Reco_UP.size()) { throw std::runtime_error { @@ -1090,7 +1085,6 @@ namespace top { m_systNominal), "Failed to set systematic"); /// --ID-- /// - count = 0; for (const CP::SystematicSet& isyst : m_systIDCorrModel) { top::check(m_electronEffSFIDCorrModel->applySystematicVariation(isyst), "Failed to set systematic"); @@ -1105,7 +1099,6 @@ namespace top { vec_SF_IDLoose_DOWN.emplace_back(SF_IDLoose); vec_SF_ID_UP.emplace_back(SF_ID); vec_SF_IDLoose_UP.emplace_back(SF_IDLoose); - ++count; } if (vec_SF_ID_DOWN.size() != vec_SF_ID_UP.size()) { throw std::runtime_error { @@ -1125,7 +1118,6 @@ namespace top { m_systNominal), "Failed to set systematic"); ///-- Iso --/// - count = 0; for (const CP::SystematicSet& isyst : m_systIsoCorrModel) { if (m_electronEffIso_exists) { @@ -1150,7 +1142,6 @@ namespace top { vec_SF_IsolLoose_DOWN.emplace_back(SF_IsolLoose); vec_SF_Isol_UP.emplace_back(SF_Isol); vec_SF_IsolLoose_UP.emplace_back(SF_IsolLoose); - ++count; } if (vec_SF_Isol_DOWN.size() != vec_SF_Isol_UP.size()) { throw std::runtime_error { diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx index 8d0a02209289d95a6ef70c521b37e94623da9e9e..b2ee3e747ba2be5faf289b2cff432f3895e02926 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopObjectSelectionTools/Root/TopObjectSelection.cxx @@ -670,18 +670,12 @@ void TopObjectSelection::applySelectionPreOverlapRemovalJetGhostTracks() { const xAOD::Vertex* primaryVertex = (it_pv == vertices->cend()) ? nullptr : *it_pv; if (primaryVertex == nullptr) ATH_MSG_WARNING("TopObjectSelection. No primary vertex found." ); - - int counter = 0; - for (auto trackPtr : *tracks) { //trackPtr -> auxdecor<char>(m_passPreORSelection) = m_trackSelection->passSelection(*trackPtr, *primaryVertex); trackPtr->auxdecor<char>(m_passPreORSelection) = '0'; trackPtr -> auxdecor<char>(m_ORToolDecoration) = trackPtr->auxdataConst<char>(m_passPreORSelection) * 2; - counter++; - - } } diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h index e451c08f193d1d4a9af9b807431ef1e0d2e7097e..8a82789dcd0ae4a4577bdd890c0c09d0a82b14f6 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h +++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h @@ -119,7 +119,6 @@ namespace top { bool m_isMC; bool m_doMultipleJES; bool m_do_fjvt = false; - bool m_JERisPseudoData; std::list<CP::SystematicSet> m_specifiedSystematics; std::list<CP::SystematicSet> m_specifiedSystematicsLargeR;