diff --git a/Ntupler/interface/ElectronFiller.h b/Ntupler/interface/ElectronFiller.h index 055b8ac..507774e 100644 --- a/Ntupler/interface/ElectronFiller.h +++ b/Ntupler/interface/ElectronFiller.h @@ -24,6 +24,9 @@ class ElectronFiller : virtual public BaseFiller edm::EDGetTokenT el_token; edm::Handle el_handle; + edm::EDGetTokenT el_unsmeared_token; + edm::Handle el_unsmeared_handle; + edm::EDGetTokenT > el_vetoid_token; edm::Handle > el_vetoid_handle; diff --git a/Ntupler/interface/METFiller.h b/Ntupler/interface/METFiller.h index 2bac124..245f768 100644 --- a/Ntupler/interface/METFiller.h +++ b/Ntupler/interface/METFiller.h @@ -23,16 +23,17 @@ class METFiller : virtual public BaseFiller virtual inline string name(){return "METFiller";}; void init(TTree *t); - bool rerun=false; - edm::EDGetTokenT met_token; edm::Handle met_handle; - // rerun - edm::EDGetTokenT remet_token; - edm::Handle remet_handle; - edm::EDGetTokenT remetuncorr_token; - edm::Handle remetuncorr_handle; + edm::EDGetTokenT cleanmu_met_token; + edm::Handle cleanmu_met_handle; + + edm::EDGetTokenT cleaneg_met_token; + edm::Handle cleaneg_met_handle; + + edm::EDGetTokenT unclean_met_token; + edm::Handle unclean_met_handle; // pf cands - used to recalc some raw METs edm::EDGetTokenT pat_token; @@ -43,7 +44,6 @@ class METFiller : virtual public BaseFiller pfcandtype which_cand=kPat; - void fillMETs(std::vector pfs); bool minimal=true; private: diff --git a/Ntupler/interface/PhotonFiller.h b/Ntupler/interface/PhotonFiller.h index 33c64c2..d17fc4d 100644 --- a/Ntupler/interface/PhotonFiller.h +++ b/Ntupler/interface/PhotonFiller.h @@ -20,6 +20,9 @@ class PhotonFiller : virtual public BaseFiller edm::EDGetTokenT pho_token; edm::Handle pho_handle; + edm::EDGetTokenT pho_unsmeared_token; + edm::Handle pho_unsmeared_handle; + edm::EDGetTokenT > pho_looseid_token; edm::Handle > pho_looseid_handle; diff --git a/Ntupler/plugins/Ntupler.cc b/Ntupler/plugins/Ntupler.cc index 353aa89..07a7621 100644 --- a/Ntupler/plugins/Ntupler.cc +++ b/Ntupler/plugins/Ntupler.cc @@ -80,37 +80,39 @@ Ntupler::Ntupler(const edm::ParameterSet& iConfig) // MET FILLERS ----------------------------------------------- METFiller *pfmet = new METFiller("pfmet"); pfmet->skipEvent = skipEvent; - pfmet->rerun = false; pfmet->met_token = consumes(iConfig.getParameter("pfmet")); + pfmet->cleanmu_met_token = consumes(iConfig.getParameter("pfmet_cleanmu")); + pfmet->cleaneg_met_token = consumes(iConfig.getParameter("pfmet_cleaneg")); + pfmet->unclean_met_token = consumes(iConfig.getParameter("pfmet_unclean")); pfmet->pat_token = consumes(iConfig.getParameter("chsPFCands")); // these are not actually CHS, so don't worry - pfmet->which_cand = METFiller::kPat; + pfmet->which_cand = METFiller::kPat; pfmet->minimal = false; obj.push_back(pfmet); METFiller *puppimet = new METFiller("puppimet"); puppimet->skipEvent = skipEvent; - puppimet->rerun = false; puppimet->met_token = consumes(iConfig.getParameter("puppimet")); puppimet->minimal = true; obj.push_back(puppimet); // LEPTON FILLERS -------------------------------------------- - MuonFiller *muon = new MuonFiller("muon"); - muon->skipEvent = skipEvent; - muon->evt = event; - muon->mu_token = consumes(iConfig.getParameter("muons")); + MuonFiller *muon = new MuonFiller("muon"); + muon->skipEvent = skipEvent; + muon->evt = event; + muon->mu_token = consumes(iConfig.getParameter("muons")); obj.push_back(muon); - ElectronFiller *electron = new ElectronFiller("electron"); - electron->evt = event; - electron->skipEvent = skipEvent; - electron->el_token = consumes(iConfig.getParameter("electrons")); - electron->el_vetoid_token = consumes >(iConfig.getParameter("eleVetoIdMap")); - electron->el_looseid_token = consumes >(iConfig.getParameter("eleLooseIdMap")); - electron->el_mediumid_token = consumes >(iConfig.getParameter("eleMediumIdMap")); - electron->el_tightid_token = consumes >(iConfig.getParameter("eleTightIdMap")); - electron->el_hltid_token = consumes >(iConfig.getParameter("eleHLTIdMap")); + ElectronFiller *electron = new ElectronFiller("electron"); + electron->evt = event; + electron->skipEvent = skipEvent; + electron->el_token = consumes(iConfig.getParameter("electrons")); + electron->el_unsmeared_token = consumes(edm::InputTag("slimmedElectrons")); + electron->el_vetoid_token = consumes >(iConfig.getParameter("eleVetoIdMap")); + electron->el_looseid_token = consumes >(iConfig.getParameter("eleLooseIdMap")); + electron->el_mediumid_token = consumes >(iConfig.getParameter("eleMediumIdMap")); + electron->el_tightid_token = consumes >(iConfig.getParameter("eleTightIdMap")); + electron->el_hltid_token = consumes >(iConfig.getParameter("eleHLTIdMap")); electron->effArea.reset( new EffectiveAreas( edm::FileInPath(iConfig.getParameter("eleEA")).fullPath() @@ -125,16 +127,17 @@ Ntupler::Ntupler(const edm::ParameterSet& iConfig) // PHOTON FILLER -------------------------------------------- - PhotonFiller *photon = new PhotonFiller("photon"); - photon->skipEvent = skipEvent; - photon->pho_token = consumes(iConfig.getParameter("photons")); - photon->pho_looseid_token = consumes>(iConfig.getParameter("phoLooseIdMap")); - photon->pho_mediumid_token = consumes>(iConfig.getParameter("phoMediumIdMap")); - photon->pho_tightid_token = consumes>(iConfig.getParameter("phoTightIdMap")); - photon->iso_ch_token = consumes>(iConfig.getParameter("phoChargedIsolation")); - photon->iso_nh_token = consumes>(iConfig.getParameter("phoNeutralHadronIsolation")); - photon->iso_pho_token = consumes>(iConfig.getParameter("phoPhotonIsolation")); - photon->iso_wch_token = consumes>(iConfig.getParameter("phoWorstChargedIsolation")); + PhotonFiller *photon = new PhotonFiller("photon"); + photon->skipEvent = skipEvent; + photon->pho_token = consumes(iConfig.getParameter("photons")); + photon->pho_unsmeared_token = consumes(edm::InputTag("slimmedPhotons")); + photon->pho_looseid_token = consumes>(iConfig.getParameter("phoLooseIdMap")); + photon->pho_mediumid_token = consumes>(iConfig.getParameter("phoMediumIdMap")); + photon->pho_tightid_token = consumes>(iConfig.getParameter("phoTightIdMap")); + photon->iso_ch_token = consumes>(iConfig.getParameter("phoChargedIsolation")); + photon->iso_nh_token = consumes>(iConfig.getParameter("phoNeutralHadronIsolation")); + photon->iso_pho_token = consumes>(iConfig.getParameter("phoPhotonIsolation")); + photon->iso_wch_token = consumes>(iConfig.getParameter("phoWorstChargedIsolation")); obj.push_back(photon); diff --git a/Ntupler/python/PandaProd_cfi.py b/Ntupler/python/PandaProd_cfi.py index 5bc19a3..e4da7ee 100644 --- a/Ntupler/python/PandaProd_cfi.py +++ b/Ntupler/python/PandaProd_cfi.py @@ -21,7 +21,7 @@ # offline skimming doJetSkim = cms.bool(False), - doRecoilFilter = cms.bool(True), + doRecoilFilter = cms.bool(False), # jet toggles savePuppiCands = cms.bool(False), @@ -29,19 +29,21 @@ doCHSAK4 = cms.bool(True), doPuppiAK4 = cms.bool(True), doPuppiCA15 = cms.bool(True), - doCHSCA15 = cms.bool(False), + doCHSCA15 = cms.bool(True), doPuppiAK8 = cms.bool(True), - doCHSAK8 = cms.bool(False), + doCHSAK8 = cms.bool(True), chsAK4 = cms.InputTag("slimmedJets"), puppiAK4 = cms.InputTag("slimmedJetsPuppi"), - #puppiAK4 = cms.InputTag("patJetsPFAK4Puppi"), chsAK8 = cms.InputTag("packedPatJetsPFchsAK8"), puppiAK8 = cms.InputTag("packedPatJetsPFpuppiAK8"), chsCA15 = cms.InputTag("packedPatJetsPFchsCA15"), puppiCA15 = cms.InputTag("packedPatJetsPFpuppiCA15"), - pfmet = cms.InputTag("slimmedMETs"), + pfmet = cms.InputTag("slimmedMETsMuEGClean"), + pfmet_cleanmu = cms.InputTag('slimmedMETs'), + pfmet_cleaneg = cms.InputTag('slimmedMETsEGClean'), + pfmet_unclean = cms.InputTag('slimmedMETsUncorrected'), puppimet = cms.InputTag("slimmedMETsPuppi"), puppiPFCands = cms.InputTag("puppi"), diff --git a/Ntupler/python/makeFatJets_cff.py b/Ntupler/python/makeFatJets_cff.py index e1db742..aad4eb1 100644 --- a/Ntupler/python/makeFatJets_cff.py +++ b/Ntupler/python/makeFatJets_cff.py @@ -18,7 +18,7 @@ def initFatJets(process,isData): ## INITIAL SETUP ## ######################################## - ## Load standard PAT objects + ## load chs and genparticles ## process.pfCHS = cms.EDFilter("CandPtrSelector", src = cms.InputTag("packedPFCandidates"), cut = cms.string("fromPV")) addGenNoNu=False @@ -34,6 +34,13 @@ def initFatJets(process,isData): process.fatjetInitSequence = cms.Sequence() process.fatjetInitSequence += process.pfCHS + ## load basic b-tag stuff ## + process.load("RecoBTag.ImpactParameter.impactParameter_EventSetup_cff") + process.load("RecoBTag.SecondaryVertex.secondaryVertex_EventSetup_cff") + process.load("RecoBTag.SoftLepton.softLepton_EventSetup_cff") + process.load("RecoBTag.Combined.combinedMVA_EventSetup_cff") + process.load("RecoBTag.CTagging.cTagging_EventSetup_cff") + return process.fatjetInitSequence def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): @@ -103,6 +110,9 @@ def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): bTagInfosSubjets=['None'] bTagDiscriminatorsSubjets=['None'] + + bTagInfos = ['None'] + bTagDiscriminators = ['None'] ### jet clustering ### ######################################## @@ -114,40 +124,40 @@ def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): if not(hasattr(process,"genJetsNoNu"+rLabel)) and isMC: addingGenJets = True setattr(process,"genJetsNoNu"+rLabel, ak4GenJets.clone( - jetAlgorithm = cms.string(jetAlgo), - rParam = cms.double(jetRadius), - src = cms.InputTag("packedGenParticlesForJetsNoNu") - ) + jetAlgorithm = cms.string(jetAlgo), + rParam = cms.double(jetRadius), + src = cms.InputTag("packedGenParticlesForJetsNoNu") + ) ) setattr(process,"PFJets"+customLabel, ak4PFJets.clone( - jetAlgorithm = cms.string(jetAlgo), - rParam = cms.double(jetRadius), - src = cms.InputTag(pfCandidates), - jetPtMin = cms.double(100) - ) + jetAlgorithm = cms.string(jetAlgo), + rParam = cms.double(jetRadius), + src = cms.InputTag(pfCandidates), + jetPtMin = cms.double(100) + ) ) if not(hasattr(process,"genJetsNoNuSoftDrop"+rLabel)) and isMC: addingGenJets = True setattr(process,"genJetsNoNuSoftDrop"+rLabel, getattr(process,'genJetsNoNu'+rLabel).clone( - R0 = cms.double(jetRadius), - useSoftDrop = cms.bool(True), - zcut = cms.double(sdZcut), - beta = cms.double(sdBeta), - writeCompound = cms.bool(True), - useExplicitGhosts = cms.bool(True), - jetCollInstanceName=cms.string("SubJets") - ) + R0 = cms.double(jetRadius), + useSoftDrop = cms.bool(True), + zcut = cms.double(sdZcut), + beta = cms.double(sdBeta), + writeCompound = cms.bool(True), + useExplicitGhosts = cms.bool(True), + jetCollInstanceName=cms.string("SubJets") + ) ) setattr(process,"PFJets"+"SoftDrop"+customLabel, getattr(process,'PFJets'+customLabel).clone( - useSoftDrop = cms.bool(True), - R0 = cms.double(jetRadius), - zcut = cms.double(sdZcut), - beta = cms.double(sdBeta), - writeCompound = cms.bool(True), - useExplicitGhosts = cms.bool(True), - jetCollInstanceName=cms.string("SubJets"), - jetPtMin = cms.double(100) - ) + useSoftDrop = cms.bool(True), + R0 = cms.double(jetRadius), + zcut = cms.double(sdZcut), + beta = cms.double(sdBeta), + writeCompound = cms.bool(True), + useExplicitGhosts = cms.bool(True), + jetCollInstanceName=cms.string("SubJets"), + jetPtMin = cms.double(100) + ) ) process.dump = cms.EDAnalyzer("EventContentAnalyzer") if addingGenJets and not(isData): @@ -162,20 +172,20 @@ def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): ####################################### setattr(process,customLabel+'Njettiness', - Njettiness.clone( - src = cms.InputTag('PFJets'+customLabel), - R0 = cms.double(jetRadius), - Njets = cms.vuint32(1,2,3,4) - ) + Njettiness.clone( + src = cms.InputTag('PFJets'+customLabel), + R0 = cms.double(jetRadius), + Njets = cms.vuint32(1,2,3,4) + ) ) setattr(process,customLabel+'SDKinematics', cms.EDProducer('RecoJetDeltaRValueMapProducer', - src = cms.InputTag('PFJets'+customLabel), - matched = cms.InputTag('PFJets'+"SoftDrop"+customLabel), - distMax = cms.double(1.5), - values = cms.vstring('mass'), - valueLabels = cms.vstring('Mass'), + src = cms.InputTag('PFJets'+customLabel), + matched = cms.InputTag('PFJets'+"SoftDrop"+customLabel), + distMax = cms.double(1.5), + values = cms.vstring('mass'), + valueLabels = cms.vstring('Mass'), ) ) @@ -197,10 +207,10 @@ def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): setattr(process,customLabel+'PFImpactParameterTagInfos', pfImpactParameterTagInfos.clone( - jets = cms.InputTag('PFJets'+"SoftDrop"+customLabel,'SubJets'), - maxDeltaR = cms.double(0.4), - primaryVertex = cms.InputTag('offlineSlimmedPrimaryVertices'), - candidates = cms.InputTag('packedPFCandidates') + jets = cms.InputTag('PFJets'+"SoftDrop"+customLabel,'SubJets'), + maxDeltaR = cms.double(0.4), + primaryVertex = cms.InputTag('offlineSlimmedPrimaryVertices'), + candidates = cms.InputTag('packedPFCandidates') ) ) @@ -222,7 +232,7 @@ def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): newSeq += getattr(process,customLabel+'PFInclusiveSecondaryVertexFinderTagInfos') newSeq += getattr(process,customLabel+'PFCombinedInclusiveSecondaryVertexV2BJetTags') - ### doubleb### + ### doubleb ### setattr(process, customLabel+'PFImpactParameterDoubleSVTagInfos', pfImpactParameterTagInfos.clone( jets = cms.InputTag("PFJets"+customLabel), @@ -271,9 +281,6 @@ def makeFatJets(process,isData,pfCandidates,algoLabel,jetRadius): newSeq += getattr(process,customLabel+'PFBoostedDoubleSVTagInfos') newSeq += getattr(process,customLabel+'PFBoostedDoubleSecondaryVertexBJetTags') - - bTagInfos = ['None'] - bTagDiscriminators = ['None'] ######################################## ## MAKE PAT JETS ## diff --git a/Ntupler/src/ElectronFiller.cc b/Ntupler/src/ElectronFiller.cc index c38bcb7..f54c435 100644 --- a/Ntupler/src/ElectronFiller.cc +++ b/Ntupler/src/ElectronFiller.cc @@ -32,19 +32,20 @@ int ElectronFiller::analyze(const edm::Event& iEvent){ iEvent.getByToken(el_mediumid_token,el_mediumid_handle); iEvent.getByToken(el_tightid_token,el_tightid_handle); iEvent.getByToken(el_hltid_token,el_hltid_handle); + iEvent.getByToken(el_unsmeared_token, el_unsmeared_handle); unsigned int iE=-1; for (const pat::Electron& el : *el_handle) { ++iE; - //PDebug("ElectronFiller",TString::Format("Considering electron with pT=%.3f, eta=%.3f",el.pt(),el.eta())); + // PDebug("ElectronFiller",TString::Format("Considering electron with pT=%.3f, eta=%.3f",el.pt(),el.eta())); if (el.pt()maxEta || !(el.passConversionVeto()) ) { continue; } - //PDebug("ElectronFiller",TString::Format("Passed kinematics and conv veto")); + // PDebug("ElectronFiller",TString::Format("Passed kinematics and conv veto")); edm::RefToBase ref ( edm::Ref< pat::ElectronCollection >(el_handle, iE) ) ; @@ -58,7 +59,8 @@ int ElectronFiller::analyze(const edm::Event& iEvent){ continue; } - //PDebug("ElectronFiller",TString::Format("Passed veto")); + // PDebug("ElectronFiller",TString::Format("Passed veto")); + // compute isolation float chiso = el.pfIsolationVariables().sumChargedHadronPt; @@ -92,6 +94,9 @@ int ElectronFiller::analyze(const edm::Event& iEvent){ electron->id |= (unsigned(tight)*PElectron::kTight); electron->id |= (unsigned(hltsafe)*PElectron::kHLTPresel); + // get the unsmeared momentum + electron->pt_unsmeared = (*el_unsmeared_handle)[iE].pt(); + data->push_back(electron); } diff --git a/Ntupler/src/FatJetFiller.cc b/Ntupler/src/FatJetFiller.cc index 7f5cee5..d71f065 100644 --- a/Ntupler/src/FatJetFiller.cc +++ b/Ntupler/src/FatJetFiller.cc @@ -38,21 +38,21 @@ FatJetFiller::~FatJetFiller(){ void FatJetFiller::init(TTree *t) { t->Branch(treename.Data(),&data,99); - std::string jecDir = "jec/23Sep2016V3/"; + std::string jecDir = "jec/23Sep2016V4/"; std::vector mcParams; mcParams.push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PFPuppi.txt")); mcParams.push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PFPuppi.txt")); mcParams.push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PFPuppi.txt")); mcParams.push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PFPuppi.txt")); mMCJetCorrector = new FactorizedJetCorrector(mcParams); std::vector eraGroups = {"BCD","EF","G","H"}; @@ -61,16 +61,16 @@ void FatJetFiller::init(TTree *t) { dataParams[e].clear(); dataParams[e].push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016"+e+"V3_DATA/Summer16_23Sep2016"+e+"V3_DATA_L1FastJet_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016"+e+"V4_DATA/Summer16_23Sep2016"+e+"V4_DATA_L1FastJet_AK8PFPuppi.txt")); dataParams[e].push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016"+e+"V3_DATA/Summer16_23Sep2016"+e+"V3_DATA_L2Relative_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016"+e+"V4_DATA/Summer16_23Sep2016"+e+"V4_DATA_L2Relative_AK8PFPuppi.txt")); dataParams[e].push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016"+e+"V3_DATA/Summer16_23Sep2016"+e+"V3_DATA_L3Absolute_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016"+e+"V4_DATA/Summer16_23Sep2016"+e+"V4_DATA_L3Absolute_AK8PFPuppi.txt")); dataParams[e].push_back( JetCorrectorParameters( - jecDir + "Summer16_23Sep2016"+e+"V3_DATA/Summer16_23Sep2016"+e+"V3_DATA_L2L3Residual_AK8PFPuppi.txt")); + jecDir + "Summer16_23Sep2016"+e+"V4_DATA/Summer16_23Sep2016"+e+"V4_DATA_L2L3Residual_AK8PFPuppi.txt")); mDataJetCorrectors[e.c_str()] = new FactorizedJetCorrector(dataParams[e]); } eras = new EraHandler(2016); diff --git a/Ntupler/src/METFiller.cc b/Ntupler/src/METFiller.cc index a1c5d74..1337778 100644 --- a/Ntupler/src/METFiller.cc +++ b/Ntupler/src/METFiller.cc @@ -17,41 +17,43 @@ void METFiller::init(TTree *t) { t->Branch(treename.Data(),&data); } -void METFiller::fillMETs(std::vector pfs) { -} - int METFiller::analyze(const edm::Event& iEvent){ if (skipEvent!=0 && *skipEvent) { return 0; } - if (!rerun) { - iEvent.getByToken(met_token,met_handle); - const pat::MET &met = met_handle->front(); - data->pt = met.pt(); - data->phi = met.phi(); - data->sumETRaw = met.uncorSumEt(); - data->raw_pt = met.uncorPt(); - data->raw_phi = met.uncorPhi(); - data->calo_pt = met.caloMETPt(); - data->calo_phi = met.caloMETPhi(); - } else { - iEvent.getByToken(remet_token,remet_handle); - iEvent.getByToken(remetuncorr_token,remetuncorr_handle); - auto &met = remet_handle->front(); - auto &metuncorr = remetuncorr_handle->front(); - data->pt = met.pt(); - data->phi = met.phi(); - data->sumETRaw = metuncorr.sumEt(); - data->raw_pt = metuncorr.pt(); - data->raw_phi = metuncorr.phi(); - data->calo_pt = -1; data->calo_phi = -999; - } + iEvent.getByToken(met_token,met_handle); + const pat::MET &met = met_handle->front(); + data->pt = met.pt(); + data->phi = met.phi(); + data->sumETRaw = met.uncorSumEt(); + data->raw_pt = met.uncorPt(); + data->raw_phi = met.uncorPhi(); if (minimal) return 0; + data->calo_pt = met.caloMETPt(); + data->calo_phi = met.caloMETPhi(); + + iEvent.getByToken(cleanmu_met_token,cleanmu_met_handle); + const pat::MET &cleanmu_met = cleanmu_met_handle->front(); + data->cleanMu_pt = cleanmu_met.pt(); + data->cleanMu_phi = cleanmu_met.phi(); + + if (iEvent.isRealData()) { + iEvent.getByToken(cleaneg_met_token,cleaneg_met_handle); + const pat::MET &cleaneg_met = cleaneg_met_handle->front(); + data->cleanEG_pt = cleaneg_met.pt(); + data->cleanEG_phi = cleaneg_met.phi(); + + iEvent.getByToken(unclean_met_token,unclean_met_handle); + const pat::MET &unclean_met = unclean_met_handle->front(); + data->unclean_pt = unclean_met.pt(); + data->unclean_phi = unclean_met.phi(); + } + std::vector pfcands; if (which_cand==kPat) { iEvent.getByToken(pat_token,pat_handle); diff --git a/Ntupler/src/PhotonFiller.cc b/Ntupler/src/PhotonFiller.cc index 03e4f42..f2bc091 100644 --- a/Ntupler/src/PhotonFiller.cc +++ b/Ntupler/src/PhotonFiller.cc @@ -36,6 +36,7 @@ int PhotonFiller::analyze(const edm::Event& iEvent){ iEvent.getByToken(iso_ch_token,iso_ch_handle); iEvent.getByToken(iso_nh_token,iso_nh_handle); iEvent.getByToken(iso_pho_token,iso_pho_handle); + iEvent.getByToken(pho_unsmeared_token, pho_unsmeared_handle); unsigned int iA=-1; for (const pat::Photon& pho : *pho_handle) { @@ -75,6 +76,8 @@ int PhotonFiller::analyze(const edm::Event& iEvent){ photon->id |= (unsigned(tight)*PPhoton::kTight); photon->id |= (unsigned(pho.passElectronVeto())*PPhoton::kEleVeto); + // get unsmeared momentum + photon->pt_unsmeared = (*pho_unsmeared_handle)[iA].pt(); data->push_back(photon); diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DataMcSF_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DataMcSF_L1RC_AK8PF.txt deleted file mode 100644 index 7c7a34b..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DataMcSF_L1RC_AK8PF.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 1.01971 -0.00606322 9.93087e-05 --4.889 -4.716 5 0 200 1.01628 -0.00604053 9.9617e-05 --4.716 -4.538 5 0 200 1.02005 -0.00597202 9.83409e-05 --4.538 -4.363 5 0 200 1.02173 -0.00562067 8.58367e-05 --4.363 -4.191 5 0 200 1.02067 -0.00523531 7.20176e-05 --4.191 -4.013 5 0 200 1.02503 -0.00471455 5.39065e-05 --4.013 -3.839 5 0 200 1.02451 -0.00399306 2.8146e-05 --3.839 -3.664 5 0 200 1.02398 -0.00331471 4.67445e-06 --3.664 -3.489 5 0 200 1.03401 -0.00370905 6.70633e-06 --3.489 -3.314 5 0 200 1.05199 -0.00502799 2.17434e-05 --3.314 -3.139 5 0 200 1.07085 -0.00620404 4.24314e-05 --3.139 -2.964 5 0 200 1.09597 -0.00812278 7.39064e-05 --2.964 -2.853 5 0 200 1.11799 -0.00975448 9.46623e-05 --2.853 -2.65 5 0 200 1.13979 -0.0114136 0.000118767 --2.65 -2.5 5 0 200 1.15437 -0.0128847 0.000128512 --2.5 -2.322 5 0 200 1.16623 -0.0137502 0.000117093 --2.322 -2.172 5 0 200 1.16912 -0.0143989 0.000113508 --2.172 -2.043 5 0 200 1.16087 -0.0144557 0.00011416 --2.043 -1.93 5 0 200 1.14694 -0.0138348 0.000122401 --1.93 -1.83 5 0 200 1.13372 -0.0130995 0.000123446 --1.83 -1.74 5 0 200 1.12321 -0.0127185 0.000123112 --1.74 -1.653 5 0 200 1.1142 -0.0123982 0.000127985 --1.653 -1.566 5 0 200 1.10521 -0.0119289 0.000131293 --1.566 -1.479 5 0 200 1.0983 -0.0116313 0.000139355 --1.479 -1.392 5 0 200 1.09432 -0.0116183 0.000156967 --1.392 -1.305 5 0 200 1.09196 -0.0116848 0.000173282 --1.305 -1.218 5 0 200 1.09137 -0.0118634 0.00019161 --1.218 -1.131 5 0 200 1.09206 -0.0120611 0.000210165 --1.131 -1.044 5 0 200 1.0945 -0.0123858 0.000235578 --1.044 -0.957 5 0 200 1.09793 -0.0127516 0.000263626 --0.957 -0.879 5 0 200 1.10125 -0.0130253 0.00028627 --0.879 -0.783 5 0 200 1.10503 -0.0133195 0.000309015 --0.783 -0.696 5 0 200 1.10868 -0.0136089 0.000330409 --0.696 -0.609 5 0 200 1.11156 -0.0138308 0.000347499 --0.609 -0.522 5 0 200 1.11349 -0.0139613 0.000358239 --0.522 -0.435 5 0 200 1.11645 -0.0141833 0.000370044 --0.435 -0.348 5 0 200 1.12043 -0.0145799 0.000389415 --0.348 -0.261 5 0 200 1.12353 -0.0149632 0.000409706 --0.261 -0.174 5 0 200 1.1256 -0.0152098 0.000424696 --0.174 -0.087 5 0 200 1.12662 -0.015313 0.000434007 --0.087 0 5 0 200 1.12654 -0.0152773 0.000437708 -0 0.087 5 0 200 1.12572 -0.0151399 0.000437205 -0.087 0.174 5 0 200 1.12394 -0.0148905 0.000431946 -0.174 0.261 5 0 200 1.12108 -0.0145415 0.000422457 -0.261 0.348 5 0 200 1.11786 -0.0142167 0.00041475 -0.348 0.435 5 0 200 1.11474 -0.0140131 0.000413208 -0.435 0.522 5 0 200 1.11037 -0.0137253 0.000408139 -0.522 0.609 5 0 200 1.10614 -0.0134488 0.000402801 -0.609 0.696 5 0 200 1.10264 -0.0132285 0.000395479 -0.696 0.783 5 0 200 1.09866 -0.0129547 0.000379972 -0.783 0.879 5 0 200 1.09519 -0.0127278 0.000362418 -0.879 0.957 5 0 200 1.09255 -0.0126363 0.000347937 -0.957 1.044 5 0 200 1.09004 -0.0125293 0.000330289 -1.044 1.131 5 0 200 1.08758 -0.0123425 0.000305772 -1.131 1.218 5 0 200 1.08575 -0.0121118 0.000278992 -1.218 1.305 5 0 200 1.08491 -0.0119602 0.00025759 -1.305 1.392 5 0 200 1.08554 -0.0119485 0.000239883 -1.392 1.479 5 0 200 1.08812 -0.0121253 0.000226929 -1.479 1.566 5 0 200 1.09209 -0.0124019 0.000214031 -1.566 1.653 5 0 200 1.09633 -0.0127987 0.000204766 -1.653 1.74 5 0 200 1.10137 -0.0133804 0.000201988 -1.74 1.83 5 0 200 1.10531 -0.0136814 0.000193273 -1.83 1.93 5 0 200 1.10913 -0.0137409 0.000175857 -1.93 2.043 5 0 200 1.12324 -0.0147957 0.00018014 -2.043 2.172 5 0 200 1.14249 -0.016233 0.000191964 -2.172 2.322 5 0 200 1.1525 -0.016668 0.000189376 -2.322 2.5 5 0 200 1.14904 -0.0161963 0.000186916 -2.5 2.65 5 0 200 1.13758 -0.0150719 0.000181675 -2.65 2.853 5 0 200 1.12271 -0.0131865 0.000152934 -2.853 2.964 5 0 200 1.10439 -0.0113946 0.00012339 -2.964 3.139 5 0 200 1.08686 -0.00972999 0.000100639 -3.139 3.314 5 0 200 1.06891 -0.00779652 6.39721e-05 -3.314 3.489 5 0 200 1.05531 -0.00670588 4.6156e-05 -3.489 3.664 5 0 200 1.03055 -0.00463112 7.66342e-06 -3.664 3.839 5 0 200 1.02297 -0.00430373 1.82504e-05 -3.839 4.013 5 0 200 1.02653 -0.00526458 5.47586e-05 -4.013 4.191 5 0 200 1.02812 -0.00625746 9.20395e-05 -4.191 4.363 5 0 200 1.02595 -0.00712412 0.000125129 -4.363 4.538 5 0 200 1.02729 -0.00763669 0.000143195 -4.538 4.716 5 0 200 1.02614 -0.00802262 0.000153865 -4.716 4.889 5 0 200 1.02197 -0.00829987 0.000161264 -4.889 5.191 5 0 200 1.01735 -0.00860839 0.000168875 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DataMcSF_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DataMcSF_L1RC_AK8PFchs.txt deleted file mode 100644 index 42b22c9..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DataMcSF_L1RC_AK8PFchs.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 1.01971 -0.00606322 9.93087e-05 --4.889 -4.716 5 0 200 1.01628 -0.00604053 9.9617e-05 --4.716 -4.538 5 0 200 1.02005 -0.00597202 9.83409e-05 --4.538 -4.363 5 0 200 1.02173 -0.00562067 8.58367e-05 --4.363 -4.191 5 0 200 1.02067 -0.00523531 7.20176e-05 --4.191 -4.013 5 0 200 1.02503 -0.00471455 5.39065e-05 --4.013 -3.839 5 0 200 1.02451 -0.00399309 2.81473e-05 --3.839 -3.664 5 0 200 1.02398 -0.0033147 4.67432e-06 --3.664 -3.489 5 0 200 1.03401 -0.00370901 6.70511e-06 --3.489 -3.314 5 0 200 1.05191 -0.00502206 2.17434e-05 --3.314 -3.139 5 0 200 1.06837 -0.00602048 4.36152e-05 --3.139 -2.964 5 0 200 1.0851 -0.00739611 9.05256e-05 --2.964 -2.853 5 0 200 1.10223 -0.00894568 0.000153264 --2.853 -2.65 5 0 200 1.12339 -0.0108159 0.000237054 --2.65 -2.5 5 0 200 1.14598 -0.0135463 0.000362665 --2.5 -2.322 5 0 200 1.17392 -0.0163541 0.000494799 --2.322 -2.172 5 0 200 1.19575 -0.0194791 0.000648329 --2.172 -2.043 5 0 200 1.19855 -0.0217861 0.000805288 --2.043 -1.93 5 0 200 1.18835 -0.0229569 0.000965183 --1.93 -1.83 5 0 200 1.1755 -0.0234404 0.00107572 --1.83 -1.74 5 0 200 1.16412 -0.0239008 0.0011294 --1.74 -1.653 5 0 200 1.15573 -0.024283 0.00117605 --1.653 -1.566 5 0 200 1.14949 -0.024362 0.00120665 --1.566 -1.479 5 0 200 1.14421 -0.0243249 0.00122747 --1.479 -1.392 5 0 200 1.14078 -0.024343 0.00124707 --1.392 -1.305 5 0 200 1.13856 -0.0244969 0.00127324 --1.305 -1.218 5 0 200 1.13772 -0.0247466 0.00130559 --1.218 -1.131 5 0 200 1.13784 -0.0248941 0.00133676 --1.131 -1.044 5 0 200 1.13972 -0.0250534 0.00137531 --1.044 -0.957 5 0 200 1.14345 -0.0252063 0.00141989 --0.957 -0.879 5 0 200 1.14775 -0.0252037 0.00145878 --0.879 -0.783 5 0 200 1.15376 -0.0252595 0.00150307 --0.783 -0.696 5 0 200 1.16064 -0.0253484 0.00154392 --0.696 -0.609 5 0 200 1.16737 -0.0255057 0.00157496 --0.609 -0.522 5 0 200 1.17338 -0.0257104 0.00159415 --0.522 -0.435 5 0 200 1.18143 -0.0261138 0.00161154 --0.435 -0.348 5 0 200 1.19104 -0.0268711 0.00164008 --0.348 -0.261 5 0 200 1.19844 -0.0276265 0.00166376 --0.261 -0.174 5 0 200 1.20347 -0.0280997 0.00167075 --0.174 -0.087 5 0 200 1.20579 -0.0283074 0.00166732 --0.087 0 5 0 200 1.20565 -0.0283569 0.0016609 -0 0.087 5 0 200 1.2036 -0.0282008 0.0016459 -0.087 0.174 5 0 200 1.19971 -0.0278218 0.00161867 -0.174 0.261 5 0 200 1.19441 -0.0273086 0.00158341 -0.261 0.348 5 0 200 1.18837 -0.0267606 0.00154795 -0.348 0.435 5 0 200 1.1821 -0.0263461 0.00152108 -0.435 0.522 5 0 200 1.17301 -0.0257952 0.00148828 -0.522 0.609 5 0 200 1.16433 -0.0252928 0.00145571 -0.609 0.696 5 0 200 1.1575 -0.0248681 0.00142009 -0.696 0.783 5 0 200 1.14919 -0.0243098 0.0013723 -0.783 0.879 5 0 200 1.14099 -0.0237991 0.00132399 -0.879 0.957 5 0 200 1.13413 -0.0234252 0.00128259 -0.957 1.044 5 0 200 1.12855 -0.0231002 0.00124711 -1.044 1.131 5 0 200 1.12449 -0.0228173 0.00121529 -1.131 1.218 5 0 200 1.12251 -0.0225559 0.00118761 -1.218 1.305 5 0 200 1.12213 -0.0223353 0.00116637 -1.305 1.392 5 0 200 1.12409 -0.0222944 0.0011518 -1.392 1.479 5 0 200 1.12882 -0.0224215 0.00114366 -1.479 1.566 5 0 200 1.13599 -0.022672 0.00114111 -1.566 1.653 5 0 200 1.14665 -0.0230943 0.00113986 -1.653 1.74 5 0 200 1.15999 -0.0236405 0.00113824 -1.74 1.83 5 0 200 1.17036 -0.0235212 0.00110802 -1.83 1.93 5 0 200 1.17962 -0.0228527 0.00104283 -1.93 2.043 5 0 200 1.20253 -0.0233683 0.000958388 -2.043 2.172 5 0 200 1.2282 -0.0240612 0.000855151 -2.172 2.322 5 0 200 1.22945 -0.0226417 0.000705533 -2.322 2.5 5 0 200 1.20743 -0.0198381 0.000550255 -2.5 2.65 5 0 200 1.17548 -0.0166177 0.000400179 -2.65 2.853 5 0 200 1.14534 -0.0133349 0.000255905 -2.853 2.964 5 0 200 1.11907 -0.0111964 0.000169687 -2.964 3.139 5 0 200 1.09706 -0.00956629 0.000114545 -3.139 3.314 5 0 200 1.07299 -0.00780986 6.51597e-05 -3.314 3.489 5 0 200 1.0557 -0.00671474 4.61753e-05 -3.489 3.664 5 0 200 1.03055 -0.00463122 7.66814e-06 -3.664 3.839 5 0 200 1.02297 -0.00430373 1.82504e-05 -3.839 4.013 5 0 200 1.02653 -0.00526458 5.47586e-05 -4.013 4.191 5 0 200 1.02812 -0.00625746 9.20395e-05 -4.191 4.363 5 0 200 1.02595 -0.00712412 0.000125129 -4.363 4.538 5 0 200 1.02729 -0.00763669 0.000143195 -4.538 4.716 5 0 200 1.02614 -0.00802262 0.000153865 -4.716 4.889 5 0 200 1.02197 -0.00829987 0.000161264 -4.889 5.191 5 0 200 1.01735 -0.00860839 0.000168875 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DataMcSF_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DataMcSF_L1RC_AK8PF.txt deleted file mode 100644 index c9a1e38..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DataMcSF_L1RC_AK8PF.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 0.933001 0.0113371 -0.000624062 --4.889 -4.716 5 0 200 0.931859 0.0113801 -0.000627215 --4.716 -4.538 5 0 200 0.937072 0.01163 -0.000637808 --4.538 -4.363 5 0 200 0.941082 0.0120277 -0.000653208 --4.363 -4.191 5 0 200 0.943226 0.0123683 -0.000666882 --4.191 -4.013 5 0 200 0.950945 0.0129768 -0.000691072 --4.013 -3.839 5 0 200 0.955031 0.0135895 -0.000714123 --3.839 -3.664 5 0 200 0.958519 0.01424 -0.000738621 --3.664 -3.489 5 0 200 0.971486 0.0145751 -0.000774248 --3.489 -3.314 5 0 200 0.991854 0.0141841 -0.000803674 --3.314 -3.139 5 0 200 1.01024 0.0141591 -0.000834321 --3.139 -2.964 5 0 200 1.03442 0.0131815 -0.000840569 --2.964 -2.853 5 0 200 1.05396 0.0123792 -0.000851191 --2.853 -2.65 5 0 200 1.06949 0.0119253 -0.000871631 --2.65 -2.5 5 0 200 1.0773 0.0112578 -0.000883777 --2.5 -2.322 5 0 200 1.08249 0.0107825 -0.000896737 --2.322 -2.172 5 0 200 1.07957 0.00996482 -0.000880763 --2.172 -2.043 5 0 200 1.06888 0.00894294 -0.000829832 --2.043 -1.93 5 0 200 1.05273 0.00886367 -0.000787462 --1.93 -1.83 5 0 200 1.03892 0.00894544 -0.000755943 --1.83 -1.74 5 0 200 1.02952 0.0088049 -0.000733967 --1.74 -1.653 5 0 200 1.02089 0.00893579 -0.000722895 --1.653 -1.566 5 0 200 1.01206 0.00933244 -0.00071898 --1.566 -1.479 5 0 200 1.00536 0.00958697 -0.000711377 --1.479 -1.392 5 0 200 1.00114 0.0096839 -0.000699418 --1.392 -1.305 5 0 200 0.998976 0.00967827 -0.00068755 --1.305 -1.218 5 0 200 0.998564 0.00961294 -0.000676139 --1.218 -1.131 5 0 200 0.99935 0.00956466 -0.000666258 --1.131 -1.044 5 0 200 1.00113 0.00955943 -0.000657388 --1.044 -0.957 5 0 200 1.00371 0.0095751 -0.000649289 --0.957 -0.879 5 0 200 1.00639 0.0096422 -0.000644302 --0.879 -0.783 5 0 200 1.00917 0.00976359 -0.000642245 --0.783 -0.696 5 0 200 1.01151 0.00993833 -0.000643101 --0.696 -0.609 5 0 200 1.01329 0.0101126 -0.000644844 --0.609 -0.522 5 0 200 1.01436 0.0102782 -0.000647863 --0.522 -0.435 5 0 200 1.01596 0.0104298 -0.000653122 --0.435 -0.348 5 0 200 1.0181 0.0105295 -0.000656794 --0.348 -0.261 5 0 200 1.01941 0.0105982 -0.000657029 --0.261 -0.174 5 0 200 1.01999 0.0106763 -0.000655695 --0.174 -0.087 5 0 200 1.01967 0.0108243 -0.000655953 --0.087 0 5 0 200 1.01851 0.0110447 -0.000658685 -0 0.087 5 0 200 1.01715 0.0112631 -0.000661214 -0.087 0.174 5 0 200 1.01541 0.0114753 -0.000663393 -0.174 0.261 5 0 200 1.013 0.0116957 -0.000665666 -0.261 0.348 5 0 200 1.01024 0.0118802 -0.000665744 -0.348 0.435 5 0 200 1.00708 0.0119995 -0.000662298 -0.435 0.522 5 0 200 1.00334 0.0120435 -0.000654427 -0.522 0.609 5 0 200 1.00003 0.0120245 -0.000644239 -0.609 0.696 5 0 200 0.99725 0.0119577 -0.000636626 -0.696 0.783 5 0 200 0.994402 0.0118164 -0.00063182 -0.783 0.879 5 0 200 0.991564 0.0116844 -0.000631552 -0.879 0.957 5 0 200 0.988786 0.0115666 -0.000635166 -0.957 1.044 5 0 200 0.986673 0.0113744 -0.000638847 -1.044 1.131 5 0 200 0.984887 0.0111792 -0.000645466 -1.131 1.218 5 0 200 0.983376 0.0110878 -0.000656553 -1.218 1.305 5 0 200 0.982183 0.0110929 -0.000670818 -1.305 1.392 5 0 200 0.982439 0.0110213 -0.000684774 -1.392 1.479 5 0 200 0.984737 0.0108105 -0.00069651 -1.479 1.566 5 0 200 0.989051 0.0104517 -0.00070577 -1.566 1.653 5 0 200 0.994582 0.00987547 -0.000707593 -1.653 1.74 5 0 200 1.00126 0.00911943 -0.000703939 -1.74 1.83 5 0 200 1.00643 0.00876522 -0.000711932 -1.83 1.93 5 0 200 1.01157 0.00877176 -0.000734104 -1.93 2.043 5 0 200 1.02602 0.00835509 -0.00076171 -2.043 2.172 5 0 200 1.04628 0.00781744 -0.000795957 -2.172 2.322 5 0 200 1.06231 0.00781318 -0.000827821 -2.322 2.5 5 0 200 1.06805 0.0078806 -0.000824094 -2.5 2.65 5 0 200 1.06602 0.00811907 -0.000801384 -2.65 2.853 5 0 200 1.06121 0.00859657 -0.000777803 -2.853 2.964 5 0 200 1.04901 0.00916107 -0.000759157 -2.964 3.139 5 0 200 1.03238 0.0102153 -0.000758536 -3.139 3.314 5 0 200 1.01259 0.0115496 -0.000768654 -3.314 3.489 5 0 200 0.997297 0.0118435 -0.000748715 -3.489 3.664 5 0 200 0.971581 0.0127188 -0.000730078 -3.664 3.839 5 0 200 0.958457 0.0127227 -0.000699817 -3.839 4.013 5 0 200 0.956596 0.0120849 -0.000676824 -4.013 4.191 5 0 200 0.953195 0.0113365 -0.000650317 -4.191 4.363 5 0 200 0.946918 0.0106445 -0.000625005 -4.363 4.538 5 0 200 0.94561 0.0101479 -0.000607317 -4.538 4.716 5 0 200 0.943531 0.00951197 -0.000585526 -4.716 4.889 5 0 200 0.938716 0.0089726 -0.000566167 -4.889 5.191 5 0 200 0.932432 0.00843487 -0.000547686 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DataMcSF_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DataMcSF_L1RC_AK8PFchs.txt deleted file mode 100644 index 9e9a51b..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DataMcSF_L1RC_AK8PFchs.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 0.933001 0.0113371 -0.000624062 --4.889 -4.716 5 0 200 0.931859 0.0113801 -0.000627215 --4.716 -4.538 5 0 200 0.937072 0.01163 -0.000637808 --4.538 -4.363 5 0 200 0.941082 0.0120277 -0.000653208 --4.363 -4.191 5 0 200 0.943226 0.0123683 -0.000666882 --4.191 -4.013 5 0 200 0.950945 0.0129768 -0.000691072 --4.013 -3.839 5 0 200 0.955031 0.0135895 -0.000714123 --3.839 -3.664 5 0 200 0.958519 0.01424 -0.000738621 --3.664 -3.489 5 0 200 0.971486 0.0145751 -0.000774249 --3.489 -3.314 5 0 200 0.991803 0.0141925 -0.00080383 --3.314 -3.139 5 0 200 1.00805 0.014414 -0.000838085 --3.139 -2.964 5 0 200 1.0238 0.0143971 -0.000854933 --2.964 -2.853 5 0 200 1.03718 0.0144764 -0.00086712 --2.853 -2.65 5 0 200 1.0508 0.0148633 -0.000882757 --2.65 -2.5 5 0 200 1.06217 0.014914 -0.000876013 --2.5 -2.322 5 0 200 1.0766 0.0148985 -0.000858105 --2.322 -2.172 5 0 200 1.08551 0.0136287 -0.00077609 --2.172 -2.043 5 0 200 1.08006 0.0114873 -0.000619452 --2.043 -1.93 5 0 200 1.06148 0.0104353 -0.000465226 --1.93 -1.83 5 0 200 1.04498 0.00951873 -0.000337772 --1.83 -1.74 5 0 200 1.03439 0.00836903 -0.000257963 --1.74 -1.653 5 0 200 1.02467 0.00791292 -0.000212729 --1.653 -1.566 5 0 200 1.01607 0.00802722 -0.000193578 --1.566 -1.479 5 0 200 1.00946 0.00815716 -0.000179065 --1.479 -1.392 5 0 200 1.00542 0.0082211 -0.000165182 --1.392 -1.305 5 0 200 1.00295 0.00819805 -0.000147882 --1.305 -1.218 5 0 200 1.00174 0.00818963 -0.000130048 --1.218 -1.131 5 0 200 1.00119 0.00839073 -0.000118518 --1.131 -1.044 5 0 200 1.00063 0.00896917 -0.000116894 --1.044 -0.957 5 0 200 1.00084 0.00982924 -0.00012226 --0.957 -0.879 5 0 200 1.00192 0.0108205 -0.000131775 --0.879 -0.783 5 0 200 1.004 0.0119426 -0.000144462 --0.783 -0.696 5 0 200 1.00675 0.0130522 -0.000160399 --0.696 -0.609 5 0 200 1.0103 0.0138025 -0.000171724 --0.609 -0.522 5 0 200 1.01469 0.0141012 -0.000175366 --0.522 -0.435 5 0 200 1.02098 0.014183 -0.000178501 --0.435 -0.348 5 0 200 1.02788 0.0140975 -0.000178694 --0.348 -0.261 5 0 200 1.03282 0.0138689 -0.000175553 --0.261 -0.174 5 0 200 1.03674 0.0135527 -0.000170129 --0.174 -0.087 5 0 200 1.03868 0.0133192 -0.000166208 --0.087 0 5 0 200 1.03802 0.0132654 -0.00016718 -0 0.087 5 0 200 1.03657 0.0132119 -0.000168485 -0.087 0.174 5 0 200 1.03434 0.0131672 -0.000172579 -0.174 0.261 5 0 200 1.03134 0.0131261 -0.000179173 -0.261 0.348 5 0 200 1.0282 0.013011 -0.000181838 -0.348 0.435 5 0 200 1.02477 0.0127449 -0.000175955 -0.435 0.522 5 0 200 1.0199 0.0122888 -0.000160995 -0.522 0.609 5 0 200 1.01518 0.011798 -0.000145756 -0.609 0.696 5 0 200 1.01126 0.0113525 -0.00013783 -0.696 0.783 5 0 200 1.00629 0.0108818 -0.000134755 -0.783 0.879 5 0 200 1.00076 0.0104567 -0.000137302 -0.879 0.957 5 0 200 0.995251 0.0101658 -0.000145791 -0.957 1.044 5 0 200 0.990824 0.0099148 -0.000153582 -1.044 1.131 5 0 200 0.98714 0.00974329 -0.000163159 -1.131 1.218 5 0 200 0.984475 0.00975216 -0.000177663 -1.218 1.305 5 0 200 0.982423 0.00996111 -0.000197658 -1.305 1.392 5 0 200 0.982494 0.0101421 -0.000219182 -1.392 1.479 5 0 200 0.984955 0.010337 -0.000243039 -1.479 1.566 5 0 200 0.988892 0.0107139 -0.000274879 -1.566 1.653 5 0 200 0.996545 0.0110555 -0.000311614 -1.653 1.74 5 0 200 1.00731 0.0113219 -0.000350965 -1.74 1.83 5 0 200 1.01613 0.0121081 -0.000411077 -1.83 1.93 5 0 200 1.02547 0.0132782 -0.000497314 -1.93 2.043 5 0 200 1.05007 0.0134823 -0.000613387 -2.043 2.172 5 0 200 1.0816 0.0132438 -0.000741202 -2.172 2.322 5 0 200 1.09894 0.0135185 -0.000853582 -2.322 2.5 5 0 200 1.09724 0.0133652 -0.000889784 -2.5 2.65 5 0 200 1.08542 0.0127348 -0.000877043 -2.65 2.853 5 0 200 1.07314 0.0121268 -0.000852209 -2.853 2.964 5 0 200 1.05676 0.0115971 -0.000820176 -2.964 3.139 5 0 200 1.03897 0.0114911 -0.000796824 -3.139 3.314 5 0 200 1.01599 0.0117596 -0.000777369 -3.314 3.489 5 0 200 0.997664 0.0118442 -0.000749062 -3.489 3.664 5 0 200 0.971581 0.0127188 -0.000730078 -3.664 3.839 5 0 200 0.958457 0.0127227 -0.000699817 -3.839 4.013 5 0 200 0.956596 0.0120849 -0.000676824 -4.013 4.191 5 0 200 0.953195 0.0113365 -0.000650317 -4.191 4.363 5 0 200 0.946918 0.0106445 -0.000625005 -4.363 4.538 5 0 200 0.94561 0.0101479 -0.000607317 -4.538 4.716 5 0 200 0.943531 0.00951197 -0.000585526 -4.716 4.889 5 0 200 0.938716 0.0089726 -0.000566167 -4.889 5.191 5 0 200 0.932432 0.00843487 -0.000547686 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DataMcSF_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DataMcSF_L1RC_AK8PF.txt deleted file mode 100644 index 11096f7..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DataMcSF_L1RC_AK8PF.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 1.13898 -0.0242149 0.000729498 --4.889 -4.716 5 0 200 1.13825 -0.023972 0.000717815 --4.716 -4.538 5 0 200 1.14613 -0.0239111 0.000712926 --4.538 -4.363 5 0 200 1.15347 -0.0237658 0.00070555 --4.363 -4.191 5 0 200 1.15809 -0.0234954 0.000692977 --4.191 -4.013 5 0 200 1.1699 -0.0231613 0.000677432 --4.013 -3.839 5 0 200 1.17809 -0.0227839 0.000660979 --3.839 -3.664 5 0 200 1.18548 -0.0223448 0.000642174 --3.664 -3.489 5 0 200 1.19355 -0.021706 0.000594787 --3.489 -3.314 5 0 200 1.2063 -0.0219639 0.00055561 --3.314 -3.139 5 0 200 1.21857 -0.021943 0.000517004 --3.139 -2.964 5 0 200 1.23308 -0.0218864 0.000481164 --2.964 -2.853 5 0 200 1.24322 -0.0213651 0.0004408 --2.853 -2.65 5 0 200 1.24967 -0.0202968 0.000389619 --2.65 -2.5 5 0 200 1.24687 -0.0188867 0.000337936 --2.5 -2.322 5 0 200 1.24431 -0.0173793 0.000300685 --2.322 -2.172 5 0 200 1.23735 -0.0163538 0.000303239 --2.172 -2.043 5 0 200 1.23079 -0.0162711 0.000358206 --2.043 -1.93 5 0 200 1.22175 -0.0158286 0.000411426 --1.93 -1.83 5 0 200 1.21306 -0.0154427 0.000448357 --1.83 -1.74 5 0 200 1.20681 -0.015498 0.000472711 --1.74 -1.653 5 0 200 1.20127 -0.0155212 0.00048836 --1.653 -1.566 5 0 200 1.19555 -0.0154566 0.00049808 --1.566 -1.479 5 0 200 1.19154 -0.0154955 0.000508964 --1.479 -1.392 5 0 200 1.19012 -0.015731 0.000523791 --1.392 -1.305 5 0 200 1.19074 -0.0160934 0.000540589 --1.305 -1.218 5 0 200 1.19305 -0.0165264 0.000557716 --1.218 -1.131 5 0 200 1.1964 -0.0169245 0.000571828 --1.131 -1.044 5 0 200 1.20082 -0.0173007 0.000584409 --1.044 -0.957 5 0 200 1.2062 -0.0176865 0.000596121 --0.957 -0.879 5 0 200 1.21167 -0.018024 0.000605107 --0.879 -0.783 5 0 200 1.21755 -0.0183326 0.000612036 --0.783 -0.696 5 0 200 1.22357 -0.0186319 0.000617623 --0.696 -0.609 5 0 200 1.22849 -0.0188564 0.000620439 --0.609 -0.522 5 0 200 1.23152 -0.018951 0.000617966 --0.522 -0.435 5 0 200 1.23464 -0.0190006 0.0006134 --0.435 -0.348 5 0 200 1.23834 -0.0191182 0.000612178 --0.348 -0.261 5 0 200 1.2409 -0.0192336 0.000612434 --0.261 -0.174 5 0 200 1.24282 -0.0193576 0.000614247 --0.174 -0.087 5 0 200 1.24432 -0.0194881 0.000617545 --0.087 0 5 0 200 1.24461 -0.019523 0.00061828 -0 0.087 5 0 200 1.24405 -0.0195015 0.000617727 -0.087 0.174 5 0 200 1.24237 -0.019412 0.000615545 -0.174 0.261 5 0 200 1.23968 -0.0192779 0.000612397 -0.261 0.348 5 0 200 1.2364 -0.0191407 0.000609989 -0.348 0.435 5 0 200 1.23228 -0.0190062 0.000609271 -0.435 0.522 5 0 200 1.22683 -0.018828 0.000609165 -0.522 0.609 5 0 200 1.22167 -0.0186641 0.000610625 -0.609 0.696 5 0 200 1.21716 -0.0185414 0.000612509 -0.696 0.783 5 0 200 1.21172 -0.0183771 0.000611962 -0.783 0.879 5 0 200 1.20587 -0.0181132 0.000607729 -0.879 0.957 5 0 200 1.20053 -0.017829 0.000601697 -0.957 1.044 5 0 200 1.19582 -0.0175605 0.000594959 -1.044 1.131 5 0 200 1.1914 -0.0172646 0.000585846 -1.131 1.218 5 0 200 1.18758 -0.0169277 0.000574004 -1.218 1.305 5 0 200 1.18396 -0.0165197 0.000559066 -1.305 1.392 5 0 200 1.18143 -0.0161303 0.000542214 -1.392 1.479 5 0 200 1.18048 -0.0158237 0.000525898 -1.479 1.566 5 0 200 1.18069 -0.0155575 0.000509125 -1.566 1.653 5 0 200 1.18084 -0.0153197 0.000490425 -1.653 1.74 5 0 200 1.18112 -0.0151201 0.000470406 -1.74 1.83 5 0 200 1.18062 -0.0148095 0.00044539 -1.83 1.93 5 0 200 1.1808 -0.0144956 0.000413985 -1.93 2.043 5 0 200 1.18989 -0.0150315 0.000382601 -2.043 2.172 5 0 200 1.20358 -0.0159716 0.00034342 -2.172 2.322 5 0 200 1.21431 -0.0166265 0.000298769 -2.322 2.5 5 0 200 1.22283 -0.0180757 0.000304201 -2.5 2.65 5 0 200 1.22804 -0.0198046 0.000347355 -2.65 2.853 5 0 200 1.23352 -0.0214879 0.000408536 -2.853 2.964 5 0 200 1.23111 -0.022696 0.00046433 -2.964 3.139 5 0 200 1.22541 -0.0233656 0.000508896 -3.139 3.314 5 0 200 1.21791 -0.0237123 0.000553353 -3.314 3.489 5 0 200 1.21021 -0.0238401 0.0005945 -3.489 3.664 5 0 200 1.19064 -0.0229932 0.000617974 -3.664 3.839 5 0 200 1.18138 -0.023277 0.000659754 -3.839 4.013 5 0 200 1.17582 -0.0237291 0.000678116 -4.013 4.191 5 0 200 1.16821 -0.0241996 0.000696385 -4.191 4.363 5 0 200 1.15754 -0.0245016 0.000708696 -4.363 4.538 5 0 200 1.15353 -0.0248278 0.000721718 -4.538 4.716 5 0 200 1.1482 -0.0251736 0.000734157 -4.716 4.889 5 0 200 1.13991 -0.0253535 0.000741418 -4.889 5.191 5 0 200 1.12891 -0.0254184 0.000744266 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DataMcSF_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DataMcSF_L1RC_AK8PFchs.txt deleted file mode 100644 index b29cf16..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DataMcSF_L1RC_AK8PFchs.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 1.13898 -0.0242149 0.000729498 --4.889 -4.716 5 0 200 1.13825 -0.023972 0.000717815 --4.716 -4.538 5 0 200 1.14613 -0.0239111 0.000712926 --4.538 -4.363 5 0 200 1.15347 -0.0237658 0.00070555 --4.363 -4.191 5 0 200 1.15809 -0.0234954 0.000692977 --4.191 -4.013 5 0 200 1.1699 -0.0231613 0.000677432 --4.013 -3.839 5 0 200 1.17809 -0.0227839 0.000660979 --3.839 -3.664 5 0 200 1.18548 -0.0223448 0.000642174 --3.664 -3.489 5 0 200 1.19355 -0.021706 0.000594787 --3.489 -3.314 5 0 200 1.20628 -0.0219597 0.000555505 --3.314 -3.139 5 0 200 1.2175 -0.0218954 0.000516469 --3.139 -2.964 5 0 200 1.22807 -0.0218324 0.000483625 --2.964 -2.853 5 0 200 1.23716 -0.0215524 0.000451977 --2.853 -2.65 5 0 200 1.24764 -0.0209916 0.000413648 --2.65 -2.5 5 0 200 1.25432 -0.0202019 0.000369406 --2.5 -2.322 5 0 200 1.26407 -0.0187955 0.000318673 --2.322 -2.172 5 0 200 1.26904 -0.0175276 0.000308771 --2.172 -2.043 5 0 200 1.27123 -0.0174848 0.00038906 --2.043 -1.93 5 0 200 1.26369 -0.0166379 0.000480482 --1.93 -1.83 5 0 200 1.25479 -0.0159441 0.000554951 --1.83 -1.74 5 0 200 1.24821 -0.0161795 0.000601419 --1.74 -1.653 5 0 200 1.24268 -0.0163354 0.000627322 --1.653 -1.566 5 0 200 1.23815 -0.0163192 0.000638615 --1.566 -1.479 5 0 200 1.23549 -0.0164157 0.000649778 --1.479 -1.392 5 0 200 1.23572 -0.0167522 0.000664117 --1.392 -1.305 5 0 200 1.23738 -0.0172329 0.000680358 --1.305 -1.218 5 0 200 1.24028 -0.0177907 0.000696949 --1.218 -1.131 5 0 200 1.24387 -0.0182525 0.000709224 --1.131 -1.044 5 0 200 1.24926 -0.0187222 0.000723076 --1.044 -0.957 5 0 200 1.25694 -0.0192356 0.000738201 --0.957 -0.879 5 0 200 1.26606 -0.0197432 0.000752129 --0.879 -0.783 5 0 200 1.2771 -0.0202631 0.000765676 --0.783 -0.696 5 0 200 1.28951 -0.0208206 0.000779889 --0.696 -0.609 5 0 200 1.30015 -0.0212452 0.000789395 --0.609 -0.522 5 0 200 1.30812 -0.0215101 0.000792145 --0.522 -0.435 5 0 200 1.31667 -0.0217293 0.000791897 --0.435 -0.348 5 0 200 1.32562 -0.0220672 0.000796785 --0.348 -0.261 5 0 200 1.33177 -0.0224126 0.000804382 --0.261 -0.174 5 0 200 1.33625 -0.0227171 0.000812714 --0.174 -0.087 5 0 200 1.33892 -0.0229618 0.000821111 --0.087 0 5 0 200 1.33868 -0.0230208 0.000824045 -0 0.087 5 0 200 1.33652 -0.0229675 0.000823602 -0.087 0.174 5 0 200 1.3325 -0.0228066 0.000820205 -0.174 0.261 5 0 200 1.32707 -0.0225692 0.000815312 -0.261 0.348 5 0 200 1.32096 -0.0222882 0.000810093 -0.348 0.435 5 0 200 1.3138 -0.0219955 0.000806177 -0.435 0.522 5 0 200 1.30376 -0.0216463 0.0008027 -0.522 0.609 5 0 200 1.29361 -0.0212832 0.000799757 -0.609 0.696 5 0 200 1.285 -0.0209929 0.000797679 -0.696 0.783 5 0 200 1.27453 -0.020633 0.000791822 -0.783 0.879 5 0 200 1.26299 -0.0200924 0.000779567 -0.879 0.957 5 0 200 1.25329 -0.0196154 0.000768377 -0.957 1.044 5 0 200 1.24575 -0.0192461 0.00075981 -1.044 1.131 5 0 200 1.23928 -0.0188499 0.000749129 -1.131 1.218 5 0 200 1.23422 -0.0183738 0.000734702 -1.218 1.305 5 0 200 1.23007 -0.0178105 0.000717743 -1.305 1.392 5 0 200 1.22782 -0.0172734 0.000698852 -1.392 1.479 5 0 200 1.22829 -0.0168562 0.000681123 -1.479 1.566 5 0 200 1.23074 -0.0164916 0.000662664 -1.566 1.653 5 0 200 1.23692 -0.0163108 0.000642997 -1.653 1.74 5 0 200 1.2461 -0.0162912 0.000622483 -1.74 1.83 5 0 200 1.25211 -0.0159332 0.000584995 -1.83 1.93 5 0 200 1.25728 -0.0155048 0.000530421 -1.93 2.043 5 0 200 1.27438 -0.0166776 0.000468369 -2.043 2.172 5 0 200 1.29537 -0.0185754 0.000400226 -2.172 2.322 5 0 200 1.30235 -0.0197261 0.000334734 -2.322 2.5 5 0 200 1.3011 -0.0218652 0.000365304 -2.5 2.65 5 0 200 1.28958 -0.0234171 0.000423771 -2.65 2.853 5 0 200 1.27802 -0.0243091 0.000478494 -2.853 2.964 5 0 200 1.26185 -0.0246652 0.00051679 -2.964 3.139 5 0 200 1.24505 -0.0245437 0.000540808 -3.139 3.314 5 0 200 1.22433 -0.0240461 0.000561805 -3.314 3.489 5 0 200 1.21072 -0.0238633 0.000595017 -3.489 3.664 5 0 200 1.19064 -0.0229932 0.000617974 -3.664 3.839 5 0 200 1.18138 -0.023277 0.000659754 -3.839 4.013 5 0 200 1.17582 -0.0237291 0.000678116 -4.013 4.191 5 0 200 1.16821 -0.0241996 0.000696385 -4.191 4.363 5 0 200 1.15754 -0.0245016 0.000708696 -4.363 4.538 5 0 200 1.15353 -0.0248278 0.000721718 -4.538 4.716 5 0 200 1.1482 -0.0251736 0.000734157 -4.716 4.889 5 0 200 1.13991 -0.0253535 0.000741418 -4.889 5.191 5 0 200 1.12891 -0.0254184 0.000744266 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DataMcSF_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DataMcSF_L1RC_AK8PF.txt deleted file mode 100644 index 11096f7..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DataMcSF_L1RC_AK8PF.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 1.13898 -0.0242149 0.000729498 --4.889 -4.716 5 0 200 1.13825 -0.023972 0.000717815 --4.716 -4.538 5 0 200 1.14613 -0.0239111 0.000712926 --4.538 -4.363 5 0 200 1.15347 -0.0237658 0.00070555 --4.363 -4.191 5 0 200 1.15809 -0.0234954 0.000692977 --4.191 -4.013 5 0 200 1.1699 -0.0231613 0.000677432 --4.013 -3.839 5 0 200 1.17809 -0.0227839 0.000660979 --3.839 -3.664 5 0 200 1.18548 -0.0223448 0.000642174 --3.664 -3.489 5 0 200 1.19355 -0.021706 0.000594787 --3.489 -3.314 5 0 200 1.2063 -0.0219639 0.00055561 --3.314 -3.139 5 0 200 1.21857 -0.021943 0.000517004 --3.139 -2.964 5 0 200 1.23308 -0.0218864 0.000481164 --2.964 -2.853 5 0 200 1.24322 -0.0213651 0.0004408 --2.853 -2.65 5 0 200 1.24967 -0.0202968 0.000389619 --2.65 -2.5 5 0 200 1.24687 -0.0188867 0.000337936 --2.5 -2.322 5 0 200 1.24431 -0.0173793 0.000300685 --2.322 -2.172 5 0 200 1.23735 -0.0163538 0.000303239 --2.172 -2.043 5 0 200 1.23079 -0.0162711 0.000358206 --2.043 -1.93 5 0 200 1.22175 -0.0158286 0.000411426 --1.93 -1.83 5 0 200 1.21306 -0.0154427 0.000448357 --1.83 -1.74 5 0 200 1.20681 -0.015498 0.000472711 --1.74 -1.653 5 0 200 1.20127 -0.0155212 0.00048836 --1.653 -1.566 5 0 200 1.19555 -0.0154566 0.00049808 --1.566 -1.479 5 0 200 1.19154 -0.0154955 0.000508964 --1.479 -1.392 5 0 200 1.19012 -0.015731 0.000523791 --1.392 -1.305 5 0 200 1.19074 -0.0160934 0.000540589 --1.305 -1.218 5 0 200 1.19305 -0.0165264 0.000557716 --1.218 -1.131 5 0 200 1.1964 -0.0169245 0.000571828 --1.131 -1.044 5 0 200 1.20082 -0.0173007 0.000584409 --1.044 -0.957 5 0 200 1.2062 -0.0176865 0.000596121 --0.957 -0.879 5 0 200 1.21167 -0.018024 0.000605107 --0.879 -0.783 5 0 200 1.21755 -0.0183326 0.000612036 --0.783 -0.696 5 0 200 1.22357 -0.0186319 0.000617623 --0.696 -0.609 5 0 200 1.22849 -0.0188564 0.000620439 --0.609 -0.522 5 0 200 1.23152 -0.018951 0.000617966 --0.522 -0.435 5 0 200 1.23464 -0.0190006 0.0006134 --0.435 -0.348 5 0 200 1.23834 -0.0191182 0.000612178 --0.348 -0.261 5 0 200 1.2409 -0.0192336 0.000612434 --0.261 -0.174 5 0 200 1.24282 -0.0193576 0.000614247 --0.174 -0.087 5 0 200 1.24432 -0.0194881 0.000617545 --0.087 0 5 0 200 1.24461 -0.019523 0.00061828 -0 0.087 5 0 200 1.24405 -0.0195015 0.000617727 -0.087 0.174 5 0 200 1.24237 -0.019412 0.000615545 -0.174 0.261 5 0 200 1.23968 -0.0192779 0.000612397 -0.261 0.348 5 0 200 1.2364 -0.0191407 0.000609989 -0.348 0.435 5 0 200 1.23228 -0.0190062 0.000609271 -0.435 0.522 5 0 200 1.22683 -0.018828 0.000609165 -0.522 0.609 5 0 200 1.22167 -0.0186641 0.000610625 -0.609 0.696 5 0 200 1.21716 -0.0185414 0.000612509 -0.696 0.783 5 0 200 1.21172 -0.0183771 0.000611962 -0.783 0.879 5 0 200 1.20587 -0.0181132 0.000607729 -0.879 0.957 5 0 200 1.20053 -0.017829 0.000601697 -0.957 1.044 5 0 200 1.19582 -0.0175605 0.000594959 -1.044 1.131 5 0 200 1.1914 -0.0172646 0.000585846 -1.131 1.218 5 0 200 1.18758 -0.0169277 0.000574004 -1.218 1.305 5 0 200 1.18396 -0.0165197 0.000559066 -1.305 1.392 5 0 200 1.18143 -0.0161303 0.000542214 -1.392 1.479 5 0 200 1.18048 -0.0158237 0.000525898 -1.479 1.566 5 0 200 1.18069 -0.0155575 0.000509125 -1.566 1.653 5 0 200 1.18084 -0.0153197 0.000490425 -1.653 1.74 5 0 200 1.18112 -0.0151201 0.000470406 -1.74 1.83 5 0 200 1.18062 -0.0148095 0.00044539 -1.83 1.93 5 0 200 1.1808 -0.0144956 0.000413985 -1.93 2.043 5 0 200 1.18989 -0.0150315 0.000382601 -2.043 2.172 5 0 200 1.20358 -0.0159716 0.00034342 -2.172 2.322 5 0 200 1.21431 -0.0166265 0.000298769 -2.322 2.5 5 0 200 1.22283 -0.0180757 0.000304201 -2.5 2.65 5 0 200 1.22804 -0.0198046 0.000347355 -2.65 2.853 5 0 200 1.23352 -0.0214879 0.000408536 -2.853 2.964 5 0 200 1.23111 -0.022696 0.00046433 -2.964 3.139 5 0 200 1.22541 -0.0233656 0.000508896 -3.139 3.314 5 0 200 1.21791 -0.0237123 0.000553353 -3.314 3.489 5 0 200 1.21021 -0.0238401 0.0005945 -3.489 3.664 5 0 200 1.19064 -0.0229932 0.000617974 -3.664 3.839 5 0 200 1.18138 -0.023277 0.000659754 -3.839 4.013 5 0 200 1.17582 -0.0237291 0.000678116 -4.013 4.191 5 0 200 1.16821 -0.0241996 0.000696385 -4.191 4.363 5 0 200 1.15754 -0.0245016 0.000708696 -4.363 4.538 5 0 200 1.15353 -0.0248278 0.000721718 -4.538 4.716 5 0 200 1.1482 -0.0251736 0.000734157 -4.716 4.889 5 0 200 1.13991 -0.0253535 0.000741418 -4.889 5.191 5 0 200 1.12891 -0.0254184 0.000744266 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DataMcSF_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DataMcSF_L1RC_AK8PFchs.txt deleted file mode 100644 index b29cf16..0000000 --- a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DataMcSF_L1RC_AK8PFchs.txt +++ /dev/null @@ -1,83 +0,0 @@ -{1 JetEta 1 Rho [0]+[1]*x+[2]*pow(x,2) Data/MC L1FastJet} --5.191 -4.889 5 0 200 1.13898 -0.0242149 0.000729498 --4.889 -4.716 5 0 200 1.13825 -0.023972 0.000717815 --4.716 -4.538 5 0 200 1.14613 -0.0239111 0.000712926 --4.538 -4.363 5 0 200 1.15347 -0.0237658 0.00070555 --4.363 -4.191 5 0 200 1.15809 -0.0234954 0.000692977 --4.191 -4.013 5 0 200 1.1699 -0.0231613 0.000677432 --4.013 -3.839 5 0 200 1.17809 -0.0227839 0.000660979 --3.839 -3.664 5 0 200 1.18548 -0.0223448 0.000642174 --3.664 -3.489 5 0 200 1.19355 -0.021706 0.000594787 --3.489 -3.314 5 0 200 1.20628 -0.0219597 0.000555505 --3.314 -3.139 5 0 200 1.2175 -0.0218954 0.000516469 --3.139 -2.964 5 0 200 1.22807 -0.0218324 0.000483625 --2.964 -2.853 5 0 200 1.23716 -0.0215524 0.000451977 --2.853 -2.65 5 0 200 1.24764 -0.0209916 0.000413648 --2.65 -2.5 5 0 200 1.25432 -0.0202019 0.000369406 --2.5 -2.322 5 0 200 1.26407 -0.0187955 0.000318673 --2.322 -2.172 5 0 200 1.26904 -0.0175276 0.000308771 --2.172 -2.043 5 0 200 1.27123 -0.0174848 0.00038906 --2.043 -1.93 5 0 200 1.26369 -0.0166379 0.000480482 --1.93 -1.83 5 0 200 1.25479 -0.0159441 0.000554951 --1.83 -1.74 5 0 200 1.24821 -0.0161795 0.000601419 --1.74 -1.653 5 0 200 1.24268 -0.0163354 0.000627322 --1.653 -1.566 5 0 200 1.23815 -0.0163192 0.000638615 --1.566 -1.479 5 0 200 1.23549 -0.0164157 0.000649778 --1.479 -1.392 5 0 200 1.23572 -0.0167522 0.000664117 --1.392 -1.305 5 0 200 1.23738 -0.0172329 0.000680358 --1.305 -1.218 5 0 200 1.24028 -0.0177907 0.000696949 --1.218 -1.131 5 0 200 1.24387 -0.0182525 0.000709224 --1.131 -1.044 5 0 200 1.24926 -0.0187222 0.000723076 --1.044 -0.957 5 0 200 1.25694 -0.0192356 0.000738201 --0.957 -0.879 5 0 200 1.26606 -0.0197432 0.000752129 --0.879 -0.783 5 0 200 1.2771 -0.0202631 0.000765676 --0.783 -0.696 5 0 200 1.28951 -0.0208206 0.000779889 --0.696 -0.609 5 0 200 1.30015 -0.0212452 0.000789395 --0.609 -0.522 5 0 200 1.30812 -0.0215101 0.000792145 --0.522 -0.435 5 0 200 1.31667 -0.0217293 0.000791897 --0.435 -0.348 5 0 200 1.32562 -0.0220672 0.000796785 --0.348 -0.261 5 0 200 1.33177 -0.0224126 0.000804382 --0.261 -0.174 5 0 200 1.33625 -0.0227171 0.000812714 --0.174 -0.087 5 0 200 1.33892 -0.0229618 0.000821111 --0.087 0 5 0 200 1.33868 -0.0230208 0.000824045 -0 0.087 5 0 200 1.33652 -0.0229675 0.000823602 -0.087 0.174 5 0 200 1.3325 -0.0228066 0.000820205 -0.174 0.261 5 0 200 1.32707 -0.0225692 0.000815312 -0.261 0.348 5 0 200 1.32096 -0.0222882 0.000810093 -0.348 0.435 5 0 200 1.3138 -0.0219955 0.000806177 -0.435 0.522 5 0 200 1.30376 -0.0216463 0.0008027 -0.522 0.609 5 0 200 1.29361 -0.0212832 0.000799757 -0.609 0.696 5 0 200 1.285 -0.0209929 0.000797679 -0.696 0.783 5 0 200 1.27453 -0.020633 0.000791822 -0.783 0.879 5 0 200 1.26299 -0.0200924 0.000779567 -0.879 0.957 5 0 200 1.25329 -0.0196154 0.000768377 -0.957 1.044 5 0 200 1.24575 -0.0192461 0.00075981 -1.044 1.131 5 0 200 1.23928 -0.0188499 0.000749129 -1.131 1.218 5 0 200 1.23422 -0.0183738 0.000734702 -1.218 1.305 5 0 200 1.23007 -0.0178105 0.000717743 -1.305 1.392 5 0 200 1.22782 -0.0172734 0.000698852 -1.392 1.479 5 0 200 1.22829 -0.0168562 0.000681123 -1.479 1.566 5 0 200 1.23074 -0.0164916 0.000662664 -1.566 1.653 5 0 200 1.23692 -0.0163108 0.000642997 -1.653 1.74 5 0 200 1.2461 -0.0162912 0.000622483 -1.74 1.83 5 0 200 1.25211 -0.0159332 0.000584995 -1.83 1.93 5 0 200 1.25728 -0.0155048 0.000530421 -1.93 2.043 5 0 200 1.27438 -0.0166776 0.000468369 -2.043 2.172 5 0 200 1.29537 -0.0185754 0.000400226 -2.172 2.322 5 0 200 1.30235 -0.0197261 0.000334734 -2.322 2.5 5 0 200 1.3011 -0.0218652 0.000365304 -2.5 2.65 5 0 200 1.28958 -0.0234171 0.000423771 -2.65 2.853 5 0 200 1.27802 -0.0243091 0.000478494 -2.853 2.964 5 0 200 1.26185 -0.0246652 0.00051679 -2.964 3.139 5 0 200 1.24505 -0.0245437 0.000540808 -3.139 3.314 5 0 200 1.22433 -0.0240461 0.000561805 -3.314 3.489 5 0 200 1.21072 -0.0238633 0.000595017 -3.489 3.664 5 0 200 1.19064 -0.0229932 0.000617974 -3.664 3.839 5 0 200 1.18138 -0.023277 0.000659754 -3.839 4.013 5 0 200 1.17582 -0.0237291 0.000678116 -4.013 4.191 5 0 200 1.16821 -0.0241996 0.000696385 -4.191 4.363 5 0 200 1.15754 -0.0245016 0.000708696 -4.363 4.538 5 0 200 1.15353 -0.0248278 0.000721718 -4.538 4.716 5 0 200 1.1482 -0.0251736 0.000734157 -4.716 4.889 5 0 200 1.13991 -0.0253535 0.000741418 -4.889 5.191 5 0 200 1.12891 -0.0254184 0.000744266 diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1FastJet_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1FastJet_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1FastJet_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1FastJet_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1FastJet_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1FastJet_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1FastJet_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1FastJet_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1FastJet_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1FastJet_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1FastJet_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1FastJet_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1RC_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1RC_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1RC_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1RC_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L1RC_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L1RC_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2L3Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2L3Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2L3Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2L3Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2L3Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2L3Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2L3Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2L3Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2L3Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2L3Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2L3Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2L3Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Relative_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Relative_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Relative_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Relative_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Relative_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Relative_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Relative_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Relative_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Relative_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Relative_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Relative_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Relative_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L2Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L2Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L3Absolute_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L3Absolute_AK8PF.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L3Absolute_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L3Absolute_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L3Absolute_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L3Absolute_AK8PFPuppi.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L3Absolute_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L3Absolute_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L3Absolute_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L3Absolute_AK8PFchs.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016BCDV3_DATA/Summer16_23Sep2016BCDV3_DATA_L3Absolute_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016BCDV4_DATA/Summer16_23Sep2016BCDV4_DATA_L3Absolute_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1FastJet_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1FastJet_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1FastJet_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1FastJet_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1FastJet_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1FastJet_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1FastJet_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1FastJet_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1FastJet_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1FastJet_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1FastJet_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1FastJet_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1RC_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1RC_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1RC_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1RC_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L1RC_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L1RC_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2L3Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2L3Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2L3Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2L3Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2L3Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2L3Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2L3Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2L3Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2L3Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2L3Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2L3Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2L3Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Relative_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Relative_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Relative_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Relative_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Relative_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Relative_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Relative_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Relative_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Relative_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Relative_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Relative_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Relative_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L2Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L2Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L3Absolute_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L3Absolute_AK8PF.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L3Absolute_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L3Absolute_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L3Absolute_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L3Absolute_AK8PFPuppi.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L3Absolute_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L3Absolute_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L3Absolute_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L3Absolute_AK8PFchs.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016EFV3_DATA/Summer16_23Sep2016EFV3_DATA_L3Absolute_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016EFV4_DATA/Summer16_23Sep2016EFV4_DATA_L3Absolute_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1FastJet_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1FastJet_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1FastJet_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1FastJet_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1FastJet_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1FastJet_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1FastJet_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1FastJet_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1FastJet_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1FastJet_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1FastJet_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1FastJet_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1RC_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1RC_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1RC_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1RC_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L1RC_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L1RC_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2L3Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2L3Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2L3Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2L3Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2L3Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2L3Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2L3Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2L3Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2L3Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2L3Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2L3Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2L3Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Relative_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Relative_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Relative_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Relative_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Relative_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Relative_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Relative_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Relative_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Relative_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Relative_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Relative_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Relative_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L2Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L2Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L3Absolute_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L3Absolute_AK8PF.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L3Absolute_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L3Absolute_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L3Absolute_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L3Absolute_AK8PFPuppi.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L3Absolute_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L3Absolute_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L3Absolute_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L3Absolute_AK8PFchs.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016GV3_DATA/Summer16_23Sep2016GV3_DATA_L3Absolute_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016GV4_DATA/Summer16_23Sep2016GV4_DATA_L3Absolute_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1FastJet_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1FastJet_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1FastJet_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1FastJet_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1FastJet_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1FastJet_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1FastJet_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1FastJet_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1FastJet_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1FastJet_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1FastJet_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1FastJet_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1RC_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1RC_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1RC_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1RC_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L1RC_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L1RC_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2L3Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2L3Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2L3Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2L3Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2L3Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2L3Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2L3Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2L3Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2L3Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2L3Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2L3Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2L3Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Relative_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Relative_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Relative_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Relative_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Relative_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Relative_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Relative_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Relative_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Relative_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Relative_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Relative_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Relative_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L2Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L2Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L3Absolute_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L3Absolute_AK8PF.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L3Absolute_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L3Absolute_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L3Absolute_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L3Absolute_AK8PFPuppi.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L3Absolute_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L3Absolute_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L3Absolute_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L3Absolute_AK8PFchs.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016HV3_DATA/Summer16_23Sep2016HV3_DATA_L3Absolute_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016HV4_DATA/Summer16_23Sep2016HV4_DATA_L3Absolute_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1FastJet_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1FastJet_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1RC_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1RC_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1RC_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1RC_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1RC_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1RC_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L1RC_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L1RC_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2L3Residual_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2L3Residual_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PF.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PFPuppi.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PFchs.txt similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L2Relative_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L2Relative_AK8PFchs.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PF.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PF.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PF.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PF.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PFPuppi.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PFPuppi.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PFPuppi.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PFPuppi.txt diff --git a/Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PFchs.txt b/Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PFchs.txt old mode 100755 new mode 100644 similarity index 100% rename from Ntupler/test/jec/23Sep2016V3/Summer16_23Sep2016V3_MC/Summer16_23Sep2016V3_MC_L3Absolute_AK8PFchs.txt rename to Ntupler/test/jec/23Sep2016V4/Summer16_23Sep2016V4_MC/Summer16_23Sep2016V4_MC_L3Absolute_AK8PFchs.txt diff --git a/Ntupler/test/jec/Summer16_23Sep2016AllV3_DATA.db b/Ntupler/test/jec/Summer16_23Sep2016AllV4_DATA.db similarity index 93% rename from Ntupler/test/jec/Summer16_23Sep2016AllV3_DATA.db rename to Ntupler/test/jec/Summer16_23Sep2016AllV4_DATA.db index 14a8757..0874161 100644 Binary files a/Ntupler/test/jec/Summer16_23Sep2016AllV3_DATA.db and b/Ntupler/test/jec/Summer16_23Sep2016AllV4_DATA.db differ diff --git a/Ntupler/test/jec/Summer16_23Sep2016V3_MC.db b/Ntupler/test/jec/Summer16_23Sep2016V4_MC.db similarity index 95% rename from Ntupler/test/jec/Summer16_23Sep2016V3_MC.db rename to Ntupler/test/jec/Summer16_23Sep2016V4_MC.db index 1a49df5..7d27361 100644 Binary files a/Ntupler/test/jec/Summer16_23Sep2016V3_MC.db and b/Ntupler/test/jec/Summer16_23Sep2016V4_MC.db differ diff --git a/Ntupler/test/runNtupler.py b/Ntupler/test/runNtupler.py index aa5f15c..f17a934 100644 --- a/Ntupler/test/runNtupler.py +++ b/Ntupler/test/runNtupler.py @@ -19,6 +19,11 @@ VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.bool, "True if running on MC signal samples") +options.register('infile', + None, + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + 'input file to run on') options.register('isGrid', False, VarParsing.VarParsing.multiplicity.singleton,VarParsing.VarParsing.varType.bool,"Set it to true if running on Grid") @@ -27,13 +32,17 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cerr.FwkReport.reportEvery = 5000 +process.MessageLogger.cerr.FwkReport.reportEvery = 5 +#process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(5000) ) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) -if isData: +if options.infile: + fileList = ['file:'+options.infile] + print 'Running on %s'%(options.infile) +elif isData: fileList = [ - 'file:/afs/cern.ch/work/s/snarayan/8020_met.root' + 'file:/afs/cern.ch/work/s/snarayan/8020_singleel.root' ] else: fileList = [ @@ -62,9 +71,9 @@ #mc https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideFrontierConditions#Global_Tags_for_Run2_MC_Producti process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') if (isData): - process.GlobalTag.globaltag = '80X_dataRun2_2016SeptRepro_v3' + process.GlobalTag.globaltag = '80X_dataRun2_2016SeptRepro_v7' else: - process.GlobalTag.globaltag = '80X_mcRun2_asymptotic_2016_TrancheIV_v6' + process.GlobalTag.globaltag = '80X_mcRun2_asymptotic_2016_TrancheIV_v8' ### LOAD DATABASE from CondCore.DBCommon.CondDBSetup_cfi import * @@ -72,20 +81,28 @@ ######## LUMI MASK if isData and False: import FWCore.PythonUtilities.LumiList as LumiList - process.source.lumisToProcess = LumiList.LumiList(filename='/afs/cern.ch/cms/CAF/CMSCOMM/COMM_DQM/certification/Collisions16/13TeV/ReReco/Final/Cert_271036-284044_13TeV_23Sep2016ReReco_Collisions16_JSON.txt').getVLuminosityBlockRange() + process.source.lumisToProcess = LumiList.LumiList(filename='goodlumis/Cert_271036-284044_13TeV_23Sep2016ReReco_Collisions16_JSON.txt').getVLuminosityBlockRange() print "Using local JSON" ### LOAD CONFIGURATION process.load('PandaProd.Filter.infoProducerSequence_cff') process.load('PandaProd.Filter.MonoXFilterSequence_cff') process.load('PandaProd.Ntupler.PandaProd_cfi') +process.load('PandaProd.Ntupler.VBF_cfi') ### ##ISO process.load("RecoEgamma/PhotonIdentification/PhotonIDValueMapProducer_cfi") process.load("RecoEgamma/ElectronIdentification/ElectronIDValueMapProducer_cfi") process.PandaNtupler.isData = isData -process.triggerFilterSequence = cms.Sequence() # let's turn this off for now +if isData and False: + process.triggerFilter = cms.EDFilter('TriggerFilter', + triggerPaths = process.PandaNtupler.triggerPaths, + trigger = process.PandaNtupler.trigger + ) + process.triggerFilterSequence = cms.Sequence( process.triggerFilter ) +else: + process.triggerFilterSequence = cms.Sequence() if options.isSignal: process.PandaNtupler.nSystWeight = -1 @@ -93,34 +110,33 @@ #-----------------------JES/JER---------------------------------- from CondCore.DBCommon.CondDBSetup_cfi import * if isData: - jeclabel = 'Summer16_23Sep2016AllV3_DATA' + jeclabel = 'Summer16_23Sep2016AllV4_DATA' else: - jeclabel = 'Summer16_23Sep2016V3_MC' + jeclabel = 'Summer16_23Sep2016V4_MC' process.jec = cms.ESSource("PoolDBESSource", - DBParameters = cms.PSet( - messageLevel = cms.untracked.int32(0) - ), - timetype = cms.string('runnumber'), - toGet = cms.VPSet( - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFPuppi'), - label = cms.untracked.string('AK4PFPuppi') - ), - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFPuppi'), - label = cms.untracked.string('AK8PFPuppi') - ), - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFchs'), - label = cms.untracked.string('AK4PFchs') - ), - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFchs'), - label = cms.untracked.string('AK8PFchs') - ), - ), - - ) + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0) + ), + timetype = cms.string('runnumber'), + toGet = cms.VPSet( + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFPuppi'), + label = cms.untracked.string('AK4PFPuppi') + ), + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFPuppi'), + label = cms.untracked.string('AK8PFPuppi') + ), + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFchs'), + label = cms.untracked.string('AK4PFchs') + ), + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFchs'), + label = cms.untracked.string('AK8PFchs') + ), + ), +) process.jec.connect = cms.string('sqlite:jec/%s.db'%jeclabel) process.es_prefer_jec = cms.ESPrefer('PoolDBESSource', 'jec') @@ -129,36 +145,36 @@ else: jerlabel = 'Spring16_25nsV6_MC' process.jer = cms.ESSource("PoolDBESSource", - DBParameters = cms.PSet( - messageLevel = cms.untracked.int32(0) - ), - toGet = cms.VPSet( - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PtResolution_AK4PFchs'%jerlabel), - label = cms.untracked.string('AK4PFchs_pt'), - ), - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PhiResolution_AK4PFchs'%jerlabel), - label = cms.untracked.string('AK4PFchs_phi'), - ), - cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), - tag = cms.string('JR_%s_SF_AK4PFchs'%jerlabel), - label = cms.untracked.string('AK4PFchs'), - ), - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PtResolution_AK4PFPuppi'%jerlabel), - label = cms.untracked.string('AK4PFPuppi_pt'), - ), - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PhiResolution_AK4PFPuppi'%jerlabel), - label = cms.untracked.string('AK4PFPuppi_phi'), - ), - cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), - tag = cms.string('JR_%s_SF_AK4PFPuppi'%jerlabel), - label = cms.untracked.string('AK4PFPuppi'), - ), - ) - ) + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0) + ), + toGet = cms.VPSet( + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PtResolution_AK4PFchs'%jerlabel), + label = cms.untracked.string('AK4PFchs_pt'), + ), + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PhiResolution_AK4PFchs'%jerlabel), + label = cms.untracked.string('AK4PFchs_phi'), + ), + cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), + tag = cms.string('JR_%s_SF_AK4PFchs'%jerlabel), + label = cms.untracked.string('AK4PFchs'), + ), + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PtResolution_AK4PFPuppi'%jerlabel), + label = cms.untracked.string('AK4PFPuppi_pt'), + ), + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PhiResolution_AK4PFPuppi'%jerlabel), + label = cms.untracked.string('AK4PFPuppi_phi'), + ), + cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), + tag = cms.string('JR_%s_SF_AK4PFPuppi'%jerlabel), + label = cms.untracked.string('AK4PFPuppi'), + ), + ) +) process.jer.connect = cms.string('sqlite:jer/%s.db'%jerlabel) process.es_prefer_jer = cms.ESPrefer('PoolDBESSource', 'jer') @@ -198,117 +214,144 @@ process.BadChargedCandidateFilter.taggingMode = cms.bool(True) process.metfilterSequence = cms.Sequence(process.BadPFMuonFilter - *process.BadChargedCandidateFilter) + *process.BadChargedCandidateFilter) if not options.isData: process.PandaNtupler.metfilter = cms.InputTag('TriggerResults','','PAT') ############ RECOMPUTE PUPPI/MET ####################### from PhysicsTools.PatUtils.tools.runMETCorrectionsAndUncertainties import runMetCorAndUncFromMiniAOD -runMetCorAndUncFromMiniAOD(process, ## PF MET - isData=isData) +runMetCorAndUncFromMiniAOD(process,isData=isData) -process.PandaNtupler.pfmet = cms.InputTag('slimmedMETs','','PandaNtupler') -process.MonoXFilter.met = cms.InputTag('slimmedMETs','','PandaNtupler') +# we overwrite this now +#process.PandaNtupler.pfmet = cms.InputTag('slimmedMETs','','PandaNtupler') +## Remove bad muons from MET calculation +process.load('RecoMET.METFilters.badGlobalMuonTaggersMiniAOD_cff') +process.badGlobalMuonTaggerMAOD.taggingMode = cms.bool(True) +process.cloneGlobalMuonTaggerMAOD.taggingMode = cms.bool(True) +process.muonCorrSequence = cms.Sequence() + +if not isData: + from PhysicsTools.PatUtils.tools.muonRecoMitigation import muonRecoMitigation + muonRecoMitigation(process, + pfCandCollection="packedPFCandidates", + runOnMiniAOD=True, + muonCollection="", + selection="", + cleaningScheme="all", + postfix="") + + runMetCorAndUncFromMiniAOD(process, + isData=isData, + pfCandColl="cleanMuonsPFCandidates", + recoMetFromPFCs=True, + postfix="MuClean") + + process.muonCorrSequence = cms.Sequence( + process.badGlobalMuonTaggerMAOD * + process.cloneGlobalMuonTaggerMAOD * + process.badMuons * # If you are using cleaning mode "all", uncomment this line + process.cleanMuonsPFCandidates * + process.fullPatMetSequenceMuClean + ) + + + process.PandaNtupler.pfmet_cleanmu=cms.InputTag('slimmedMETsMuClean','','PandaNtupler') + process.PandaNtupler.pfmet=cms.InputTag("slimmedMETs") + +# now do puppi from PhysicsTools.PatAlgos.slimming.puppiForMET_cff import makePuppiesFromMiniAOD makePuppiesFromMiniAOD(process,True) process.puppi.useExistingWeights = False # I still don't trust miniaod... process.puppiNoLep.useExistingWeights = False + runMetCorAndUncFromMiniAOD(process, ## Puppi MET - isData=options.isData, - metType="Puppi", - pfCandColl=cms.InputTag("puppiForMET"), - recoMetFromPFCs=True, - jetFlavor="AK4PFPuppi", - postfix="Puppi") + isData=options.isData, + metType="Puppi", + pfCandColl=cms.InputTag("puppiForMET"), + recoMetFromPFCs=True, + jetFlavor="AK4PFPuppi", + postfix="Puppi") process.puppiForMET.photonId = process.PandaNtupler.phoLooseIdMap process.PandaNtupler.puppimet = cms.InputTag('slimmedMETsPuppi','','PandaNtupler') -process.MonoXFilter.puppimet = cms.InputTag('slimmedMETsPuppi','','PandaNtupler') -############ RUN CLUSTERING ########################## -process.jetSequence = cms.Sequence() -# btag and patify puppi AK4 jets -from RecoJets.JetProducers.ak4GenJets_cfi import ak4GenJets -from PhysicsTools.PatAlgos.tools.pfTools import * +############### ECAL Fixes ############# +process.load('EgammaAnalysis.ElectronTools.regressionApplication_cff') +from EgammaAnalysis.ElectronTools.regressionWeights_cfi import regressionWeights +process = regressionWeights(process) -if not isData: - process.packedGenParticlesForJetsNoNu = cms.EDFilter("CandPtrSelector", - src = cms.InputTag("packedGenParticles"), - cut = cms.string("abs(pdgId) != 12 && abs(pdgId) != 14 && abs(pdgId) != 16") +## Scale/smear +process.load('Configuration.StandardSequences.Services_cff') +process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", + calibratedPatElectrons = cms.PSet( initialSeed = cms.untracked.uint32(81), + engineName = cms.untracked.string('TRandom3'), + ), + calibratedPatPhotons = cms.PSet( initialSeed = cms.untracked.uint32(81), + engineName = cms.untracked.string('TRandom3'), + ), ) - process.ak4GenJetsNoNu = ak4GenJets.clone(src = 'packedGenParticlesForJetsNoNu') - process.jetSequence += process.packedGenParticlesForJetsNoNu - process.jetSequence += process.ak4GenJetsNoNu - -# btag and patify jets for access later -addJetCollection( - process, - labelName = 'PFAK4Puppi', - jetSource=cms.InputTag('ak4PFJetsPuppi'), # this is constructed in runMetCorAndUncFromMiniAOD - algo='AK4', - rParam=0.4, - pfCandidates = cms.InputTag("puppiForMET"), - pvSource = cms.InputTag('offlineSlimmedPrimaryVertices'), - svSource = cms.InputTag('slimmedSecondaryVertices'), - muSource = cms.InputTag('slimmedMuons'), - elSource = cms.InputTag('slimmedElectrons'), - btagInfos = [ - 'pfImpactParameterTagInfos' - ,'pfInclusiveSecondaryVertexFinderTagInfos' - ], - btagDiscriminators = [ - 'pfCombinedInclusiveSecondaryVertexV2BJetTags' - ], - genJetCollection = cms.InputTag('ak4GenJetsNoNu'), - genParticles = cms.InputTag('prunedGenParticles'), - getJetMCFlavour = False, # jet flavor disabled -) +process.load('EgammaAnalysis.ElectronTools.calibratedElectronsRun2_cfi') +process.load('EgammaAnalysis.ElectronTools.calibratedPhotonsRun2_cfi') +process.calibratedPatElectrons.electrons=process.PandaNtupler.electrons +process.calibratedPatPhotons.photons= process.PandaNtupler.photons +process.PandaNtupler.electrons = cms.InputTag("calibratedPatElectrons") +process.PandaNtupler.photons = cms.InputTag("calibratedPatPhotons") + +# Update electrons used for IDs +process.egmGsfElectronIDs.physicsObjectSrc = process.PandaNtupler.electrons +process.electronIDValueMapProducer.srcMiniAOD= process.PandaNtupler.electrons +process.electronMVAValueMapProducer.srcMiniAOD= process.PandaNtupler.electrons + +# Update photons used for IDs and puppi +process.egmPhotonIsolation.srcToIsolate = process.PandaNtupler.photons +process.egmPhotonIDs.physicsObjectSrc = process.PandaNtupler.photons +process.photonIDValueMapProducer.srcMiniAOD= process.PandaNtupler.photons +process.photonMVAValueMapProducer.srcMiniAOD= process.PandaNtupler.photons +process.puppiForMET.photonName = process.PandaNtupler.photons +process.puppiPhoton.photonName = process.PandaNtupler.photons +process.modifiedPhotons.src = process.PandaNtupler.photons -if not isData: - process.jetSequence += process.patJetPartonMatchPFAK4Puppi - process.jetSequence += process.patJetGenJetMatchPFAK4Puppi -process.jetSequence += process.pfImpactParameterTagInfosPFAK4Puppi -process.jetSequence += process.pfInclusiveSecondaryVertexFinderTagInfosPFAK4Puppi -process.jetSequence += process.pfCombinedInclusiveSecondaryVertexV2BJetTagsPFAK4Puppi -process.jetSequence += process.patJetsPFAK4Puppi +############ RUN CLUSTERING ########################## +process.jetSequence = cms.Sequence() ##################### FAT JETS ############################# - +from RecoJets.JetProducers.ak4GenJets_cfi import ak4GenJets from PandaProd.Ntupler.makeFatJets_cff import initFatJets, makeFatJets + fatjetInitSequence = initFatJets(process,isData) process.jetSequence += fatjetInitSequence if process.PandaNtupler.doCHSAK8: ak8CHSSequence = makeFatJets(process, - isData=isData, - pfCandidates='pfCHS', - algoLabel='AK', - jetRadius=0.8) + isData=isData, + pfCandidates='pfCHS', + algoLabel='AK', + jetRadius=0.8) process.jetSequence += ak8CHSSequence if process.PandaNtupler.doPuppiAK8: ak8PuppiSequence = makeFatJets(process, - isData=isData, - pfCandidates='puppi', - algoLabel='AK', - jetRadius=0.8) + isData=isData, + pfCandidates='puppi', + algoLabel='AK', + jetRadius=0.8) process.jetSequence += ak8PuppiSequence if process.PandaNtupler.doCHSCA15: ca15CHSSequence = makeFatJets(process, - isData=isData, - pfCandidates='pfCHS', - algoLabel='CA', - jetRadius=1.5) + isData=isData, + pfCandidates='pfCHS', + algoLabel='CA', + jetRadius=1.5) process.jetSequence += ca15CHSSequence if process.PandaNtupler.doPuppiCA15: ca15PuppiSequence = makeFatJets(process, - isData=isData, - pfCandidates='puppi', - algoLabel='CA', - jetRadius=1.5) + isData=isData, + pfCandidates='puppi', + algoLabel='CA', + jetRadius=1.5) process.jetSequence += ca15PuppiSequence if not isData: @@ -316,21 +359,39 @@ process.jetSequence += process.ak4GenJetsYesNu ############################### +# Overwrite the MonoXFilter mets +process.MonoXFilter.met = process.PandaNtupler.pfmet +process.MonoXFilter.puppimet = process.PandaNtupler.puppimet +############################### + +DEBUG=False +if DEBUG: + print "Process=",process, process.__dict__.keys() process.p = cms.Path( - process.infoProducerSequence * - process.triggerFilterSequence * - process.jecSequence * - process.egmGsfElectronIDSequence * - process.egmPhotonIDSequence * - process.photonIDValueMapProducer * # iso map for photons - process.electronIDValueMapProducer * # iso map for photons - process.fullPatMetSequence * # pf MET - process.puppiMETSequence * # builds all the puppi collections - process.egmPhotonIDSequence * # baseline photon ID for puppi correction - process.fullPatMetSequencePuppi * # puppi MET - process.monoXFilterSequence * # filter - process.jetSequence * # patify ak4puppi and do all fatjet stuff - process.metfilterSequence * - process.PandaNtupler - ) + process.infoProducerSequence * + process.regressionApplication * + process.calibratedPatElectrons * + process.calibratedPatPhotons * + process.egmGsfElectronIDSequence * + process.egmPhotonIDSequence * + process.photonIDValueMapProducer * # iso map for photons + process.electronIDValueMapProducer * # iso map for photons + process.jecSequence * + process.fullPatMetSequence * # pf MET + process.muonCorrSequence * + process.puppiMETSequence * # builds all the puppi collections + process.fullPatMetSequencePuppi * # puppi MET + process.monoXFilterSequence * # filter + process.jetSequence * # do extra jet (fat+gen) stuff + process.metfilterSequence * + process.PandaNtupler + ) + +if DEBUG: + process.output = cms.OutputModule("PoolOutputModule", + fileName = cms.untracked.string('pool.root')) + process.output_step = cms.EndPath(process.output) + + process.schedule = cms.Schedule(process.p, + process.output_step) diff --git a/Ntupler/test/testNtupler.py b/Ntupler/test/testNtupler.py index 4b59fa6..584d6da 100644 --- a/Ntupler/test/testNtupler.py +++ b/Ntupler/test/testNtupler.py @@ -32,8 +32,6 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -# If you run over many samples and you save the log, remember to reduce -# the size of the output by prescaling the report of the event number process.MessageLogger.cerr.FwkReport.reportEvery = 5 #process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(5000) ) @@ -44,14 +42,11 @@ print 'Running on %s'%(options.infile) elif isData: fileList = [ - #'file:/data/t3home000/snarayan/test/met_8020.root' 'file:/afs/cern.ch/work/s/snarayan/8020_singleel.root' ] else: fileList = [ - #'file:/data/t3home000/snarayan/test/tt_8011.root' 'file:/afs/cern.ch/work/s/snarayan/8024_tt.root' - #'file:/afs/cern.ch/work/s/snarayan/8024_monotop.root' ] ### do not remove the line below! ###FILELIST### @@ -76,18 +71,15 @@ #mc https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideFrontierConditions#Global_Tags_for_Run2_MC_Producti process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') if (isData): - # sept reprocessing - process.GlobalTag.globaltag = '80X_dataRun2_2016SeptRepro_v3' + process.GlobalTag.globaltag = '80X_dataRun2_2016SeptRepro_v7' else: - process.GlobalTag.globaltag = '80X_mcRun2_asymptotic_2016_TrancheIV_v6' + process.GlobalTag.globaltag = '80X_mcRun2_asymptotic_2016_TrancheIV_v8' ### LOAD DATABASE from CondCore.DBCommon.CondDBSetup_cfi import * -#from CondCore.CondDB.CondDB_cfi import * ######## LUMI MASK -#if isData and not options.isGrid and False: ## dont load the lumiMaks, will be called by crab -if isData: +if isData and False: import FWCore.PythonUtilities.LumiList as LumiList process.source.lumisToProcess = LumiList.LumiList(filename='goodlumis/Cert_271036-284044_13TeV_23Sep2016ReReco_Collisions16_JSON.txt').getVLuminosityBlockRange() print "Using local JSON" @@ -96,7 +88,7 @@ process.load('PandaProd.Filter.infoProducerSequence_cff') process.load('PandaProd.Filter.MonoXFilterSequence_cff') process.load('PandaProd.Ntupler.PandaProd_cfi') -#process.load('PandaProd.Ntupler.VBF_cfi') +process.load('PandaProd.Ntupler.VBF_cfi') ### ##ISO process.load("RecoEgamma/PhotonIdentification/PhotonIDValueMapProducer_cfi") @@ -118,35 +110,33 @@ #-----------------------JES/JER---------------------------------- from CondCore.DBCommon.CondDBSetup_cfi import * if isData: - jeclabel = 'Summer16_23Sep2016AllV3_DATA' + jeclabel = 'Summer16_23Sep2016AllV4_DATA' else: - jeclabel = 'Summer16_23Sep2016V3_MC' + jeclabel = 'Summer16_23Sep2016V4_MC' process.jec = cms.ESSource("PoolDBESSource", -# CondDBSetup, - DBParameters = cms.PSet( - messageLevel = cms.untracked.int32(0) - ), - timetype = cms.string('runnumber'), - toGet = cms.VPSet( - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFPuppi'), - label = cms.untracked.string('AK4PFPuppi') - ), - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFPuppi'), - label = cms.untracked.string('AK8PFPuppi') - ), - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFchs'), - label = cms.untracked.string('AK4PFchs') - ), - cms.PSet(record = cms.string('JetCorrectionsRecord'), - tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFchs'), - label = cms.untracked.string('AK8PFchs') - ), - ), - - ) + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0) + ), + timetype = cms.string('runnumber'), + toGet = cms.VPSet( + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFPuppi'), + label = cms.untracked.string('AK4PFPuppi') + ), + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFPuppi'), + label = cms.untracked.string('AK8PFPuppi') + ), + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK4PFchs'), + label = cms.untracked.string('AK4PFchs') + ), + cms.PSet(record = cms.string('JetCorrectionsRecord'), + tag = cms.string('JetCorrectorParametersCollection_'+jeclabel+'_AK8PFchs'), + label = cms.untracked.string('AK8PFchs') + ), + ), +) process.jec.connect = cms.string('sqlite:jec/%s.db'%jeclabel) process.es_prefer_jec = cms.ESPrefer('PoolDBESSource', 'jec') @@ -155,37 +145,36 @@ else: jerlabel = 'Spring16_25nsV6_MC' process.jer = cms.ESSource("PoolDBESSource", -# CondDBSetup, - DBParameters = cms.PSet( - messageLevel = cms.untracked.int32(0) - ), - toGet = cms.VPSet( - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PtResolution_AK4PFchs'%jerlabel), - label = cms.untracked.string('AK4PFchs_pt'), - ), - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PhiResolution_AK4PFchs'%jerlabel), - label = cms.untracked.string('AK4PFchs_phi'), - ), - cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), - tag = cms.string('JR_%s_SF_AK4PFchs'%jerlabel), - label = cms.untracked.string('AK4PFchs'), - ), - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PtResolution_AK4PFPuppi'%jerlabel), - label = cms.untracked.string('AK4PFPuppi_pt'), - ), - cms.PSet(record = cms.string('JetResolutionRcd'), - tag = cms.string('JR_%s_PhiResolution_AK4PFPuppi'%jerlabel), - label = cms.untracked.string('AK4PFPuppi_phi'), - ), - cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), - tag = cms.string('JR_%s_SF_AK4PFPuppi'%jerlabel), - label = cms.untracked.string('AK4PFPuppi'), - ), - ) - ) + DBParameters = cms.PSet( + messageLevel = cms.untracked.int32(0) + ), + toGet = cms.VPSet( + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PtResolution_AK4PFchs'%jerlabel), + label = cms.untracked.string('AK4PFchs_pt'), + ), + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PhiResolution_AK4PFchs'%jerlabel), + label = cms.untracked.string('AK4PFchs_phi'), + ), + cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), + tag = cms.string('JR_%s_SF_AK4PFchs'%jerlabel), + label = cms.untracked.string('AK4PFchs'), + ), + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PtResolution_AK4PFPuppi'%jerlabel), + label = cms.untracked.string('AK4PFPuppi_pt'), + ), + cms.PSet(record = cms.string('JetResolutionRcd'), + tag = cms.string('JR_%s_PhiResolution_AK4PFPuppi'%jerlabel), + label = cms.untracked.string('AK4PFPuppi_phi'), + ), + cms.PSet(record = cms.string('JetResolutionScaleFactorRcd'), + tag = cms.string('JR_%s_SF_AK4PFPuppi'%jerlabel), + label = cms.untracked.string('AK4PFPuppi'), + ), + ) +) process.jer.connect = cms.string('sqlite:jer/%s.db'%jerlabel) process.es_prefer_jer = cms.ESPrefer('PoolDBESSource', 'jer') @@ -225,19 +214,54 @@ process.BadChargedCandidateFilter.taggingMode = cms.bool(True) process.metfilterSequence = cms.Sequence(process.BadPFMuonFilter - *process.BadChargedCandidateFilter) + *process.BadChargedCandidateFilter) if not options.isData: process.PandaNtupler.metfilter = cms.InputTag('TriggerResults','','PAT') ############ RECOMPUTE PUPPI/MET ####################### from PhysicsTools.PatUtils.tools.runMETCorrectionsAndUncertainties import runMetCorAndUncFromMiniAOD -runMetCorAndUncFromMiniAOD(process, ## PF MET - isData=isData) +runMetCorAndUncFromMiniAOD(process,isData=isData) + +# we overwrite this now +#process.PandaNtupler.pfmet = cms.InputTag('slimmedMETs','','PandaNtupler') -process.PandaNtupler.pfmet = cms.InputTag('slimmedMETs','','PandaNtupler') -process.MonoXFilter.met = cms.InputTag('slimmedMETs','','PandaNtupler') +## Remove bad muons from MET calculation +process.load('RecoMET.METFilters.badGlobalMuonTaggersMiniAOD_cff') +process.badGlobalMuonTaggerMAOD.taggingMode = cms.bool(True) +process.cloneGlobalMuonTaggerMAOD.taggingMode = cms.bool(True) +process.muonCorrSequence = cms.Sequence() + +if not isData: + from PhysicsTools.PatUtils.tools.muonRecoMitigation import muonRecoMitigation + muonRecoMitigation(process, + pfCandCollection="packedPFCandidates", + runOnMiniAOD=True, + muonCollection="", + selection="", + cleaningScheme="all", + postfix="") + + runMetCorAndUncFromMiniAOD(process, + isData=isData, + pfCandColl="cleanMuonsPFCandidates", + recoMetFromPFCs=True, + postfix="MuClean") + + process.muonCorrSequence = cms.Sequence( + process.badGlobalMuonTaggerMAOD * + process.cloneGlobalMuonTaggerMAOD * + process.badMuons * # If you are using cleaning mode "all", uncomment this line + process.cleanMuonsPFCandidates * + process.fullPatMetSequenceMuClean + ) + + + process.PandaNtupler.pfmet_cleanmu=cms.InputTag('slimmedMETsMuClean','','PandaNtupler') + process.PandaNtupler.pfmet=cms.InputTag("slimmedMETs") + +# now do puppi from PhysicsTools.PatAlgos.slimming.puppiForMET_cff import makePuppiesFromMiniAOD makePuppiesFromMiniAOD(process,True) @@ -246,132 +270,128 @@ runMetCorAndUncFromMiniAOD(process, ## Puppi MET - isData=options.isData, - metType="Puppi", - pfCandColl=cms.InputTag("puppiForMET"), - recoMetFromPFCs=True, - jetFlavor="AK4PFPuppi", - postfix="Puppi") + isData=options.isData, + metType="Puppi", + pfCandColl=cms.InputTag("puppiForMET"), + recoMetFromPFCs=True, + jetFlavor="AK4PFPuppi", + postfix="Puppi") process.puppiForMET.photonId = process.PandaNtupler.phoLooseIdMap process.PandaNtupler.puppimet = cms.InputTag('slimmedMETsPuppi','','PandaNtupler') -process.MonoXFilter.puppimet = cms.InputTag('slimmedMETsPuppi','','PandaNtupler') -############ RUN CLUSTERING ########################## -process.jetSequence = cms.Sequence() -# btag and patify puppi AK4 jets -from RecoJets.JetProducers.ak4GenJets_cfi import ak4GenJets -from PhysicsTools.PatAlgos.tools.pfTools import * +############### ECAL Fixes ############# +process.load('EgammaAnalysis.ElectronTools.regressionApplication_cff') +from EgammaAnalysis.ElectronTools.regressionWeights_cfi import regressionWeights +process = regressionWeights(process) -if not isData: - process.packedGenParticlesForJetsNoNu = cms.EDFilter("CandPtrSelector", - src = cms.InputTag("packedGenParticles"), - cut = cms.string("abs(pdgId) != 12 && abs(pdgId) != 14 && abs(pdgId) != 16") +## Scale/smear +process.load('Configuration.StandardSequences.Services_cff') +process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", + calibratedPatElectrons = cms.PSet( initialSeed = cms.untracked.uint32(81), + engineName = cms.untracked.string('TRandom3'), + ), + calibratedPatPhotons = cms.PSet( initialSeed = cms.untracked.uint32(81), + engineName = cms.untracked.string('TRandom3'), + ), ) - process.ak4GenJetsNoNu = ak4GenJets.clone(src = 'packedGenParticlesForJetsNoNu') - process.jetSequence += process.packedGenParticlesForJetsNoNu - process.jetSequence += process.ak4GenJetsNoNu - -# btag and patify jets for access later -addJetCollection( - process, - labelName = 'PFAK4Puppi', - jetSource=cms.InputTag('ak4PFJetsPuppi'), # this is constructed in runMetCorAndUncFromMiniAOD - algo='AK4', - rParam=0.4, - pfCandidates = cms.InputTag("puppiForMET"), - pvSource = cms.InputTag('offlineSlimmedPrimaryVertices'), - svSource = cms.InputTag('slimmedSecondaryVertices'), - muSource = cms.InputTag('slimmedMuons'), - elSource = cms.InputTag('slimmedElectrons'), - btagInfos = [ - 'pfImpactParameterTagInfos' - ,'pfInclusiveSecondaryVertexFinderTagInfos' - ], - btagDiscriminators = [ - 'pfCombinedInclusiveSecondaryVertexV2BJetTags' - ], - genJetCollection = cms.InputTag('ak4GenJetsNoNu'), - genParticles = cms.InputTag('prunedGenParticles'), - getJetMCFlavour = False, # jet flavor disabled -) +process.load('EgammaAnalysis.ElectronTools.calibratedElectronsRun2_cfi') +process.load('EgammaAnalysis.ElectronTools.calibratedPhotonsRun2_cfi') +process.calibratedPatElectrons.electrons=process.PandaNtupler.electrons +process.calibratedPatPhotons.photons= process.PandaNtupler.photons +process.PandaNtupler.electrons = cms.InputTag("calibratedPatElectrons") +process.PandaNtupler.photons = cms.InputTag("calibratedPatPhotons") + +# Update electrons used for IDs +process.egmGsfElectronIDs.physicsObjectSrc = process.PandaNtupler.electrons +process.electronIDValueMapProducer.srcMiniAOD= process.PandaNtupler.electrons +process.electronMVAValueMapProducer.srcMiniAOD= process.PandaNtupler.electrons + +# Update photons used for IDs and puppi +process.egmPhotonIsolation.srcToIsolate = process.PandaNtupler.photons +process.egmPhotonIDs.physicsObjectSrc = process.PandaNtupler.photons +process.photonIDValueMapProducer.srcMiniAOD= process.PandaNtupler.photons +process.photonMVAValueMapProducer.srcMiniAOD= process.PandaNtupler.photons +process.puppiForMET.photonName = process.PandaNtupler.photons +process.puppiPhoton.photonName = process.PandaNtupler.photons +process.modifiedPhotons.src = process.PandaNtupler.photons -if not isData: - process.jetSequence += process.patJetPartonMatchPFAK4Puppi - process.jetSequence += process.patJetGenJetMatchPFAK4Puppi -process.jetSequence += process.pfImpactParameterTagInfosPFAK4Puppi -process.jetSequence += process.pfInclusiveSecondaryVertexFinderTagInfosPFAK4Puppi -process.jetSequence += process.pfCombinedInclusiveSecondaryVertexV2BJetTagsPFAK4Puppi -process.jetSequence += process.patJetsPFAK4Puppi +############ RUN CLUSTERING ########################## +process.jetSequence = cms.Sequence() ##################### FAT JETS ############################# - +from RecoJets.JetProducers.ak4GenJets_cfi import ak4GenJets from PandaProd.Ntupler.makeFatJets_cff import initFatJets, makeFatJets + fatjetInitSequence = initFatJets(process,isData) process.jetSequence += fatjetInitSequence if process.PandaNtupler.doCHSAK8: ak8CHSSequence = makeFatJets(process, - isData=isData, - pfCandidates='pfCHS', - algoLabel='AK', - jetRadius=0.8) + isData=isData, + pfCandidates='pfCHS', + algoLabel='AK', + jetRadius=0.8) process.jetSequence += ak8CHSSequence if process.PandaNtupler.doPuppiAK8: ak8PuppiSequence = makeFatJets(process, - isData=isData, - pfCandidates='puppi', - algoLabel='AK', - jetRadius=0.8) + isData=isData, + pfCandidates='puppi', + algoLabel='AK', + jetRadius=0.8) process.jetSequence += ak8PuppiSequence if process.PandaNtupler.doCHSCA15: ca15CHSSequence = makeFatJets(process, - isData=isData, - pfCandidates='pfCHS', - algoLabel='CA', - jetRadius=1.5) + isData=isData, + pfCandidates='pfCHS', + algoLabel='CA', + jetRadius=1.5) process.jetSequence += ca15CHSSequence if process.PandaNtupler.doPuppiCA15: ca15PuppiSequence = makeFatJets(process, - isData=isData, - pfCandidates='puppi', - algoLabel='CA', - jetRadius=1.5) + isData=isData, + pfCandidates='puppi', + algoLabel='CA', + jetRadius=1.5) process.jetSequence += ca15PuppiSequence if not isData: process.ak4GenJetsYesNu = ak4GenJets.clone(src = 'packedGenParticles') process.jetSequence += process.ak4GenJetsYesNu -''' -''' ############################### +# Overwrite the MonoXFilter mets +process.MonoXFilter.met = process.PandaNtupler.pfmet +process.MonoXFilter.puppimet = process.PandaNtupler.puppimet +############################### DEBUG=False if DEBUG: - pass -# print "Process=",process, process.__dict__.keys() + print "Process=",process, process.__dict__.keys() process.p = cms.Path( - process.infoProducerSequence * -# process.triggerFilterSequence * - process.egmGsfElectronIDSequence * - process.egmPhotonIDSequence * - process.photonIDValueMapProducer * # iso map for photons - process.electronIDValueMapProducer * # iso map for photons - process.jecSequence * - process.fullPatMetSequence * # pf MET - process.puppiMETSequence * # builds all the puppi collections - process.fullPatMetSequencePuppi * # puppi MET - process.monoXFilterSequence * # filter - process.jetSequence * # patify ak4puppi and do all fatjet stuff - process.metfilterSequence * - process.PandaNtupler - ) + process.infoProducerSequence * + process.regressionApplication * + process.calibratedPatElectrons * + process.calibratedPatPhotons * + process.egmGsfElectronIDSequence * + process.egmPhotonIDSequence * + process.photonIDValueMapProducer * # iso map for photons + process.electronIDValueMapProducer * # iso map for photons + process.jecSequence * + process.fullPatMetSequence * # pf MET + process.muonCorrSequence * + process.puppiMETSequence * # builds all the puppi collections + process.fullPatMetSequencePuppi * # puppi MET +# process.monoXFilterSequence * # filter + process.jetSequence * # do extra jet (fat+gen) stuff + process.metfilterSequence * + process.PandaNtupler + ) if DEBUG: process.output = cms.OutputModule("PoolOutputModule", - fileName = cms.untracked.string('pool.root')) + fileName = cms.untracked.string('pool.root')) process.output_step = cms.EndPath(process.output) process.schedule = cms.Schedule(process.p, - process.output_step) + process.output_step) diff --git a/Objects/interface/PElectron.h b/Objects/interface/PElectron.h index c7a8b9b..9928b63 100644 --- a/Objects/interface/PElectron.h +++ b/Objects/interface/PElectron.h @@ -24,13 +24,15 @@ namespace panda chiso(0), nhiso(0), phoiso(0), - puiso(0) + puiso(0), + pt_unsmeared(-1) { } ~PElectron(){ } int q; unsigned int id; float iso, chiso, nhiso, phoiso, puiso; + float pt_unsmeared; ClassDef(PElectron,1) }; diff --git a/Objects/interface/PMET.h b/Objects/interface/PMET.h index 367ed97..05bb1d1 100644 --- a/Objects/interface/PMET.h +++ b/Objects/interface/PMET.h @@ -12,6 +12,9 @@ namespace panda ~PMET(){ } float pt=0, phi=0; //!< type-1 corrected MET + float cleanMu_pt=0, cleanMu_phi=0; //!< fix fake muon problem + float cleanEG_pt=0, cleanEG_phi=0; //!< fix ECAL problem (data only) + float unclean_pt=0, unclean_phi=0; //!< fix fake muon problem float sumETRaw; //!< sum E_T, uncorrected float raw_pt=0, raw_phi=0; //!< raw, uncorrected float calo_pt=0, calo_phi=0; //!< calorimeter-only diff --git a/Objects/interface/PPhoton.h b/Objects/interface/PPhoton.h index 960539f..515550e 100644 --- a/Objects/interface/PPhoton.h +++ b/Objects/interface/PPhoton.h @@ -19,12 +19,14 @@ namespace panda PPhoton(): PObject(), id(0), - iso(0) + iso(0), + pt_unsmeared(-1) { } ~PPhoton(){ } unsigned int id; float iso; + float pt_unsmeared; ClassDef(PPhoton,1) }; diff --git a/setuprel.sh b/setuprel.sh index 5b4f90b..8e0df80 100644 --- a/setuprel.sh +++ b/setuprel.sh @@ -1,9 +1,7 @@ #!/bin/bash # fixes for MET -git cms-merge-topic -u cms-met:fromCMSSW_8_0_20_postICHEPfilter -git cms-merge-topic ahinzmann:METRecipe_8020_Moriond17 -git cms-merge-topic cms-met:METRecipe_8020 +git cms-merge-topic zdemirag:conflict_met_resolved # ecal smearing git cms-merge-topic emanueledimarco:ecal_smear_fix_80X @@ -20,8 +18,11 @@ git clone -b egm_id_80X_v1 https://github.com/ikrav/RecoEgamma-PhotonIdentificat rsync -avP RecoEgamma/PhotonIdentification/data.new/* RecoEgamma/PhotonIdentification/data/ rm -rf RecoEgamma/PhotonIdentification/data.new/ -# it's okay, at least our detector isn't on fire +# ECAL smearing git cms-add-pkg EgammaAnalysis/ElectronTools git cms-merge-topic shervin86:Moriond2017_JEC_energyScales git clone git@github.com:ECALELFS/ScalesSmearings.git EgammaAnalysis/ElectronTools/data/ScalesSmearings.new rsync -avP EgammaAnalysis/ElectronTools/data/ScalesSmearings.new/* EgammaAnalysis/ElectronTools/data/ScalesSmearings/ + +# ECAL regression +git cms-merge-topic rafaellopesdesa:Regression80XEgammaAnalysis_v2