From b8f06f2a37a30c9f69dd076c907f7f9f28a95df9 Mon Sep 17 00:00:00 2001 From: tomc Date: Wed, 9 Jan 2019 16:25:43 +0100 Subject: [PATCH] Fall17_V2 soon becoming available after merge of https://github.com/cms-egamma/cmssw/pull/30 --- multilep/src/LeptonAnalyzer.cc | 7 ++----- multilep/src/PhotonAnalyzer.cc | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/multilep/src/LeptonAnalyzer.cc b/multilep/src/LeptonAnalyzer.cc index df80b71a..0e5d8d77 100644 --- a/multilep/src/LeptonAnalyzer.cc +++ b/multilep/src/LeptonAnalyzer.cc @@ -218,11 +218,8 @@ bool LeptonAnalyzer::analyze(const edm::Event& iEvent, const reco::Vertex& prima _lElectronMvaSummer16GP[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Spring16GeneralPurposeV1Values"); // OLD, do not use it _lElectronMvaSummer16HZZ[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Spring16HZZV1Values"); // OLD, do not use it _lElectronMvaFall17v1NoIso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17NoIsoV1Values"); // OLD, do not use it - _lElectronMvaFall17Iso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17IsoV1Values"); // REPLACE - _lElectronMvaFall17NoIso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17NoIsoV1Values"); // REPLACE by lines below - // _lElectronMvaFall17Iso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17IsoV2Values"); - // _lElectronMvaFall17NoIso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17NoIsoV2Values"); - std::cout << "Temporary using Fall17 v1 electron values, the v2 values will become available really soon" << std::endl; + _lElectronMvaFall17Iso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17IsoV2Values"); + _lElectronMvaFall17NoIso[_nL] = ele->userFloat("ElectronMVAEstimatorRun2Fall17NoIsoV2Values"); _lElectronPassEmu[_nL] = passTriggerEmulationDoubleEG(&*ele); // Keep in mind, this trigger emulation is for 2016 DoubleEG, the SingleEG trigger emulation is different _lElectronPassConvVeto[_nL] = ele->passConversionVeto(); _lElectronChargeConst[_nL] = ele->isGsfCtfScPixChargeConsistent(); diff --git a/multilep/src/PhotonAnalyzer.cc b/multilep/src/PhotonAnalyzer.cc index e9f13a2d..510a860e 100644 --- a/multilep/src/PhotonAnalyzer.cc +++ b/multilep/src/PhotonAnalyzer.cc @@ -92,9 +92,7 @@ bool PhotonAnalyzer::analyze(const edm::Event& iEvent){ _phCutBasedLoose[_nPh] = photon->photonID("cutBasedPhotonID-Fall17-94X-V2-loose"); _phCutBasedMedium[_nPh] = photon->photonID("cutBasedPhotonID-Fall17-94X-V2-medium"); _phCutBasedTight[_nPh] = photon->photonID("cutBasedPhotonID-Fall17-94X-V2-tight"); - _phMva[_nPh] = photon->userFloat("PhotonMVAEstimatorRunIIFall17v1p1Values"); - std::cout << "Temporary using Fall17 v1p1 photon values, the v2 values will become available really soon" << std::endl; -// _phMva[_nPh] = photon->userFloat("PhotonMVAEstimatorRunIIFall17v2Values"); + _phMva[_nPh] = photon->userFloat("PhotonMVAEstimatorRunIIFall17v2Values"); _phRandomConeChargedIsolation[_nPh] = randomConeIsoUnCorr < 0 ? -1 : std::max(0., randomConeIsoUnCorr - rhoCorrCharged); // keep -1 when randomConeIso algorithm failed _phChargedIsolation[_nPh] = std::max(0., photon->userFloat("phoChargedIsolation") - rhoCorrCharged);