Index: Root/JetHandler.cxx =================================================================== --- Root/JetHandler.cxx (.../devbranches/carl) (revision 724115) +++ Root/JetHandler.cxx (.../trunk) (revision 724115) @@ -140,17 +140,7 @@ TOOL_CHECK("JetHandler()::initializeTools()",m_jvtTool->setProperty("JVTFileName","JetMomentTools/JVTlikelihood_20140805.root")); //might be made configurable TOOL_CHECK("JetHandler()::initializeTools()",m_jvtTool->initialize()); - // b-tagging tool - m_btagtool = new BTaggingSelectionTool("BTaggingSelectionTool"); - m_btagtool->msg().setLevel( m_msgLevel ); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->setProperty("MaxEta",2.5)); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->setProperty("MinPt",20000.)); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->setProperty("JetAuthor","AntiKt4EMTopoJets")); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->setProperty("TaggerName","MV2c20")); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->setProperty("FlvTagCutDefinitionsFileName","xAODBTaggingEfficiency/13TeV/2015-PreRecomm-13TeV-MC12-CDI-October23_v1.root")); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->setProperty("OperatingPoint","FixedCutBEff_70")); - TOOL_CHECK("JetHandler()::initializeTools()",m_btagtool->initialize()); - + // register ISystematicsTools //--------------------------- m_sysToolList.clear(); @@ -473,8 +463,7 @@ Props::MV2c20.set(part, discriminant_mv2c20); Props::MVb.set(part, discriminant_mvb); - bool isBtagged = m_btagtool->accept( * part ); - Props::isBJet.set(part, isBtagged); + } Index: Root/EventSelector.cxx =================================================================== --- Root/EventSelector.cxx (.../devbranches/carl) (revision 724115) +++ Root/EventSelector.cxx (.../trunk) (revision 724115) @@ -236,9 +236,6 @@ SelectionContainers containers; - bool applyMETAfterSelection(false); - m_config.getif("applyMETAfterSelection",applyMETAfterSelection); - // first, retrieve the containers if ( m_jets ) { containers.jets = m_jets->getInParticleVariation(sysName) ; } if ( m_fatjets ) { containers.fatjets = m_fatjets->getInParticleVariation(sysName) ; } @@ -247,7 +244,7 @@ if ( m_photons ) { containers.photons = m_photons->getInParticleVariation(sysName) ; } if ( m_muons ) { containers.muons = m_muons->getInParticleVariation(sysName) ; } if ( m_taus ) { containers.taus = m_taus->getInParticleVariation(sysName) ; } - if ( m_met && !applyMETAfterSelection) { containers.met = m_met->getMET(sysName) ; } + if ( m_met ) { containers.met = m_met->getMET(sysName) ; } if(m_debug) Info("EventSelector::performSelection()","Successfully retrieved InParticleVariations." ); @@ -266,12 +263,8 @@ // input event info for selection containers.evtinfo = m_info->getEventInfo(); - std::cout << "HERE1" << std::endl; - m_selection->setSysName(sysName); - bool skipCutFlow = (sysName != "Nominal"); // presence of m_selection has been checked in performSelection(bool) - std::cout << "HERE2" << std::endl; return m_selection->passPreSelection(containers, skipCutFlow); } Index: Root/METHandler.cxx =================================================================== --- Root/METHandler.cxx (.../devbranches/carl) (revision 724115) +++ Root/METHandler.cxx (.../trunk) (revision 724115) @@ -287,10 +287,7 @@ if (m_debug) Info("METHandler::calibrateMET()", "Rebuilding tau term."); ConstDataVector metTau(SG::VIEW_ELEMENTS); for(const auto& tau : *taus) { - if(!m_selObjForMET || Props::forMETRebuild.get(tau)) { - std::cout << "MET tau " << tau << std::endl; - metTau.push_back(tau); - } + if(!m_selObjForMET || Props::forMETRebuild.get(tau)) metTau.push_back(tau); } EL_CHECK("METHandler::calibrateMET()", m_metMaker->rebuildMET(m_tauTerm, xAOD::Type::Tau, METCont, metTau.asDataVector(), metMap)); @@ -491,10 +488,6 @@ if (metSet.first == "Original" && !m_rebuiltMETforOriginal){ continue; } - - if (!metSet.second) continue; - std::cout << "MET syst " << metSet.first << " " << metSet.second << std::endl; - // delete the aux container associated to the met container delete metSet.second->getConstStore(); metSet.second->setConstStore(nullptr); @@ -502,10 +495,5 @@ delete metSet.second; metSet.second = nullptr; } - - // clear containers - m_inContainer.clear(); - m_outContainer.clear(); - return EL::StatusCode::SUCCESS; } Index: Root/TauHandler.cxx =================================================================== --- Root/TauHandler.cxx (.../devbranches/carl) (revision 724115) +++ Root/TauHandler.cxx (.../trunk) (revision 724115) @@ -73,15 +73,7 @@ m_tauSelectionTool = new TauAnalysisTools::TauSelectionTool("TauSelectTool"); m_tauSelectionTool->msg().setLevel( m_msgLevel ); const std::string rc = std::string(getenv("ROOTCOREBIN")); - - bool antitau = false; - m_config.getif("AntiTau",antitau); - if (antitau) { - TOOL_CHECK("TauHandler::initializeTools()",m_tauSelectionTool->setProperty( "ConfigPath", rc + "/data/CxAODMaker/AntiTauSelection.conf")); - } else { - TOOL_CHECK("TauHandler::initializeTools()",m_tauSelectionTool->setProperty( "ConfigPath", rc + "/data/CxAODMaker/TauSelection.conf")); - - } + TOOL_CHECK("TauHandler::initializeTools()",m_tauSelectionTool->setProperty( "ConfigPath", rc + "/data/CxAODMaker/TauSelection.conf")); TOOL_CHECK("TauHandler::initializeTools()",m_tauSelectionTool->initialize()); // Init ID Correction @@ -269,7 +261,7 @@ { // This method should only be applied to things that don't depend on the calibration - //bool medium = tau->isTau(xAOD::TauJetParameters::JetBDTSigLoose); + bool medium = tau->isTau(xAOD::TauJetParameters::JetBDTSigLoose); m_doTrigMatch = true; if (m_event->contains("HLT_xAOD__TauJetContainer_TrigTauRecMerged")) { @@ -288,12 +280,11 @@ if(trigDecorators.count(trig.first)) { trig_name = trig.first; - int is_matched = 0; - // Do not do trigger matching if the tau is not accepted -> now need to for antitaus - //if(medium) { - if (m_match_Tool->match(tau,trig_name)) is_matched = 1; - //} + // Do not do trigger matching if the tau is not accepted + if(medium) { + if (m_match_Tool->match(tau,trig_name)) is_matched = 1; + } trig.second->set(tau, is_matched); } } @@ -354,9 +345,6 @@ // Props::effSFeveto.set(tau, 1); } - if( bdtscore > 0.35 && !ismed && !istight ){ Props::isAntiTau.set(tau, true); } - else { Props::isAntiTau.set(tau,false); } - EL_CHECK("TauHandler::decorate",TruthMatch(tau)); return EL::StatusCode::SUCCESS; Index: Root/EventInfoHandler.cxx =================================================================== --- Root/EventInfoHandler.cxx (.../devbranches/carl) (revision 724115) +++ Root/EventInfoHandler.cxx (.../trunk) (revision 724115) @@ -456,7 +456,6 @@ return EL::StatusCode::FAILURE; } Props::MCEventWeight.set(m_eventInfoIn, eventInfoIn->mcEventWeight(0));// use a custom decorator for mcEventWeight, since the original info is a vector - Props::PileupRdmRun.set(m_eventInfoIn, get_PileupRdmRun()); } else { // if data @@ -661,7 +660,6 @@ eventInfoOut->setMCEventNumber(eventInfoIn->mcEventNumber()); eventInfoOut->setMCChannelNumber(eventInfoIn->mcChannelNumber()); Props::MCEventWeight.copy(eventInfoIn, eventInfoOut); - Props::PileupRdmRun.copy(eventInfoIn, eventInfoOut); } else { Props::passGRL.copy(eventInfoIn, eventInfoOut); Props::isCleanEvent.copy(eventInfoIn, eventInfoOut); Index: data/AntiTauSelection.conf =================================================================== --- data/AntiTauSelection.conf (.../devbranches/carl) (revision 724115) +++ data/AntiTauSelection.conf (.../trunk) (revision 724115) @@ -1,8 +0,0 @@ -SelectionCuts: PtMin AbsEtaRegion AbsCharge NTracks JetBDTMin EleOLR - -PtMin: 20 -AbsEtaRegion: 0; 1.37; 1.52; 2.5 -AbsCharge: 1 -NTracks: 1; 3 -JetBDTMin: 0.35 -EleOLR: TRUE Index: CxAODMaker/JetHandler.h =================================================================== --- CxAODMaker/JetHandler.h (.../devbranches/carl) (revision 724115) +++ CxAODMaker/JetHandler.h (.../trunk) (revision 724115) @@ -5,8 +5,8 @@ #include "CxAODMaker/ObjectHandler.h" #include "CxAODTools/CommonProperties.h" #include "CxAODMaker/JetSemileptonic.h" -#include "xAODBTaggingEfficiency/BTaggingSelectionTool.h" + namespace xAOD { #ifndef XAODJET_JETCONTAINER_H class JetContainer; @@ -56,7 +56,6 @@ JERSmearingTool * m_jetResolutionSmearing; JetUncertaintiesTool* m_jesProvider; JetVertexTaggerTool *m_jvtTool; - BTaggingSelectionTool *m_btagtool; std::string m_jetAlgoName; bool m_isMC;