From 34454c2c7e8b4e2ee8789da02f22dc7016c581ea Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:34 +0200 Subject: [PATCH 01/23] porting into CMSSW_7X --- .../EgammaCandidates/interface/GsfElectron.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/DataFormats/EgammaCandidates/interface/GsfElectron.h b/DataFormats/EgammaCandidates/interface/GsfElectron.h index 09d566e7ca422..9046846f18a8b 100644 --- a/DataFormats/EgammaCandidates/interface/GsfElectron.h +++ b/DataFormats/EgammaCandidates/interface/GsfElectron.h @@ -514,12 +514,19 @@ class GsfElectron : public RecoCandidate struct PflowIsolationVariables { - float chargedHadronIso ; - float neutralHadronIso ; - float photonIso ; - PflowIsolationVariables() - : chargedHadronIso(0.), neutralHadronIso(0.), photonIso(0.) - {} + //first three data members that changed names, according to DataFormats/MuonReco/interface/MuonPFIsolation.h + float sumChargedHadronPt; //!< sum-pt of charged Hadron // old float chargedHadronIso ; + float sumNeutralHadronEt; //!< sum pt of neutral hadrons // old float neutralHadronIso ; + float sumPhotonEt; //!< sum pt of PF photons // old float photonIso ; + //then four new data members, corresponding to DataFormats/MuonReco/interface/MuonPFIsolation.h + float sumChargedParticlePt; //!< sum-pt of charged Particles(inludes e/mu) + float sumNeutralHadronEtHighThreshold; //!< sum pt of neutral hadrons with a higher threshold + float sumPhotonEtHighThreshold; //!< sum pt of PF photons with a higher threshold + float sumPUPt; //!< sum pt of charged Particles not from PV (for Pu corrections) + + PflowIsolationVariables() : + sumChargedHadronPt(0),sumNeutralHadronEt(0),sumPhotonEt(0),sumChargedParticlePt(0), + sumNeutralHadronEtHighThreshold(0),sumPhotonEtHighThreshold(0),sumPUPt(0) {}; } ; struct MvaInput From 99709f19f49d645830a7466263a94e81b95beac4 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:43 +0200 Subject: [PATCH 02/23] porting into CMSSW_7X --- DataFormats/EgammaCandidates/interface/Photon.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DataFormats/EgammaCandidates/interface/Photon.h b/DataFormats/EgammaCandidates/interface/Photon.h index 09f1ede2296ca..ba167b883eed7 100644 --- a/DataFormats/EgammaCandidates/interface/Photon.h +++ b/DataFormats/EgammaCandidates/interface/Photon.h @@ -7,7 +7,7 @@ * stores isolation, shower shape and additional info * needed for identification * - * \version $Id: Photon.h,v 1.48 2012/03/26 16:44:27 nancy Exp $ + * \version $Id: Photon.h,v 1.49 2013/06/05 16:37:06 nancy Exp $ * */ #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" @@ -409,6 +409,8 @@ namespace reco { float chargedHadronIso() const {return pfIsolation_.chargedHadronIso;} float neutralHadronIso() const {return pfIsolation_.neutralHadronIso;} float photonIso() const {return pfIsolation_.photonIso;} + float modFrixione() const {return pfIsolation_.modFrixione;} + /// Set Particle Flow Isolation variables void setPflowIsolationVariables ( const PflowIsolationVariables& pfisol ) { pfIsolation_ = pfisol;} From bf77ccc55b2f1b79f3637576d197da10d8ac423b Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:44 +0200 Subject: [PATCH 03/23] porting into CMSSW_7X --- .../EgammaCandidates/src/classes_def.xml | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/DataFormats/EgammaCandidates/src/classes_def.xml b/DataFormats/EgammaCandidates/src/classes_def.xml index a57afb4429cc0..455b055be538b 100644 --- a/DataFormats/EgammaCandidates/src/classes_def.xml +++ b/DataFormats/EgammaCandidates/src/classes_def.xml @@ -134,8 +134,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + From 4f84c3ec179ae8aea529c115d2b5d7a44912d990 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:44 +0200 Subject: [PATCH 04/23] porting into CMSSW_7X --- .../Tau/python/Validation/__init__.pyc | Bin 181 -> 141 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/HLTriggerOffline/Tau/python/Validation/__init__.pyc b/HLTriggerOffline/Tau/python/Validation/__init__.pyc index d5d93585639b34d9996ab647bc2a5a2829979b31..e5b033ee219ea322ca517fe6f4a4428932fb6bdb 100644 GIT binary patch delta 55 zcmdnW*vrVl{F#@_?CQ0^i5#ZNW(*7r#YM^b9zG#Ond#}NMgD1NIhlE>`XPy>`URCG K8Tok=J9Gi*ND{>W delta 95 zcmeBW+{(yt@e?l>>-GkZi5#ZhaSRL$`o+mbi6zMy`bmk&86}y;`W`+ZMVaa8sYUwE qzQMua@y79H@doh)MX5&m1(hWk`FRKx{%L7BnR%)DA&I3E6LbOf03gW# From 2695016b011b522dbcda4ac7594c9af5723199e9 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:45 +0200 Subject: [PATCH 05/23] porting into CMSSW_7X --- .../src/GsfElectronAlgo.cc | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc index 267f54939e223..3ae1207dc1d10 100644 --- a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc +++ b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc @@ -741,9 +741,9 @@ void GsfElectronAlgo::beginEvent( edm::Event & event ) //Fill in the Isolation Value Maps for PF and EcalDriven electrons std::vector inputTagIsoVals; if(! generalData_->inputCfg.pfIsoVals.empty() ) { - inputTagIsoVals.push_back(generalData_->inputCfg.pfIsoVals.getParameter("pfChargedHadrons")); - inputTagIsoVals.push_back(generalData_->inputCfg.pfIsoVals.getParameter("pfPhotons")); - inputTagIsoVals.push_back(generalData_->inputCfg.pfIsoVals.getParameter("pfNeutralHadrons")); + inputTagIsoVals.push_back(generalData_->inputCfg.pfIsoVals.getParameter("pfSumChargedHadronPt")); + inputTagIsoVals.push_back(generalData_->inputCfg.pfIsoVals.getParameter("pfSumPhotonEt")); + inputTagIsoVals.push_back(generalData_->inputCfg.pfIsoVals.getParameter("pfSumNeutralHadronEt")); eventData_->pfIsolationValues.resize(inputTagIsoVals.size()); @@ -755,9 +755,9 @@ void GsfElectronAlgo::beginEvent( edm::Event & event ) if(! generalData_->inputCfg.edIsoVals.empty() ) { inputTagIsoVals.clear(); - inputTagIsoVals.push_back(generalData_->inputCfg.edIsoVals.getParameter("edChargedHadrons")); - inputTagIsoVals.push_back(generalData_->inputCfg.edIsoVals.getParameter("edPhotons")); - inputTagIsoVals.push_back(generalData_->inputCfg.edIsoVals.getParameter("edNeutralHadrons")); + inputTagIsoVals.push_back(generalData_->inputCfg.edIsoVals.getParameter("edSumChargedHadronPt")); + inputTagIsoVals.push_back(generalData_->inputCfg.edIsoVals.getParameter("edSumPhotonEt")); + inputTagIsoVals.push_back(generalData_->inputCfg.edIsoVals.getParameter("edSumNeutralHadronEt")); eventData_->edIsolationValues.resize(inputTagIsoVals.size()); @@ -904,9 +904,9 @@ void GsfElectronAlgo::addPflowInfo() reco::GsfElectronRef pfElectronRef(eventData_->pflowElectrons, pfIndex); reco::GsfElectron::PflowIsolationVariables isoVariables; - isoVariables.chargedHadronIso=(*(eventData_->pfIsolationValues)[0])[pfElectronRef]; - isoVariables.photonIso =(*(eventData_->pfIsolationValues)[1])[pfElectronRef]; - isoVariables.neutralHadronIso=(*(eventData_->pfIsolationValues)[2])[pfElectronRef]; + isoVariables.sumChargedHadronPt =(*(eventData_->pfIsolationValues)[0])[pfElectronRef]; + isoVariables.sumPhotonEt =(*(eventData_->pfIsolationValues)[1])[pfElectronRef]; + isoVariables.sumNeutralHadronEt =(*(eventData_->pfIsolationValues)[2])[pfElectronRef]; (*el)->setPfIsolationVariables(isoVariables); } @@ -940,9 +940,9 @@ void GsfElectronAlgo::addPflowInfo() reco::GsfElectronRef edElectronRef(eventData_->previousElectrons, edIndex); reco::GsfElectron::PflowIsolationVariables isoVariables; - isoVariables.chargedHadronIso=(*(eventData_->edIsolationValues)[0])[edElectronRef]; - isoVariables.photonIso =(*(eventData_->edIsolationValues)[1])[edElectronRef]; - isoVariables.neutralHadronIso=(*(eventData_->edIsolationValues)[2])[edElectronRef]; + isoVariables.sumChargedHadronPt =(*(eventData_->edIsolationValues)[0])[edElectronRef]; + isoVariables.sumPhotonEt =(*(eventData_->edIsolationValues)[1])[edElectronRef]; + isoVariables.sumNeutralHadronEt =(*(eventData_->edIsolationValues)[2])[edElectronRef]; (*el)->setPfIsolationVariables(isoVariables); } From 2d1d60bbaa950840adf8bc8377683b2bedfc4c0f Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:45 +0200 Subject: [PATCH 06/23] porting into CMSSW_7X --- .../python/gsfElectrons_cfi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py index 5450dd2651c25..0f7ab0714ffb9 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py @@ -277,14 +277,14 @@ # Iso Values (PF and EcalDriven) useIsolationValues = cms.bool(True), pfIsolationValues = cms.PSet( - pfChargedHadrons = cms.InputTag('elPFIsoValueCharged04'), - pfPhotons = cms.InputTag('elPFIsoValueGamma04'), - pfNeutralHadrons= cms.InputTag('elPFIsoValueNeutral04')), + pfSumChargedHadronPt = cms.InputTag('elPFIsoValueCharged04'), + pfSumPhotonEt = cms.InputTag('elPFIsoValueGamma04'), + pfSumNeutralHadronEt= cms.InputTag('elPFIsoValueNeutral04')), edIsolationValues = cms.PSet( - edChargedHadrons = cms.InputTag('elEDIsoValueCharged04'), - edPhotons = cms.InputTag('elEDIsoValueGamma04'), - edNeutralHadrons= cms.InputTag('elEDIsoValueNeutral04')) + edSumChargedHadronPt = cms.InputTag('elEDIsoValueCharged04'), + edSumPhotonEt = cms.InputTag('elEDIsoValueGamma04'), + edSumNeutralHadronEt= cms.InputTag('elEDIsoValueNeutral04')) ) From 3f690834bc1abb5a29080037ce7ca63562b565ab Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:46 +0200 Subject: [PATCH 07/23] porting into CMSSW_7X --- .../PFProducer/plugins/PFElectronTranslator.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RecoParticleFlow/PFProducer/plugins/PFElectronTranslator.cc b/RecoParticleFlow/PFProducer/plugins/PFElectronTranslator.cc index 9b8fd0be6adef..16263819f1562 100644 --- a/RecoParticleFlow/PFProducer/plugins/PFElectronTranslator.cc +++ b/RecoParticleFlow/PFProducer/plugins/PFElectronTranslator.cc @@ -36,11 +36,11 @@ PFElectronTranslator::PFElectronTranslator(const edm::ParameterSet & iConfig) { edm::ParameterSet isoVals = iConfig.getParameter ("isolationValues"); inputTagIsoVals_.push_back - (isoVals.getParameter("pfChargedHadrons")); + (isoVals.getParameter("pfSumChargedHadronPt")); inputTagIsoVals_.push_back - (isoVals.getParameter("pfPhotons")); + (isoVals.getParameter("pfSumPhotonEt")); inputTagIsoVals_.push_back - (isoVals.getParameter("pfNeutralHadrons")); + (isoVals.getParameter("pfSumNeutralHadronEt")); } } @@ -630,9 +630,9 @@ void PFElectronTranslator::createGsfElectrons(const reco::PFCandidateCollection // isolation if( isolationValues.size() != 0 ) { reco::GsfElectron::PflowIsolationVariables myPFIso; - myPFIso.chargedHadronIso=(*isolationValues[0])[CandidatePtr_[iGSF]]; - myPFIso.photonIso=(*isolationValues[1])[CandidatePtr_[iGSF]]; - myPFIso.neutralHadronIso=(*isolationValues[2])[CandidatePtr_[iGSF]]; + myPFIso.sumChargedHadronPt=(*isolationValues[0])[CandidatePtr_[iGSF]]; + myPFIso.sumPhotonEt=(*isolationValues[1])[CandidatePtr_[iGSF]]; + myPFIso.sumNeutralHadronEt=(*isolationValues[2])[CandidatePtr_[iGSF]]; myElectron.setPfIsolationVariables(myPFIso); } From a4eaf31dd99b0cff14bb286f64c36fa8bf3d7699 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:47 +0200 Subject: [PATCH 08/23] porting into CMSSW_7X --- .../PFProducer/src/PFEGammaAlgo.cc | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc b/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc index 4c989bf205406..87ebc67afca50 100644 --- a/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc +++ b/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc @@ -632,28 +632,12 @@ void PFEGammaAlgo::RunPFEG(const reco::PFBlockRef& blockRef, elemsToLock.push_back(track2->second); // so it's another active conversion track, that is in the Block and linked to the conversion track we already found // find the ECAL cluster linked to it... - std::multimap convEcalAll; + std::multimap convEcal; blockRef->associatedElements( track2->second, linkData, - convEcalAll, + convEcal, reco::PFBlockElement::ECAL, reco::PFBlock::LINKTEST_ALL); - - //create cleaned collection of associated ecal clusters restricted to subdetector of the seeding supercluster - //This cleaning is needed since poorly reconstructed conversions can occasionally have the second track pointing - //to the wrong subdetector - std::multimap convEcal; - for(std::multimap::iterator itecal = convEcalAll.begin(); - itecal != convEcalAll.end(); ++itecal) { - - // to get the reference to the PF clusters, this is needed. - reco::PFClusterRef clusterRef = elements[itecal->second].clusterRef(); - - if (clusterRef->hitsAndFractions().at(0).first.subdetId()==sc->superClusterRef()->seed()->hitsAndFractions().at(0).first.subdetId()) { - convEcal.insert(*itecal); - } - } - float p_in=sqrt(elements[track->second].trackRef()->innerMomentum().x()*elements[track->second].trackRef()->innerMomentum().x()+ elements[track->second].trackRef()->innerMomentum().y()*elements[track->second].trackRef()->innerMomentum().y()+ elements[track->second].trackRef()->innerMomentum().z()*elements[track->second].trackRef()->innerMomentum().z()); From 6fc9d073af13c20cffdb8aea594097a6c0fa5af6 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:47 +0200 Subject: [PATCH 09/23] porting into CMSSW_7X --- .../plugins/ElectronMcFakeValidator.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc b/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc index f9d2dac3f48c2..d4074d07e6d81 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc +++ b/Validation/RecoEgamma/plugins/ElectronMcFakeValidator.cc @@ -1372,17 +1372,17 @@ void ElectronMcFakeValidator::analyze( const edm::Event & iEvent, const edm::Eve if (!bestGsfElectron.trackerDrivenSeed()&&bestGsfElectron.ecalDrivenSeed() && bestGsfElectron.isEE()) h1_ele_provenance_endcaps->Fill(2.); // Pflow isolation - h1_ele_chargedHadronIso->Fill(bestGsfElectron.pfIsolationVariables().chargedHadronIso); - if (bestGsfElectron.isEB()) h1_ele_chargedHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().chargedHadronIso); - if (bestGsfElectron.isEE()) h1_ele_chargedHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().chargedHadronIso); + h1_ele_chargedHadronIso->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt); + if (bestGsfElectron.isEB()) h1_ele_chargedHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt); + if (bestGsfElectron.isEE()) h1_ele_chargedHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt); - h1_ele_neutralHadronIso->Fill(bestGsfElectron.pfIsolationVariables().neutralHadronIso); - if (bestGsfElectron.isEB()) h1_ele_neutralHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().neutralHadronIso); - if (bestGsfElectron.isEE()) h1_ele_neutralHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().neutralHadronIso); + h1_ele_neutralHadronIso->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt); + if (bestGsfElectron.isEB()) h1_ele_neutralHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt); + if (bestGsfElectron.isEE()) h1_ele_neutralHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt); - h1_ele_photonIso->Fill(bestGsfElectron.pfIsolationVariables().photonIso); - if (bestGsfElectron.isEB()) h1_ele_photonIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().photonIso); - if (bestGsfElectron.isEE()) h1_ele_photonIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().photonIso); + h1_ele_photonIso->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); + if (bestGsfElectron.isEB()) h1_ele_photonIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); + if (bestGsfElectron.isEE()) h1_ele_photonIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); // isolation h1_ele_tkSumPt_dr03->Fill(bestGsfElectron.dr03TkSumPt()); From 6561e0813db7fb4c0d535e823ad5382ab59b442c Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:48 +0200 Subject: [PATCH 10/23] porting into CMSSW_7X --- .../plugins/ElectronMcSignalValidator.cc | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc index b3b3800ba4631..f432fd31e3139 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc +++ b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.cc @@ -136,6 +136,9 @@ ElectronMcSignalValidator::ElectronMcSignalValidator( const edm::ParameterSet & hoe_min=histosSet.getParameter("Hoemin"); hoe_max=histosSet.getParameter("Hoemax"); + error_nbin=histosSet.getParameter("Nbinerror"); + enerror_max=histosSet.getParameter("Energyerrormax"); + // so to please coverity... h1_mcNum = 0 ; h1_eleNum = 0 ; @@ -690,12 +693,12 @@ void ElectronMcSignalValidator::book() h2_ele_PhiMnPhiTrueVsEta = bookH2("PhiMnPhiTrueVsEta","ele momentum phi - gen phi vs eta",eta2D_nbin,eta_min,eta_max,dphi_nbin/2,dphi_min,dphi_max); h2_ele_PhiMnPhiTrueVsPhi = bookH2("PhiMnPhiTrueVsPhi","ele momentum phi - gen phi vs phi",phi2D_nbin,phi_min,phi_max,dphi_nbin/2,dphi_min,dphi_max); h2_ele_PhiMnPhiTrueVsPt = bookH2("PhiMnPhiTrueVsPt","ele momentum phi - gen phi vs pt",pt2D_nbin,0.,pt_max,dphi_nbin/2,dphi_min,dphi_max); - h1_ele_ecalEnergyError = bookH1withSumw2("ecalEnergyError","",30,0,30); + h1_ele_ecalEnergyError = bookH1withSumw2("ecalEnergyError","",error_nbin,0,enerror_max); h1_ele_ecalEnergyError_barrel = bookH1withSumw2("ecalEnergyError_barrel","",30,0,30); - h1_ele_ecalEnergyError_endcaps = bookH1withSumw2("ecalEnergyError_endcaps","",30,0,30); - h1_ele_combinedP4Error = bookH1withSumw2("combinedP4Error","",30,0,30); + h1_ele_ecalEnergyError_endcaps = bookH1withSumw2("ecalEnergyError_endcaps","",error_nbin,0,enerror_max); + h1_ele_combinedP4Error = bookH1withSumw2("combinedP4Error","",error_nbin,0,enerror_max); h1_ele_combinedP4Error_barrel = bookH1withSumw2("combinedP4Error_barrel","",30,0,30); - h1_ele_combinedP4Error_endcaps = bookH1withSumw2("combinedP4Error_endcaps","",30,0,30); + h1_ele_combinedP4Error_endcaps = bookH1withSumw2("combinedP4Error_endcaps","",error_nbin,0,enerror_max); // matched electron, superclusters setBookPrefix("h_scl") ; @@ -1723,17 +1726,17 @@ void ElectronMcSignalValidator::analyze( const edm::Event & iEvent, const edm::E if (bestGsfElectron.isGsfCtfChargeConsistent()) h1_ele_chargeInfo->Fill(1.0); // Pflow isolation - h1_ele_chargedHadronIso->Fill(bestGsfElectron.pfIsolationVariables().chargedHadronIso); - if (bestGsfElectron.isEB()) h1_ele_chargedHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().chargedHadronIso); - if (bestGsfElectron.isEE()) h1_ele_chargedHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().chargedHadronIso); + h1_ele_chargedHadronIso->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt); + if (bestGsfElectron.isEB()) h1_ele_chargedHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt); + if (bestGsfElectron.isEE()) h1_ele_chargedHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumChargedHadronPt); - h1_ele_neutralHadronIso->Fill(bestGsfElectron.pfIsolationVariables().neutralHadronIso); - if (bestGsfElectron.isEB()) h1_ele_neutralHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().neutralHadronIso); - if (bestGsfElectron.isEE()) h1_ele_neutralHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().neutralHadronIso); + h1_ele_neutralHadronIso->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt); + if (bestGsfElectron.isEB()) h1_ele_neutralHadronIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt); + if (bestGsfElectron.isEE()) h1_ele_neutralHadronIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumNeutralHadronEt); - h1_ele_photonIso->Fill(bestGsfElectron.pfIsolationVariables().photonIso); - if (bestGsfElectron.isEB()) h1_ele_photonIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().photonIso); - if (bestGsfElectron.isEE()) h1_ele_photonIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().photonIso); + h1_ele_photonIso->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); + if (bestGsfElectron.isEB()) h1_ele_photonIso_barrel->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); + if (bestGsfElectron.isEE()) h1_ele_photonIso_endcaps->Fill(bestGsfElectron.pfIsolationVariables().sumPhotonEt); // isolation h1_ele_tkSumPt_dr03->Fill(bestGsfElectron.dr03TkSumPt()); From 9d0ca114744f201c506654c2ce7764e9f097522b Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:48 +0200 Subject: [PATCH 11/23] porting into CMSSW_7X --- Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h index 6e8c4960d0cd7..654aa24ea4b7d 100644 --- a/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h +++ b/Validation/RecoEgamma/plugins/ElectronMcSignalValidator.h @@ -71,6 +71,7 @@ class ElectronMcSignalValidator : public ElectronDqmAnalyzerBase int mee_nbin ; double mee_min ; double mee_max ; int hoe_nbin ; double hoe_min ; double hoe_max ; int poptrue_nbin ; double poptrue_min ; double poptrue_max ; + int error_nbin ; double enerror_max ; // histos From c031234bf425bba5b6af2ee325ceb33d591d3b83 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:49 +0200 Subject: [PATCH 12/23] porting into CMSSW_7X --- Validation/RecoEgamma/plugins/PhotonPostprocessing.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc b/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc index 33dafaedc6474..39d19806a29fb 100755 --- a/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc +++ b/Validation/RecoEgamma/plugins/PhotonPostprocessing.cc @@ -11,7 +11,7 @@ ** ** ** $Id: PhotonPostprocessing - ** $Date: 2013/06/11 15:57:19 $ + ** $Date: 2013/06/07 11:19:14 $ ** author: ** Nancy Marinelli, U. of Notre Dame, US ** @@ -108,7 +108,6 @@ void PhotonPostprocessing::runPostprocessing() // Photon reconstruction efficiencies string histname = "recoEffVsEta"; phoRecoEffEta_ = dbe_->book1D(histname,"Photon reconstruction efficiency vs simulated #eta",etaBin,etaMin, etaMax); - histname = "recoEffVsPhi"; phoRecoEffPhi_ = dbe_->book1D(histname,"Photon reconstruction efficiency vs simulated #phi",phiBin,phiMin, phiMax); histname = "recoEffVsEt"; @@ -252,9 +251,8 @@ void PhotonPostprocessing::endLuminosityBlock(const edm::LuminosityBlock& lumi, void PhotonPostprocessing::dividePlots(MonitorElement* dividend, MonitorElement* numerator, MonitorElement* denominator, std::string type ){ double value,err; - for (int j=1; j<=numerator->getNbinsX(); j++){ - dividend->setEfficiencyFlag(); + if (denominator->getBinContent(j)!=0){ if (type=="effic") value = ((double) numerator->getBinContent(j))/((double) denominator->getBinContent(j)); From 1f780597511f71fa9bb18008005b66aba797e99b Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:50 +0200 Subject: [PATCH 13/23] porting into CMSSW_7X --- .../RecoEgamma/plugins/PhotonValidator.cc | 431 +++++++++--------- 1 file changed, 224 insertions(+), 207 deletions(-) diff --git a/Validation/RecoEgamma/plugins/PhotonValidator.cc b/Validation/RecoEgamma/plugins/PhotonValidator.cc index 876520df293ad..936c49ee4c73f 100755 --- a/Validation/RecoEgamma/plugins/PhotonValidator.cc +++ b/Validation/RecoEgamma/plugins/PhotonValidator.cc @@ -81,8 +81,8 @@ ** ** ** $Id: PhotonValidator - ** $Date: 2013/06/14 13:42:50 $ - ** $Revision: 1.8 $ + ** $Date: 2013/06/07 11:21:10 $ + ** $Revision: 1.6 $ ** \author Nancy Marinelli, U. of Notre Dame, US ** ***/ @@ -459,10 +459,10 @@ void PhotonValidator::beginJob() { h_r9Bkg_[2] = dbe_->book1D(histname+"Endcap"," r9 bkg: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R9VsEtaBkg"; - if ( ! isRunCentrally_ ) h2_r9VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r9VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R9VsEtBkg"; - if ( ! isRunCentrally_ ) h2_r9VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r9VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r1Bkg"; h_r1Bkg_[0] = dbe_->book1D(histname+"All", " Bkg photon e1x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -470,14 +470,14 @@ void PhotonValidator::beginJob() { h_r1Bkg_[2] = dbe_->book1D(histname+"Endcap"," Bkg photon e1x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R1VsEtaBkg"; - if ( ! isRunCentrally_ ) h2_r1VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r1VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); histname="pR1VsEtaBkg"; - if ( ! isRunCentrally_ ) p_r1VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + p_r1VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R1VsEtBkg"; - if ( ! isRunCentrally_ ) h2_r1VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r1VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); histname="pR1VsEtBkg"; - if ( ! isRunCentrally_ ) p_r1VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + p_r1VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r2Bkg"; h_r2Bkg_[0] = dbe_->book1D(histname+"All", " Bkg photon e2x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -485,14 +485,14 @@ void PhotonValidator::beginJob() { h_r2Bkg_[2] = dbe_->book1D(histname+"Endcap"," Bkg photon e2x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R2VsEtaBkg"; - if ( ! isRunCentrally_ ) h2_r2VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r2VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); histname="pR2VsEtaBkg"; - if ( ! isRunCentrally_ ) p_r2VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + p_r2VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R2VsEtBkg"; - if ( ! isRunCentrally_ ) h2_r2VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r2VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); histname="pR2VsEtBkg"; - if ( ! isRunCentrally_ ) p_r2VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + p_r2VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); histname = "sigmaIetaIetaBkg"; @@ -501,19 +501,19 @@ void PhotonValidator::beginJob() { h_sigmaIetaIetaBkg_[2] = dbe_->book1D(histname+"Endcap","Bkg sigmaIetaIeta: Endcap ", 100,0., 0.1) ; // histname="sigmaIetaIetaVsEtaBkg"; - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); histname="pSigmaIetaIetaVsEtaBkg"; - if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + p_sigmaIetaIetaVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); // histname="sigmaIetaIetaVsEtBkg"; - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); // histname="pSigmaIetaIetaVsEtBkg"; - if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + p_sigmaIetaIetaVsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + p_sigmaIetaIetaVsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + p_sigmaIetaIetaVsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); // histname = "hOverEBkg"; h_hOverEBkg_[0] = dbe_->book1D(histname+"All", "H/E bkg: All Ecal",100,0., 1.) ; @@ -521,9 +521,9 @@ void PhotonValidator::beginJob() { h_hOverEBkg_[2] = dbe_->book1D(histname+"Endcap","H/E bkg: Endcap ", 100,0., 1.) ; // histname="pHOverEVsEtaBkg"; - if ( ! isRunCentrally_ ) p_hOverEVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg H/E vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + p_hOverEVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg H/E vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); histname="pHOverEVsEtBkg"; - if ( ! isRunCentrally_ ) p_hOverEVsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons H/E vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + p_hOverEVsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons H/E vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); if ( ! isRunCentrally_ ) { histname="hOverEVsEtaBkg"; h2_hOverEVsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg H/E vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); @@ -553,12 +553,12 @@ void PhotonValidator::beginJob() { } histname="pEcalRecHitSumEtConeDR04VsEtaBkg"; - if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons ecalRecHitSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); + p_ecalRecHitSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons ecalRecHitSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); // histname="pEcalRecHitSumEtConeDR04VsEtBkg"; - if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_ecalRecHitSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_ecalRecHitSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_ecalRecHitSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // histname = "hcalTowerSumEtConeDR04Bkg"; h_hcalTowerSumEtConeDR04Bkg_[0] = dbe_->book1D(histname+"All", "bkg hcalTowerSumEtDR04: All Ecal",etBin,etMin,20.); @@ -566,12 +566,12 @@ void PhotonValidator::beginJob() { h_hcalTowerSumEtConeDR04Bkg_[2] = dbe_->book1D(histname+"Endcap","bkg hcalTowerSumEtDR04: Endcap ", etBin,etMin,20.); // histname="pHcalTowerSumEtConeDR04VsEtaBkg"; - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons hcalTowerSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); + p_hcalTowerSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons hcalTowerSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); // histname="pHcalTowerSumEtConeDR04VsEtBkg"; - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_hcalTowerSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_hcalTowerSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_hcalTowerSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // histname = "isoTrkSolidConeDR04Bkg"; h_isoTrkSolidConeDR04Bkg_[0] = dbe_->book1D(histname+"All", "isoTrkSolidConeDR04 Bkg: All Ecal",etBin,etMin,etMax*0.1); @@ -579,18 +579,18 @@ void PhotonValidator::beginJob() { h_isoTrkSolidConeDR04Bkg_[2] = dbe_->book1D(histname+"Endcap","isoTrkSolidConeDR04 Bkg: Endcap ", etBin,etMin,etMax*0.1); // histname="isoTrkSolidConeDR04VsEtaBkg"; - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); histname="pIsoTrkSolidConeDR04VsEtaBkg"; - if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); + p_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); // histname="isoTrkSolidConeDR04VsEtBkg"; - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); histname="pIsoTrkSolidConeDR04VsEtBkg"; - if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + p_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + p_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + p_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); // histname = "nTrkSolidConeDR04Bkg"; h_nTrkSolidConeDR04Bkg_[0] = dbe_->book1D(histname+"All", "Bkg nTrkSolidConeDR04: All Ecal",20,0., 20) ; @@ -598,19 +598,19 @@ void PhotonValidator::beginJob() { h_nTrkSolidConeDR04Bkg_[2] = dbe_->book1D(histname+"Endcap","Bkg nTrkSolidConeDR04: Endcap ", 20,0., 20) ; // histname="nTrkSolidConeDR04VsEtaBkg"; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; + h2_nTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; histname="p_nTrkSolidConeDR04VsEtaBkg"; - if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; + p_nTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; // histname="nTrkSolidConeDR04VsEtBkg"; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + h2_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + h2_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + h2_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; // histname="pnTrkSolidConeDR04VsEtBkg"; - if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + p_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + p_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + p_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; // h_convEtaBkg_ = dbe_->book1D("convEtaBkg"," converted Photon Bkg Eta 2 tracks",etaBin,etaMin, etaMax) ; h_convPhiBkg_ = dbe_->book1D("convPhiBkg"," converted Photon Bkg Phi ",phiBin,phiMin,phiMax) ; @@ -706,12 +706,12 @@ void PhotonValidator::beginJob() { ///// // histname="R9VsEta"; - if ( ! isRunCentrally_ ) h2_r9VsEta_[0] = dbe_->book2D(histname+"All"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); - if ( ! isRunCentrally_ ) h2_r9VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r9VsEta_[0] = dbe_->book2D(histname+"All"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r9VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R9VsEt"; - if ( ! isRunCentrally_ ) h2_r9VsEt_[0] = dbe_->book2D(histname+"All"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); - if ( ! isRunCentrally_ ) h2_r9VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r9VsEt_[0] = dbe_->book2D(histname+"All"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r9VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r1"; h_r1_[0][0] = dbe_->book1D(histname+"All", " e1x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -719,12 +719,12 @@ void PhotonValidator::beginJob() { h_r1_[0][2] = dbe_->book1D(histname+"Endcap"," e1x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R1VsEta"; - if ( ! isRunCentrally_ ) h2_r1VsEta_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); - if ( ! isRunCentrally_ ) h2_r1VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r1VsEta_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r1VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R1VsEt"; - if ( ! isRunCentrally_ ) h2_r1VsEt_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); - if ( ! isRunCentrally_ ) h2_r1VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r1VsEt_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r1VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r2"; h_r2_[0][0] = dbe_->book1D(histname+"All", " e2x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -732,12 +732,12 @@ void PhotonValidator::beginJob() { h_r2_[0][2] = dbe_->book1D(histname+"Endcap"," e2x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R2VsEta"; - if ( ! isRunCentrally_ ) h2_r2VsEta_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); - if ( ! isRunCentrally_ ) h2_r2VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r2VsEta_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + h2_r2VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R2VsEt"; - if ( ! isRunCentrally_ ) h2_r2VsEt_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); - if ( ! isRunCentrally_ ) h2_r2VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r2VsEt_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + h2_r2VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "sigmaIetaIeta"; h_sigmaIetaIeta_[0][0] = dbe_->book1D(histname+"All", "sigmaIetaIeta: All Ecal",100,0., 0.1) ; @@ -745,12 +745,12 @@ void PhotonValidator::beginJob() { h_sigmaIetaIeta_[0][2] = dbe_->book1D(histname+"Endcap","sigmaIetaIeta: Endcap ", 100,0., 0.1) ; // histname="sigmaIetaIetaVsEta"; - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEta_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEta_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,0.1); // histname="sigmaIetaIetaVsEt"; - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEt_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEt_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + h2_sigmaIetaIetaVsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); // histname = "hOverE"; h_hOverE_[0][0] = dbe_->book1D(histname+"All", "H/E: All Ecal",100,0., 0.1) ; @@ -811,7 +811,7 @@ void PhotonValidator::beginJob() { h2_ecalRecHitSumEtConeDR04VsEt_[2] = dbe_->book2D(histname+"Endcap"," All photons ecalRecHitSumEtDR04 vs Et: Endcap ",etBin,etMin, etMax, etBin,etMin,etMax*etScale); } histname="pEcalRecHitSumEtConeDR04VsEt"; - if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_ecalRecHitSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_ecalRecHitSumEtConeDR04VsEt_[1] = dbe_->bookProfile(histname+"Barrel","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_ecalRecHitSumEtConeDR04VsEt_[2] = dbe_->bookProfile(histname+"Endcap","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // @@ -821,7 +821,7 @@ void PhotonValidator::beginJob() { h_hcalTowerSumEtConeDR04_[0][2] = dbe_->book1D(histname+"Endcap","hcalTowerSumEtConeDR04: Endcap ", etBin,etMin,20.); // histname = "hcalTowerBcSumEtConeDR04"; - if ( ! isRunCentrally_ ) h_hcalTowerBcSumEtConeDR04_[0][0] = dbe_->book1D(histname+"All", "hcalTowerBcSumEtConeDR04: All Ecal",etBin,etMin,20.); + h_hcalTowerBcSumEtConeDR04_[0][0] = dbe_->book1D(histname+"All", "hcalTowerBcSumEtConeDR04: All Ecal",etBin,etMin,20.); h_hcalTowerBcSumEtConeDR04_[0][1] = dbe_->book1D(histname+"Barrel","hcalTowerBcSumEtConeDR04: Barrel ", etBin,etMin,20.); h_hcalTowerBcSumEtConeDR04_[0][2] = dbe_->book1D(histname+"Endcap","hcalTowerBcSumEtConeDR04: Endcap ", etBin,etMin,20.); @@ -845,12 +845,12 @@ void PhotonValidator::beginJob() { h2_hcalTowerSumEtConeDR04VsEt_[2] = dbe_->book2D(histname+"Endcap"," All photons hcalTowerSumEtConeDR04 vs Et: Endcap ",etBin,etMin, etMax,etBin,etMin,etMax*0.1); } histname="pHcalTowerSumEtConeDR04VsEt"; - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_hcalTowerSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerSumEtConeDR04VsEt_[1] = dbe_->bookProfile(histname+"Barrel","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerSumEtConeDR04VsEt_[2] = dbe_->bookProfile(histname+"Endcap","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // histname="pHcalTowerBcSumEtConeDR04VsEt"; - if ( ! isRunCentrally_ ) p_hcalTowerBcSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + p_hcalTowerBcSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerBcSumEtConeDR04VsEt_[1] = dbe_->bookProfile(histname+"Barrel","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerBcSumEtConeDR04VsEt_[2] = dbe_->bookProfile(histname+"Endcap","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); @@ -862,13 +862,13 @@ void PhotonValidator::beginJob() { // histname="isoTrkSolidConeDR04VsEta"; - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,etBin,etMin,etMax*0.1); // histname="isoTrkSolidConeDR04VsEt"; - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + h2_isoTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); // histname = "nTrkSolidConeDR04"; h_nTrkSolidConeDR04_[0][0] = dbe_->book1D(histname+"All", "nTrkSolidConeDR04: All Ecal",20,0., 20) ; @@ -876,12 +876,12 @@ void PhotonValidator::beginJob() { h_nTrkSolidConeDR04_[0][2] = dbe_->book1D(histname+"Endcap","nTrkSolidConeDR04: Endcap ", 20,0., 20) ; // histname="nTrkSolidConeDR04VsEta"; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,20,0., 20) ; + h2_nTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; + h2_nTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,20,0., 20) ; // histname="nTrkSolidConeDR04VsEt"; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax,20,0., 20) ; + h2_nTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + h2_nTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax,20,0., 20) ; // histname = "phoE"; h_phoE_[0][0]=dbe_->book1D(histname+"All"," Photon Energy: All ecal ", eBin,eMin, eMax); @@ -908,8 +908,8 @@ void PhotonValidator::beginJob() { histname="eResVsEta"; - if ( ! isRunCentrally_ ) h2_eResVsEta_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); - if ( ! isRunCentrally_ ) h2_eResVsEta_[1] = dbe_->book2D(histname+"Unconv"," Unconv photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); + h2_eResVsEta_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); + h2_eResVsEta_[1] = dbe_->book2D(histname+"Unconv"," Unconv photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); histname="pEResVsEta"; p_eResVsEta_[0] = dbe_->bookProfile(histname+"All","All photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin,etaMax,resBin,resMin, resMax,""); @@ -942,19 +942,19 @@ void PhotonValidator::beginJob() { histname="eResVsR9"; - if ( ! isRunCentrally_ ) h2_eResVsR9_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); - if ( ! isRunCentrally_ ) h2_eResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons E/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); - if ( ! isRunCentrally_ ) h2_eResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons E/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); + h2_eResVsR9_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); + h2_eResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons E/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); + h2_eResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons E/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); histname="pEResVsR9"; - if ( ! isRunCentrally_ ) p_eResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); + p_eResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_eResVsR9_[1] = dbe_->bookProfile(histname+"Barrel"," All photons E/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_eResVsR9_[2] = dbe_->bookProfile(histname+"Endcap"," All photons E/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); histname="sceResVsR9"; - if ( ! isRunCentrally_ ) h2_sceResVsR9_[0] = dbe_->book2D(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); - if ( ! isRunCentrally_ ) h2_sceResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons scE/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); - if ( ! isRunCentrally_ ) h2_sceResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons scE/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); + h2_sceResVsR9_[0] = dbe_->book2D(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); + h2_sceResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons scE/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); + h2_sceResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons scE/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); histname="scpEResVsR9"; - if ( ! isRunCentrally_ ) p_sceResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); + p_sceResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_sceResVsR9_[1] = dbe_->bookProfile(histname+"Barrel"," All photons scE/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_sceResVsR9_[2] = dbe_->bookProfile(histname+"Endcap"," All photons scE/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); @@ -1207,10 +1207,10 @@ void PhotonValidator::beginJob() { h2_DCotTracksVsR_ = dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta cotg(#Theta) Tracks at vertex vs R",rBin,rMin, rMax,100, -0.2, 0.2); histname="h2_DPhiTracksAtEcalVsR"; - if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) h2_DPhiTracksAtEcalVsR_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R : all Ecal ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax); + h2_DPhiTracksAtEcalVsR_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R : all Ecal ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax); histname="h2_DPhiTracksAtEcalVsEta"; - if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) h2_DPhiTracksAtEcalVsEta_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta : all Ecal ",etaBin2,etaMin, etaMax, dPhiTracksBin,0.,dPhiTracksMax); + h2_DPhiTracksAtEcalVsEta_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta : all Ecal ",etaBin2,etaMin, etaMax, dPhiTracksBin,0.,dPhiTracksMax); } @@ -1240,25 +1240,22 @@ void PhotonValidator::beginJob() { h_distMinAppTracks_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions Min Approach Dist Tracks: Barrel Ecal ",dEtaTracksBin,-0.1,0.6); h_distMinAppTracks_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions Min Approach Dist Tracks: Endcap Ecal ",dEtaTracksBin,-0.1,0.6); - if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) { - histname="hDPhiTracksAtEcal"; - h_DPhiTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal : all Ecal ",dPhiTracksBin,0.,dPhiTracksMax); - h_DPhiTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#phi at Ecal : Barrel Ecal ",dPhiTracksBin,0.,dPhiTracksMax); - h_DPhiTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#phi at Ecal : Endcap Ecal ",dPhiTracksBin,0.,dPhiTracksMax); - - histname="pDPhiTracksAtEcalVsR"; - p_DPhiTracksAtEcalVsR_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax,""); + histname="hDPhiTracksAtEcal"; + h_DPhiTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal : all Ecal ",dPhiTracksBin,0.,dPhiTracksMax); + h_DPhiTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#phi at Ecal : Barrel Ecal ",dPhiTracksBin,0.,dPhiTracksMax); + h_DPhiTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#phi at Ecal : Endcap Ecal ",dPhiTracksBin,0.,dPhiTracksMax); - histname="pDPhiTracksAtEcalVsEta"; - p_DPhiTracksAtEcalVsEta_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta ",etaBin2,etaMin, etaMax,dPhiTracksBin,0.,dPhiTracksMax,""); + histname="pDPhiTracksAtEcalVsR"; + p_DPhiTracksAtEcalVsR_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax,""); + histname="pDPhiTracksAtEcalVsEta"; + p_DPhiTracksAtEcalVsEta_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta ",etaBin2,etaMin, etaMax,dPhiTracksBin,0.,dPhiTracksMax,""); - histname="hDEtaTracksAtEcal"; - h_DEtaTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#eta at Ecal : all Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); - h_DEtaTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#eta at Ecal : Barrel Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); - h_DEtaTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#eta at Ecal : Endcap Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); - - } + + histname="hDEtaTracksAtEcal"; + h_DEtaTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#eta at Ecal : all Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); + h_DEtaTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#eta at Ecal : Barrel Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); + h_DEtaTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#eta at Ecal : Endcap Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); h_convVtxRvsZ_[0] = dbe_->book2D("convVtxRvsZAll"," Photon Reco conversion vtx position",zBinForXray, zMinForXray, zMaxForXray, rBinForXray, rMinForXray, rMaxForXray); @@ -1414,12 +1411,12 @@ void PhotonValidator::beginJob() { h2_PtRecVsPtSimMixProv_ =dbe_->book2D(histname+"All", "Pt Rec vs Pt sim All for mix with general tracks ", etBin,etMin,etMax,etBin,etMin, etMax); } - if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) { - histname="eBcOverTkPout"; - hBCEnergyOverTrackPout_[0] = dbe_->book1D(histname+"All","Matrching BC E/P_out: all Ecal ",100, 0., 5.); - hBCEnergyOverTrackPout_[1] = dbe_->book1D(histname+"Barrel","Matrching BC E/P_out: Barrel ",100, 0., 5.); - hBCEnergyOverTrackPout_[2] = dbe_->book1D(histname+"Endcap","Matrching BC E/P_out: Endcap ",100, 0., 5.); - } + + histname="eBcOverTkPout"; + hBCEnergyOverTrackPout_[0] = dbe_->book1D(histname+"All","Matrching BC E/P_out: all Ecal ",100, 0., 5.); + hBCEnergyOverTrackPout_[1] = dbe_->book1D(histname+"Barrel","Matrching BC E/P_out: Barrel ",100, 0., 5.); + hBCEnergyOverTrackPout_[2] = dbe_->book1D(histname+"Endcap","Matrching BC E/P_out: Endcap ",100, 0., 5.); + ////////////// test on OutIn tracks h_OIinnermostHitR_ = dbe_->book1D("OIinnermostHitR"," R innermost hit for OI tracks ",50, 0., 25); @@ -2185,23 +2182,23 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( phoIsInEndcap ) h_psE_->Fill( matchingPho.superCluster()->preshowerEnergy() ) ; // h_r9_[type][0]->Fill( r9 ); + h2_r9VsEta_[0] -> Fill (mcEta_, r9); + h2_r9VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r9); // h_r1_[type][0]->Fill( r1 ); + h2_r1VsEta_[0] -> Fill (mcEta_, r1); + h2_r1VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r1); // h_r2_[type][0]->Fill( r2 ); + h2_r2VsEta_[0] -> Fill (mcEta_, r2); + h2_r2VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r2); // h_sigmaIetaIeta_[type][0]->Fill( sigmaIetaIeta ); + h2_sigmaIetaIetaVsEta_[0] -> Fill (mcEta_, sigmaIetaIeta ); + h2_sigmaIetaIetaVsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); // h_hOverE_[type][0]->Fill( hOverE ); if ( ! isRunCentrally_ ) { - h2_r9VsEta_[0] -> Fill (mcEta_, r9); - h2_r9VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r9); - h2_r1VsEta_[0] -> Fill (mcEta_, r1); - h2_r1VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r1); - h2_r2VsEta_[0] -> Fill (mcEta_, r2); - h2_r2VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r2); - h2_sigmaIetaIetaVsEta_[0] -> Fill (mcEta_, sigmaIetaIeta ); - h2_sigmaIetaIetaVsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); h2_hOverEVsEta_[0] -> Fill (mcEta_, hOverE ); h2_hOverEVsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), hOverE); } @@ -2223,26 +2220,24 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } p_ecalRecHitSumEtConeDR04VsEta_[0] -> Fill (mcEta_, ecalIso ); - if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); + p_ecalRecHitSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); // h_hcalTowerSumEtConeDR04_[type][0]->Fill( hcalIso ); p_hcalTowerSumEtConeDR04VsEta_[0] -> Fill (mcEta_, hcalIso ); - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); + p_hcalTowerSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); // - if ( ! isRunCentrally_ ) h_hcalTowerBcSumEtConeDR04_[type][0]->Fill( newhcalIso ); + h_hcalTowerBcSumEtConeDR04_[type][0]->Fill( newhcalIso ); p_hcalTowerBcSumEtConeDR04VsEta_[0] -> Fill (mcEta_, newhcalIso ); - if ( ! isRunCentrally_ ) p_hcalTowerBcSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), newhcalIso); + p_hcalTowerBcSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), newhcalIso); // h_isoTrkSolidConeDR04_[type][0]->Fill( trkIso ); + h2_isoTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, trkIso ); + h2_isoTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), trkIso); + // h_nTrkSolidConeDR04_[type][0]->Fill( nIsoTrk ); - - if ( ! isRunCentrally_ ) { - h2_isoTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, trkIso ); - h2_isoTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), trkIso); - h2_nTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, nIsoTrk ); - h2_nTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); - } - + h2_nTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, nIsoTrk ); + h2_nTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); + // h_chHadIso_[0]-> Fill (chargedHadIso); h_nHadIso_[0]-> Fill (neutralHadIso); h_phoIso_[0]-> Fill (photonIso); @@ -2260,33 +2255,37 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_phoERes_[0][0]->Fill( photonE / (*mcPho).fourMomentum().e() ); h_phoEResRegr1_[0][0]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][0]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); - + h2_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; p_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; - p_eResVsEt_[0][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; + //std::cout << " Debug 1.5 " << std::endl; - if ( ! isRunCentrally_ ) h2_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) h2_eResVsEt_[0][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; - if ( ! isRunCentrally_ ) h2_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - if ( ! isRunCentrally_ ) h2_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; - if ( ! isRunCentrally_ ) p_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - if ( ! isRunCentrally_ ) p_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; + p_eResVsEt_[0][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; + + h2_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + h2_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; + p_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + p_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; // //std::cout << " Debug 1.6 " << std::endl; if ( (*mcPho).isAConversion() == 0 ) { + h2_eResVsEta_[1]->Fill (mcEta_, photonE/ (*mcPho).fourMomentum().e() ) ; + + + + h2_r9VsEta_[1] -> Fill (mcEta_, r9); + h2_r9VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r9); + // + h2_r1VsEta_[1] -> Fill (mcEta_, r1); + h2_r1VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r1); + // + h2_r2VsEta_[1] -> Fill (mcEta_, r2); + h2_r2VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r2); + // + h2_sigmaIetaIetaVsEta_[1] -> Fill (mcEta_, sigmaIetaIeta ); + h2_sigmaIetaIetaVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); + // if ( ! isRunCentrally_ ) { - h2_eResVsEta_[1]->Fill (mcEta_, photonE/ (*mcPho).fourMomentum().e() ) ; - h2_r9VsEta_[1] -> Fill (mcEta_, r9); - h2_r9VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r9); - // - h2_r1VsEta_[1] -> Fill (mcEta_, r1); - h2_r1VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r1); - // - h2_r2VsEta_[1] -> Fill (mcEta_, r2); - h2_r2VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r2); - // - h2_sigmaIetaIetaVsEta_[1] -> Fill (mcEta_, sigmaIetaIeta ); - h2_sigmaIetaIetaVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); - // h2_hOverEVsEta_[1] -> Fill (mcEta_, hOverE ); h2_hOverEVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), hOverE); } @@ -2297,15 +2296,15 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! isRunCentrally_ ) { h2_ecalRecHitSumEtConeDR04VsEta_[1] -> Fill (mcEta_, ecalIso ); h2_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); - h2_isoTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, trkIso ); - h2_isoTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), trkIso); - h2_nTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, nIsoTrk ); - h2_nTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); - } p_ecalRecHitSumEtConeDR04VsEta_[1] -> Fill (mcEta_, ecalIso ); - if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); + p_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); // + h2_isoTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, trkIso ); + h2_isoTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), trkIso); + // + h2_nTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, nIsoTrk ); + h2_nTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); //std::cout << " Debug 1.8 " << std::endl; } @@ -2370,11 +2369,11 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_phoERes_[0][1]->Fill( photonE / (*mcPho).fourMomentum().e() ); h_phoEResRegr1_[0][1]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][1]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); + h2_eResVsR9_[1]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + h2_sceResVsR9_[1]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; p_eResVsR9_[1]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; p_sceResVsR9_[1]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) { - h2_eResVsR9_[1]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - h2_sceResVsR9_[1]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; h2_ecalRecHitSumEtConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); h2_hcalTowerSumEtConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); h2_eResVsEt_[1][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; @@ -2436,12 +2435,12 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup //std::cout << " Looking for troubles 6 " << std::endl; h_phoEResRegr1_[0][2]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][2]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); + h2_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + h2_sceResVsR9_[2]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; //std::cout << " Looking for troubles 7 " << std::endl; - p_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + p_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; p_sceResVsR9_[2]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) { - h2_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - h2_sceResVsR9_[2]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; h2_ecalRecHitSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); h2_hcalTowerSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); h2_eResVsEt_[2][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; @@ -3391,29 +3390,34 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_isoTrkSolidConeDR04Bkg_[0]->Fill( trkIso ); h_nTrkSolidConeDR04Bkg_[0]->Fill( nIsoTrk ); - if ( ! isRunCentrally_ ) { - h2_r9VsEtaBkg_ -> Fill (mcJetEta_, r9); - h2_r9VsEtBkg_ -> Fill (mcJetPt, r9); - h2_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); - h2_r1VsEtBkg_ -> Fill (mcJetPt, r1); - h2_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); - h2_r2VsEtBkg_ -> Fill (mcJetPt, r2); - h2_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); - h2_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); - h2_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); - h2_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); + h2_r9VsEtaBkg_ -> Fill (mcJetEta_, r9); + h2_r9VsEtBkg_ -> Fill (mcJetPt, r9); + + h2_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); + h2_r1VsEtBkg_ -> Fill (mcJetPt, r1); + p_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); + p_r1VsEtBkg_ -> Fill (mcJetPt, r1); + + h2_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); + h2_r2VsEtBkg_ -> Fill (mcJetPt, r2); + p_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); + p_r2VsEtBkg_ -> Fill (mcJetPt, r2); + - p_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); - p_r1VsEtBkg_ -> Fill (mcJetPt, r1); - p_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); - p_r2VsEtBkg_ -> Fill (mcJetPt, r2); - p_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); - p_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); - p_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); - p_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); + h2_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); + p_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); + h2_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); + p_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); + //std::cout << " Debug 18 " << std::endl; + + if ( ! isRunCentrally_ ) { + h2_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); + h2_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); } + p_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); + p_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); if ( ! isRunCentrally_ ) { @@ -3421,21 +3425,30 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h2_ecalRecHitSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, ecalIso); h2_hcalTowerSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, hcalIso ); h2_hcalTowerSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, hcalIso); - p_ecalRecHitSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, ecalIso ); - p_ecalRecHitSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, ecalIso); - p_hcalTowerSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, hcalIso ); - p_hcalTowerSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, hcalIso); - p_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); - p_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); - p_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); - p_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); - h2_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); - h2_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); - h2_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); - h2_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); - } + p_ecalRecHitSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, ecalIso ); + p_ecalRecHitSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, ecalIso); + + + + p_hcalTowerSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, hcalIso ); + + p_hcalTowerSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, hcalIso); + + h2_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); + p_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); + h2_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); + p_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); + + + h2_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); + p_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); + h2_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); + p_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); + + //std::cout << " Debug 19 " << std::endl; + if ( phoIsInBarrel ) { @@ -3451,17 +3464,19 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_isoTrkSolidConeDR04Bkg_[1]->Fill( trkIso ); h_nTrkSolidConeDR04Bkg_[1]->Fill( nIsoTrk ); + h2_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); + p_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); + p_ecalRecHitSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, ecalIso); + p_hcalTowerSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, hcalIso); + + h2_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); + p_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); + + h2_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); + p_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); if ( ! isRunCentrally_ ) { - h2_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); - h2_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); - h2_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); h2_ecalRecHitSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, ecalIso); h2_hcalTowerSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, hcalIso); - p_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); - p_ecalRecHitSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, ecalIso); - p_hcalTowerSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, hcalIso); - p_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); - p_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); } //std::cout << " Debug 20 " << std::endl; @@ -3478,17 +3493,19 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_isoTrkSolidConeDR04Bkg_[2]->Fill( trkIso ); h_nTrkSolidConeDR04Bkg_[2]->Fill( nIsoTrk ); + h2_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); + p_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); + p_ecalRecHitSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, ecalIso); + p_hcalTowerSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, hcalIso); + + h2_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); + p_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); + + h2_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); + p_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); if ( ! isRunCentrally_ ) { - h2_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); - h2_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); - h2_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); h2_ecalRecHitSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, ecalIso); h2_hcalTowerSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, hcalIso); - p_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); - p_ecalRecHitSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, ecalIso); - p_hcalTowerSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, hcalIso); - p_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); - p_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); } //std::cout << " Debug 21 " << std::endl; From 4cce33f44a114a3174b21601e5a36e98174cc159 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:50 +0200 Subject: [PATCH 14/23] porting into CMSSW_7X --- Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py index 2d026bae0fe78..d15a652faeb2e 100644 --- a/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcFakeValidator_cfi.py @@ -16,7 +16,8 @@ Nbineop = cms.int32(50), Nbineop2D = cms.int32(30), Eopmax = cms.double(5.0), Eopmaxsht = cms.double(3.0), Nbinmee = cms.int32(100), Meemin = cms.double(0.0), Meemax = cms.double(150.), Nbinhoe = cms.int32(100), Hoemin = cms.double(0.0), Hoemax = cms.double(0.5), - Nbinpopmatching = cms.int32(75), Popmatchingmin = cms.double(0.0), Popmatchingmax = cms.double(1.5) + Nbinpopmatching = cms.int32(75), Popmatchingmin = cms.double(0.0), Popmatchingmax = cms.double(1.5), + Nbinerror = cms.int32(30), Energyerrormax = cms.double(30.0) ) electronMcFakeValidator = cms.EDAnalyzer("ElectronMcFakeValidator", From b08d198e45c60d2b4f05b20a8f6dd9b68a6db625 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:51 +0200 Subject: [PATCH 15/23] porting into CMSSW_7X --- .../RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py index 5c65f56b70618..c859feacaa478 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalPt1000Validator_cfi.py @@ -21,7 +21,8 @@ Eopmaxsht = cms.double(3.0), Nbinmee = cms.int32(100), Meemin = cms.double(0.0), Meemax = cms.double(150.), Nbinhoe = cms.int32(100), Hoemin = cms.double(0.0), Hoemax = cms.double(0.5), - Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5) + Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5), + Nbinerror = cms.int32(30), Energyerrormax = cms.double(150.0) ) electronMcSignalValidator = cms.EDAnalyzer("ElectronMcSignalValidator", From f8bff9a6a2cdf75a2f0f2288c8deec9f007573e2 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:51 +0200 Subject: [PATCH 16/23] porting into CMSSW_7X --- Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py index e228066cca0fe..92e7874cda71d 100644 --- a/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py +++ b/Validation/RecoEgamma/python/ElectronMcSignalValidator_cfi.py @@ -16,7 +16,8 @@ Nbineop = cms.int32(50), Nbineop2D = cms.int32(30), Eopmax = cms.double(5.0), Eopmaxsht = cms.double(3.0), Nbinmee = cms.int32(100), Meemin = cms.double(0.0), Meemax = cms.double(150.), Nbinhoe = cms.int32(100), Hoemin = cms.double(0.0), Hoemax = cms.double(0.5), - Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5) + Nbinpoptrue = cms.int32(75), Poptruemin = cms.double(0.0), Poptruemax = cms.double(1.5), + Nbinerror = cms.int32(30), Energyerrormax = cms.double(30.0) ) electronMcSignalValidator = cms.EDAnalyzer("ElectronMcSignalValidator", From 7c385cad4b3928d2d79bcbcaa58c40924241bc34 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:52 +0200 Subject: [PATCH 17/23] porting into CMSSW_7X --- Validation/RecoEgamma/python/egammaValidation_cff.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Validation/RecoEgamma/python/egammaValidation_cff.py b/Validation/RecoEgamma/python/egammaValidation_cff.py index c19f4de736d81..49271d1fd3352 100644 --- a/Validation/RecoEgamma/python/egammaValidation_cff.py +++ b/Validation/RecoEgamma/python/egammaValidation_cff.py @@ -4,8 +4,6 @@ from Validation.RecoEgamma.photonValidationSequence_cff import * photonValidation.isRunCentrally = True -pfPhotonValidation.isRunCentrally = True -oldpfPhotonValidation.isRunCentrally = True tkConversionValidation.isRunCentrally = True egammaValidation = cms.Sequence(electronValidationSequence+photonValidationSequence) From f6364d634b1c875896fd7f49c3d15e9bd3f08062 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:53 +0200 Subject: [PATCH 18/23] porting into CMSSW_7X --- Validation/RecoEgamma/python/photonValidator_cfi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Validation/RecoEgamma/python/photonValidator_cfi.py b/Validation/RecoEgamma/python/photonValidator_cfi.py index 8fef3d250131c..07447e5ed110c 100644 --- a/Validation/RecoEgamma/python/photonValidator_cfi.py +++ b/Validation/RecoEgamma/python/photonValidator_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -import SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi -trackAssociatorByHitsForPhotonValidation = SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone() +import SimTracker.TrackAssociation.TrackAssociatorByHits_cfi +trackAssociatorByHitsForPhotonValidation = SimTracker.TrackAssociation.TrackAssociatorByHits_cfi.TrackAssociatorByHits.clone() trackAssociatorByHitsForPhotonValidation.ComponentName = cms.string('trackAssociatorByHitsForPhotonValidation') trackAssociatorByHitsForPhotonValidation.Cut_RecoToSim = 0.5 trackAssociatorByHitsForPhotonValidation.Quality_SimToReco = 0.5 From 59ad33b7412c18e9cab25458575a625c8154cf88 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 5 Jul 2013 17:07:54 +0200 Subject: [PATCH 19/23] porting into CMSSW_7X --- Validation/RecoEgamma/test/OvalFile | 153 ++++++++++++++++++++++++---- 1 file changed, 136 insertions(+), 17 deletions(-) diff --git a/Validation/RecoEgamma/test/OvalFile b/Validation/RecoEgamma/test/OvalFile index 1e02cf9769010..6e02c4d37f9cd 100644 --- a/Validation/RecoEgamma/test/OvalFile +++ b/Validation/RecoEgamma/test/OvalFile @@ -1,16 +1,16 @@ - - + + - - + + - + @@ -62,6 +62,11 @@ file:${TEST_AFS_DIR}/RelValZEE-STARTUP-RECO.root file:${TEST_AFS_DIR}/RelValQCD_Pt_80_120-STARTUP-RECO.root + +file:root://eoscms//eos/cms/store/relval/CMSSW_6_2_0_pre5/RelValZEE/GEN-SIM-RECO/PRE_ST61_V1-v1/00000/30DBBE7B-59A4-E211-9EA4-003048673098.root +file:root://eoscms//eos/cms/store/relval/CMSSW_6_2_0_pre5/RelValZEE/GEN-SIM-RECO/PRE_ST61_V1-v1/00000/3ECD1EDE-5AA4-E211-B6E0-003048F118C6.root + + Here comes the concrete executables to run. They are split among few different environments, each one defining the relevant variales for a given scenario and/or data sample. Running electronDataDiscovery.py is only usefull to check the correctness @@ -105,13 +110,15 @@ FullSim - + - + + + @@ -151,8 +158,9 @@ FullSim - + + @@ -171,6 +179,48 @@ FullSim + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,11 +234,51 @@ FullSim + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -205,7 +295,7 @@ FullSim - + @@ -228,6 +318,7 @@ FullSim + @@ -423,27 +514,28 @@ FastSim - - + + + - + - + - + @@ -472,7 +564,28 @@ FastSim - + + + + + + + + + + + + + + + + + + + + + + @@ -530,7 +643,7 @@ FastSim - + @@ -538,7 +651,13 @@ FastSim - + + + + + + + From 1b6c72b21e0db7a93ea89ac10e0c771149e69834 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Tue, 16 Jul 2013 12:08:51 +0200 Subject: [PATCH 20/23] fixing EITopPAG_cff file --- CommonTools/ParticleFlow/python/EITopPAG_cff.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CommonTools/ParticleFlow/python/EITopPAG_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_cff.py index faac5c2148239..1e1426619c42b 100644 --- a/CommonTools/ParticleFlow/python/EITopPAG_cff.py +++ b/CommonTools/ParticleFlow/python/EITopPAG_cff.py @@ -79,9 +79,9 @@ "PFCandidateFwdPtrCollectionStringFilter", src = cms.InputTag("pfElectronsFromVertexEI"), cut = cms.string(" pt > 5 & gsfElectronRef.isAvailable() & gsfTrackRef.trackerExpectedHitsInner.numberOfLostHits<2 & "\ - "gsfElectronRef.pfIsolationVariables().chargedHadronIso + "\ - "gsfElectronRef.pfIsolationVariables().neutralHadronIso + "\ - "gsfElectronRef.pfIsolationVariables().photonIso "\ + "gsfElectronRef.pfIsolationVariables().sumChargedHadronPt + "\ + "gsfElectronRef.pfIsolationVariables().sumNeutralHadronPt + "\ + "gsfElectronRef.pfIsolationVariables().sumPhotonEt "\ " < 0.2 * pt " ), makeClones = cms.bool(True) From 22bbf8815091b732c8fb94456df2b11114e8d653 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Tue, 16 Jul 2013 13:16:04 +0200 Subject: [PATCH 21/23] fixing EITopPAG_cff file --- CommonTools/ParticleFlow/python/EITopPAG_cff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonTools/ParticleFlow/python/EITopPAG_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_cff.py index 1e1426619c42b..55f909bbd2fe1 100644 --- a/CommonTools/ParticleFlow/python/EITopPAG_cff.py +++ b/CommonTools/ParticleFlow/python/EITopPAG_cff.py @@ -80,7 +80,7 @@ src = cms.InputTag("pfElectronsFromVertexEI"), cut = cms.string(" pt > 5 & gsfElectronRef.isAvailable() & gsfTrackRef.trackerExpectedHitsInner.numberOfLostHits<2 & "\ "gsfElectronRef.pfIsolationVariables().sumChargedHadronPt + "\ - "gsfElectronRef.pfIsolationVariables().sumNeutralHadronPt + "\ + "gsfElectronRef.pfIsolationVariables().sumNeutralHadronEt + "\ "gsfElectronRef.pfIsolationVariables().sumPhotonEt "\ " < 0.2 * pt " ), From 05a54b6300c65abb8c246081bb253acd94f588d6 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Thu, 18 Jul 2013 15:01:26 +0200 Subject: [PATCH 22/23] remove HLTriggerOffline/Tau/python/Validation/__init__.pyc --- .../Tau/python/Validation/__init__.pyc | Bin 141 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 HLTriggerOffline/Tau/python/Validation/__init__.pyc diff --git a/HLTriggerOffline/Tau/python/Validation/__init__.pyc b/HLTriggerOffline/Tau/python/Validation/__init__.pyc deleted file mode 100644 index e5b033ee219ea322ca517fe6f4a4428932fb6bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmZSn%*$nV^;%#u0~9aTZlX-=vg K$bw=ZW&i+M4<9}N From d3ff0beec2e9d8e0688eb7bfbda08026f7e47189 Mon Sep 17 00:00:00 2001 From: Florian Beaudette Date: Fri, 19 Jul 2013 12:39:57 +0200 Subject: [PATCH 23/23] reverting to 214ab73 Validation/RecoEgamma/plugins/PhotonValidator.cc and DataFormats/EgammaCandidates/interface/Photon.h --- .../EgammaCandidates/interface/Photon.h | 4 +- .../RecoEgamma/plugins/PhotonValidator.cc | 431 +++++++++--------- 2 files changed, 208 insertions(+), 227 deletions(-) diff --git a/DataFormats/EgammaCandidates/interface/Photon.h b/DataFormats/EgammaCandidates/interface/Photon.h index ba167b883eed7..09f1ede2296ca 100644 --- a/DataFormats/EgammaCandidates/interface/Photon.h +++ b/DataFormats/EgammaCandidates/interface/Photon.h @@ -7,7 +7,7 @@ * stores isolation, shower shape and additional info * needed for identification * - * \version $Id: Photon.h,v 1.49 2013/06/05 16:37:06 nancy Exp $ + * \version $Id: Photon.h,v 1.48 2012/03/26 16:44:27 nancy Exp $ * */ #include "DataFormats/RecoCandidate/interface/RecoCandidate.h" @@ -409,8 +409,6 @@ namespace reco { float chargedHadronIso() const {return pfIsolation_.chargedHadronIso;} float neutralHadronIso() const {return pfIsolation_.neutralHadronIso;} float photonIso() const {return pfIsolation_.photonIso;} - float modFrixione() const {return pfIsolation_.modFrixione;} - /// Set Particle Flow Isolation variables void setPflowIsolationVariables ( const PflowIsolationVariables& pfisol ) { pfIsolation_ = pfisol;} diff --git a/Validation/RecoEgamma/plugins/PhotonValidator.cc b/Validation/RecoEgamma/plugins/PhotonValidator.cc index 936c49ee4c73f..876520df293ad 100755 --- a/Validation/RecoEgamma/plugins/PhotonValidator.cc +++ b/Validation/RecoEgamma/plugins/PhotonValidator.cc @@ -81,8 +81,8 @@ ** ** ** $Id: PhotonValidator - ** $Date: 2013/06/07 11:21:10 $ - ** $Revision: 1.6 $ + ** $Date: 2013/06/14 13:42:50 $ + ** $Revision: 1.8 $ ** \author Nancy Marinelli, U. of Notre Dame, US ** ***/ @@ -459,10 +459,10 @@ void PhotonValidator::beginJob() { h_r9Bkg_[2] = dbe_->book1D(histname+"Endcap"," r9 bkg: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R9VsEtaBkg"; - h2_r9VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r9VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R9VsEtBkg"; - h2_r9VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r9VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r1Bkg"; h_r1Bkg_[0] = dbe_->book1D(histname+"All", " Bkg photon e1x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -470,14 +470,14 @@ void PhotonValidator::beginJob() { h_r1Bkg_[2] = dbe_->book1D(histname+"Endcap"," Bkg photon e1x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R1VsEtaBkg"; - h2_r1VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r1VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); histname="pR1VsEtaBkg"; - p_r1VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) p_r1VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R1VsEtBkg"; - h2_r1VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r1VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); histname="pR1VsEtBkg"; - p_r1VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) p_r1VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r2Bkg"; h_r2Bkg_[0] = dbe_->book1D(histname+"All", " Bkg photon e2x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -485,14 +485,14 @@ void PhotonValidator::beginJob() { h_r2Bkg_[2] = dbe_->book1D(histname+"Endcap"," Bkg photon e2x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R2VsEtaBkg"; - h2_r2VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r2VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); histname="pR2VsEtaBkg"; - p_r2VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) p_r2VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R2VsEtBkg"; - h2_r2VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r2VsEtBkg_ = dbe_->book2D(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); histname="pR2VsEtBkg"; - p_r2VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) p_r2VsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); histname = "sigmaIetaIetaBkg"; @@ -501,19 +501,19 @@ void PhotonValidator::beginJob() { h_sigmaIetaIetaBkg_[2] = dbe_->book1D(histname+"Endcap","Bkg sigmaIetaIeta: Endcap ", 100,0., 0.1) ; // histname="sigmaIetaIetaVsEtaBkg"; - h2_sigmaIetaIetaVsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); histname="pSigmaIetaIetaVsEtaBkg"; - p_sigmaIetaIetaVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); // histname="sigmaIetaIetaVsEtBkg"; - h2_sigmaIetaIetaVsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - h2_sigmaIetaIetaVsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - h2_sigmaIetaIetaVsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); // histname="pSigmaIetaIetaVsEtBkg"; - p_sigmaIetaIetaVsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - p_sigmaIetaIetaVsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - p_sigmaIetaIetaVsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) p_sigmaIetaIetaVsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); // histname = "hOverEBkg"; h_hOverEBkg_[0] = dbe_->book1D(histname+"All", "H/E bkg: All Ecal",100,0., 1.) ; @@ -521,9 +521,9 @@ void PhotonValidator::beginJob() { h_hOverEBkg_[2] = dbe_->book1D(histname+"Endcap","H/E bkg: Endcap ", 100,0., 1.) ; // histname="pHOverEVsEtaBkg"; - p_hOverEVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg H/E vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) p_hOverEVsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg H/E vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); histname="pHOverEVsEtBkg"; - p_hOverEVsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons H/E vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) p_hOverEVsEtBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons H/E vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); if ( ! isRunCentrally_ ) { histname="hOverEVsEtaBkg"; h2_hOverEVsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg H/E vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); @@ -553,12 +553,12 @@ void PhotonValidator::beginJob() { } histname="pEcalRecHitSumEtConeDR04VsEtaBkg"; - p_ecalRecHitSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons ecalRecHitSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons ecalRecHitSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); // histname="pEcalRecHitSumEtConeDR04VsEtBkg"; - p_ecalRecHitSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - p_ecalRecHitSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - p_ecalRecHitSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // histname = "hcalTowerSumEtConeDR04Bkg"; h_hcalTowerSumEtConeDR04Bkg_[0] = dbe_->book1D(histname+"All", "bkg hcalTowerSumEtDR04: All Ecal",etBin,etMin,20.); @@ -566,12 +566,12 @@ void PhotonValidator::beginJob() { h_hcalTowerSumEtConeDR04Bkg_[2] = dbe_->book1D(histname+"Endcap","bkg hcalTowerSumEtDR04: Endcap ", etBin,etMin,20.); // histname="pHcalTowerSumEtConeDR04VsEtaBkg"; - p_hcalTowerSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons hcalTowerSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All","bkg photons hcalTowerSumEtDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*etScale, ""); // histname="pHcalTowerSumEtConeDR04VsEtBkg"; - p_hcalTowerSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - p_hcalTowerSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); - p_hcalTowerSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // histname = "isoTrkSolidConeDR04Bkg"; h_isoTrkSolidConeDR04Bkg_[0] = dbe_->book1D(histname+"All", "isoTrkSolidConeDR04 Bkg: All Ecal",etBin,etMin,etMax*0.1); @@ -579,18 +579,18 @@ void PhotonValidator::beginJob() { h_isoTrkSolidConeDR04Bkg_[2] = dbe_->book1D(histname+"Endcap","isoTrkSolidConeDR04 Bkg: Endcap ", etBin,etMin,etMax*0.1); // histname="isoTrkSolidConeDR04VsEtaBkg"; - h2_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); histname="pIsoTrkSolidConeDR04VsEtaBkg"; - p_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); // histname="isoTrkSolidConeDR04VsEtBkg"; - h2_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - h2_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - h2_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); histname="pIsoTrkSolidConeDR04VsEtBkg"; - p_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - p_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - p_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) p_isoTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap"," Bkg photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); // histname = "nTrkSolidConeDR04Bkg"; h_nTrkSolidConeDR04Bkg_[0] = dbe_->book1D(histname+"All", "Bkg nTrkSolidConeDR04: All Ecal",20,0., 20) ; @@ -598,19 +598,19 @@ void PhotonValidator::beginJob() { h_nTrkSolidConeDR04Bkg_[2] = dbe_->book1D(histname+"Endcap","Bkg nTrkSolidConeDR04: Endcap ", 20,0., 20) ; // histname="nTrkSolidConeDR04VsEtaBkg"; - h2_nTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtaBkg_ = dbe_->book2D(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; histname="p_nTrkSolidConeDR04VsEtaBkg"; - p_nTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtaBkg_ = dbe_->bookProfile(histname+"All"," Bkg photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; // histname="nTrkSolidConeDR04VsEtBkg"; - h2_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - h2_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - h2_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->book2D(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->book2D(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->book2D(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; // histname="pnTrkSolidConeDR04VsEtBkg"; - p_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - p_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - p_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtBkg_[0] = dbe_->bookProfile(histname+"All","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtBkg_[1] = dbe_->bookProfile(histname+"Barrel","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) p_nTrkSolidConeDR04VsEtBkg_[2] = dbe_->bookProfile(histname+"Endcap","Bkg photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; // h_convEtaBkg_ = dbe_->book1D("convEtaBkg"," converted Photon Bkg Eta 2 tracks",etaBin,etaMin, etaMax) ; h_convPhiBkg_ = dbe_->book1D("convPhiBkg"," converted Photon Bkg Phi ",phiBin,phiMin,phiMax) ; @@ -706,12 +706,12 @@ void PhotonValidator::beginJob() { ///// // histname="R9VsEta"; - h2_r9VsEta_[0] = dbe_->book2D(histname+"All"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); - h2_r9VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r9VsEta_[0] = dbe_->book2D(histname+"All"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r9VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R9VsEt"; - h2_r9VsEt_[0] = dbe_->book2D(histname+"All"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); - h2_r9VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r9VsEt_[0] = dbe_->book2D(histname+"All"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r9VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons r9 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r1"; h_r1_[0][0] = dbe_->book1D(histname+"All", " e1x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -719,12 +719,12 @@ void PhotonValidator::beginJob() { h_r1_[0][2] = dbe_->book1D(histname+"Endcap"," e1x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R1VsEta"; - h2_r1VsEta_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); - h2_r1VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r1VsEta_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r1VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R1VsEt"; - h2_r1VsEt_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); - h2_r1VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r1VsEt_[0] = dbe_->book2D(histname+"All"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r1VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e1x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "r2"; h_r2_[0][0] = dbe_->book1D(histname+"All", " e2x5/e5x5: All Ecal",r9Bin,r9Min, r9Max) ; @@ -732,12 +732,12 @@ void PhotonValidator::beginJob() { h_r2_[0][2] = dbe_->book1D(histname+"Endcap"," e2x5/e5x5: Endcap ",r9Bin,r9Min, r9Max) ; // histname="R2VsEta"; - h2_r2VsEta_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); - h2_r2VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r2VsEta_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r2VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,1.1); // histname="R2VsEt"; - h2_r2VsEt_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); - h2_r2VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r2VsEt_[0] = dbe_->book2D(histname+"All"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); + if ( ! isRunCentrally_ ) h2_r2VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons e2x5/e5x5 vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,1.1); // histname = "sigmaIetaIeta"; h_sigmaIetaIeta_[0][0] = dbe_->book1D(histname+"All", "sigmaIetaIeta: All Ecal",100,0., 0.1) ; @@ -745,12 +745,12 @@ void PhotonValidator::beginJob() { h_sigmaIetaIeta_[0][2] = dbe_->book1D(histname+"Endcap","sigmaIetaIeta: Endcap ", 100,0., 0.1) ; // histname="sigmaIetaIetaVsEta"; - h2_sigmaIetaIetaVsEta_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); - h2_sigmaIetaIetaVsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEta_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs #eta: all Ecal ", etaBin2,etaMin, etaMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0.,0.1); // histname="sigmaIetaIetaVsEt"; - h2_sigmaIetaIetaVsEt_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); - h2_sigmaIetaIetaVsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEt_[0] = dbe_->book2D(histname+"All"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); + if ( ! isRunCentrally_ ) h2_sigmaIetaIetaVsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons sigmaIetaIeta vs Et: all Ecal ",etBin,etMin, etMax,100, 0.,0.1); // histname = "hOverE"; h_hOverE_[0][0] = dbe_->book1D(histname+"All", "H/E: All Ecal",100,0., 0.1) ; @@ -811,7 +811,7 @@ void PhotonValidator::beginJob() { h2_ecalRecHitSumEtConeDR04VsEt_[2] = dbe_->book2D(histname+"Endcap"," All photons ecalRecHitSumEtDR04 vs Et: Endcap ",etBin,etMin, etMax, etBin,etMin,etMax*etScale); } histname="pEcalRecHitSumEtConeDR04VsEt"; - p_ecalRecHitSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_ecalRecHitSumEtConeDR04VsEt_[1] = dbe_->bookProfile(histname+"Barrel","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_ecalRecHitSumEtConeDR04VsEt_[2] = dbe_->bookProfile(histname+"Endcap","All photons ecalRecHitSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // @@ -821,7 +821,7 @@ void PhotonValidator::beginJob() { h_hcalTowerSumEtConeDR04_[0][2] = dbe_->book1D(histname+"Endcap","hcalTowerSumEtConeDR04: Endcap ", etBin,etMin,20.); // histname = "hcalTowerBcSumEtConeDR04"; - h_hcalTowerBcSumEtConeDR04_[0][0] = dbe_->book1D(histname+"All", "hcalTowerBcSumEtConeDR04: All Ecal",etBin,etMin,20.); + if ( ! isRunCentrally_ ) h_hcalTowerBcSumEtConeDR04_[0][0] = dbe_->book1D(histname+"All", "hcalTowerBcSumEtConeDR04: All Ecal",etBin,etMin,20.); h_hcalTowerBcSumEtConeDR04_[0][1] = dbe_->book1D(histname+"Barrel","hcalTowerBcSumEtConeDR04: Barrel ", etBin,etMin,20.); h_hcalTowerBcSumEtConeDR04_[0][2] = dbe_->book1D(histname+"Endcap","hcalTowerBcSumEtConeDR04: Endcap ", etBin,etMin,20.); @@ -845,12 +845,12 @@ void PhotonValidator::beginJob() { h2_hcalTowerSumEtConeDR04VsEt_[2] = dbe_->book2D(histname+"Endcap"," All photons hcalTowerSumEtConeDR04 vs Et: Endcap ",etBin,etMin, etMax,etBin,etMin,etMax*0.1); } histname="pHcalTowerSumEtConeDR04VsEt"; - p_hcalTowerSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerSumEtConeDR04VsEt_[1] = dbe_->bookProfile(histname+"Barrel","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerSumEtConeDR04VsEt_[2] = dbe_->bookProfile(histname+"Endcap","All photons hcalTowerSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); // histname="pHcalTowerBcSumEtConeDR04VsEt"; - p_hcalTowerBcSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); + if ( ! isRunCentrally_ ) p_hcalTowerBcSumEtConeDR04VsEt_[0] = dbe_->bookProfile(histname+"All","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerBcSumEtConeDR04VsEt_[1] = dbe_->bookProfile(histname+"Barrel","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); p_hcalTowerBcSumEtConeDR04VsEt_[2] = dbe_->bookProfile(histname+"Endcap","All photons hcalTowerBcSumEtDR04 vs Et: all Ecal ", etBin,etMin, etMax, etBin,etMin,etMax*etScale, ""); @@ -862,13 +862,13 @@ void PhotonValidator::beginJob() { // histname="isoTrkSolidConeDR04VsEta"; - h2_isoTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); - h2_isoTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,etBin,etMin,etMax*0.1); // histname="isoTrkSolidConeDR04VsEt"; - h2_isoTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); - h2_isoTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); + if ( ! isRunCentrally_ ) h2_isoTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons isoTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, etBin,etMin,etMax*0.1); // histname = "nTrkSolidConeDR04"; h_nTrkSolidConeDR04_[0][0] = dbe_->book1D(histname+"All", "nTrkSolidConeDR04: All Ecal",20,0., 20) ; @@ -876,12 +876,12 @@ void PhotonValidator::beginJob() { h_nTrkSolidConeDR04_[0][2] = dbe_->book1D(histname+"Endcap","nTrkSolidConeDR04: Endcap ", 20,0., 20) ; // histname="nTrkSolidConeDR04VsEta"; - h2_nTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; - h2_nTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEta_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ", etaBin2,etaMin, etaMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEta_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs #eta: all Ecal ",etaBin2,etaMin, etaMax,20,0., 20) ; // histname="nTrkSolidConeDR04VsEt"; - h2_nTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; - h2_nTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax,20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEt_[0] = dbe_->book2D(histname+"All"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax, 20,0., 20) ; + if ( ! isRunCentrally_ ) h2_nTrkSolidConeDR04VsEt_[1] = dbe_->book2D(histname+"Unconv"," All photons nTrkSolidConeDR04 vs Et: all Ecal ",etBin,etMin, etMax,20,0., 20) ; // histname = "phoE"; h_phoE_[0][0]=dbe_->book1D(histname+"All"," Photon Energy: All ecal ", eBin,eMin, eMax); @@ -908,8 +908,8 @@ void PhotonValidator::beginJob() { histname="eResVsEta"; - h2_eResVsEta_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); - h2_eResVsEta_[1] = dbe_->book2D(histname+"Unconv"," Unconv photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); + if ( ! isRunCentrally_ ) h2_eResVsEta_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); + if ( ! isRunCentrally_ ) h2_eResVsEta_[1] = dbe_->book2D(histname+"Unconv"," Unconv photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin, etaMax,100, 0., 2.5); histname="pEResVsEta"; p_eResVsEta_[0] = dbe_->bookProfile(histname+"All","All photons E/Etrue vs #eta: all Ecal ",etaBin2,etaMin,etaMax,resBin,resMin, resMax,""); @@ -942,19 +942,19 @@ void PhotonValidator::beginJob() { histname="eResVsR9"; - h2_eResVsR9_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); - h2_eResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons E/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); - h2_eResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons E/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); + if ( ! isRunCentrally_ ) h2_eResVsR9_[0] = dbe_->book2D(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); + if ( ! isRunCentrally_ ) h2_eResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons E/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); + if ( ! isRunCentrally_ ) h2_eResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons E/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); histname="pEResVsR9"; - p_eResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); + if ( ! isRunCentrally_ ) p_eResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons E/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_eResVsR9_[1] = dbe_->bookProfile(histname+"Barrel"," All photons E/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_eResVsR9_[2] = dbe_->bookProfile(histname+"Endcap"," All photons E/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); histname="sceResVsR9"; - h2_sceResVsR9_[0] = dbe_->book2D(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); - h2_sceResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons scE/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); - h2_sceResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons scE/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); + if ( ! isRunCentrally_ ) h2_sceResVsR9_[0] = dbe_->book2D(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,100, 0., 2.5); + if ( ! isRunCentrally_ ) h2_sceResVsR9_[1] = dbe_->book2D(histname+"Barrel"," All photons scE/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,100, 0.,2.5); + if ( ! isRunCentrally_ ) h2_sceResVsR9_[2] = dbe_->book2D(histname+"Endcap"," All photons scE/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,100, 0., 2.5); histname="scpEResVsR9"; - p_sceResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); + if ( ! isRunCentrally_ ) p_sceResVsR9_[0] = dbe_->bookProfile(histname+"All"," All photons scE/Etrue vs R9: all Ecal ",r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_sceResVsR9_[1] = dbe_->bookProfile(histname+"Barrel"," All photons scE/Etrue vs R9: Barrel ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); p_sceResVsR9_[2] = dbe_->bookProfile(histname+"Endcap"," All photons scE/Etrue vs R9: Endcap ", r9Bin*2,r9Min, r9Max,resBin,resMin, resMax,""); @@ -1207,10 +1207,10 @@ void PhotonValidator::beginJob() { h2_DCotTracksVsR_ = dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta cotg(#Theta) Tracks at vertex vs R",rBin,rMin, rMax,100, -0.2, 0.2); histname="h2_DPhiTracksAtEcalVsR"; - h2_DPhiTracksAtEcalVsR_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R : all Ecal ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax); + if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) h2_DPhiTracksAtEcalVsR_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R : all Ecal ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax); histname="h2_DPhiTracksAtEcalVsEta"; - h2_DPhiTracksAtEcalVsEta_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta : all Ecal ",etaBin2,etaMin, etaMax, dPhiTracksBin,0.,dPhiTracksMax); + if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) h2_DPhiTracksAtEcalVsEta_= dbe_->book2D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta : all Ecal ",etaBin2,etaMin, etaMax, dPhiTracksBin,0.,dPhiTracksMax); } @@ -1240,22 +1240,25 @@ void PhotonValidator::beginJob() { h_distMinAppTracks_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions Min Approach Dist Tracks: Barrel Ecal ",dEtaTracksBin,-0.1,0.6); h_distMinAppTracks_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions Min Approach Dist Tracks: Endcap Ecal ",dEtaTracksBin,-0.1,0.6); - histname="hDPhiTracksAtEcal"; - h_DPhiTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal : all Ecal ",dPhiTracksBin,0.,dPhiTracksMax); - h_DPhiTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#phi at Ecal : Barrel Ecal ",dPhiTracksBin,0.,dPhiTracksMax); - h_DPhiTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#phi at Ecal : Endcap Ecal ",dPhiTracksBin,0.,dPhiTracksMax); + if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) { + histname="hDPhiTracksAtEcal"; + h_DPhiTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal : all Ecal ",dPhiTracksBin,0.,dPhiTracksMax); + h_DPhiTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#phi at Ecal : Barrel Ecal ",dPhiTracksBin,0.,dPhiTracksMax); + h_DPhiTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#phi at Ecal : Endcap Ecal ",dPhiTracksBin,0.,dPhiTracksMax); + + histname="pDPhiTracksAtEcalVsR"; + p_DPhiTracksAtEcalVsR_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax,""); - histname="pDPhiTracksAtEcalVsR"; - p_DPhiTracksAtEcalVsR_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs R ",rBin,rMin, rMax, dPhiTracksBin,0.,dPhiTracksMax,""); + histname="pDPhiTracksAtEcalVsEta"; + p_DPhiTracksAtEcalVsEta_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta ",etaBin2,etaMin, etaMax,dPhiTracksBin,0.,dPhiTracksMax,""); - histname="pDPhiTracksAtEcalVsEta"; - p_DPhiTracksAtEcalVsEta_ = dbe_->bookProfile(histname+"All"," Photons:Tracks from conversions: #delta#phi at Ecal vs #eta ",etaBin2,etaMin, etaMax,dPhiTracksBin,0.,dPhiTracksMax,""); - - histname="hDEtaTracksAtEcal"; - h_DEtaTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#eta at Ecal : all Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); - h_DEtaTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#eta at Ecal : Barrel Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); - h_DEtaTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#eta at Ecal : Endcap Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); + histname="hDEtaTracksAtEcal"; + h_DEtaTracksAtEcal_[1][0]= dbe_->book1D(histname+"All"," Photons:Tracks from conversions: #delta#eta at Ecal : all Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); + h_DEtaTracksAtEcal_[1][1]= dbe_->book1D(histname+"Barrel"," Photons:Tracks from conversions: #delta#eta at Ecal : Barrel Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); + h_DEtaTracksAtEcal_[1][2]= dbe_->book1D(histname+"Endcap"," Photons:Tracks from conversions: #delta#eta at Ecal : Endcap Ecal ",dEtaTracksBin,dEtaTracksMin,dEtaTracksMax); + + } h_convVtxRvsZ_[0] = dbe_->book2D("convVtxRvsZAll"," Photon Reco conversion vtx position",zBinForXray, zMinForXray, zMaxForXray, rBinForXray, rMinForXray, rMaxForXray); @@ -1411,12 +1414,12 @@ void PhotonValidator::beginJob() { h2_PtRecVsPtSimMixProv_ =dbe_->book2D(histname+"All", "Pt Rec vs Pt sim All for mix with general tracks ", etBin,etMin,etMax,etBin,etMin, etMax); } - - histname="eBcOverTkPout"; - hBCEnergyOverTrackPout_[0] = dbe_->book1D(histname+"All","Matrching BC E/P_out: all Ecal ",100, 0., 5.); - hBCEnergyOverTrackPout_[1] = dbe_->book1D(histname+"Barrel","Matrching BC E/P_out: Barrel ",100, 0., 5.); - hBCEnergyOverTrackPout_[2] = dbe_->book1D(histname+"Endcap","Matrching BC E/P_out: Endcap ",100, 0., 5.); - + if ( fName_ != "pfPhotonValidator" && fName_ != "oldpfPhotonValidator" ) { + histname="eBcOverTkPout"; + hBCEnergyOverTrackPout_[0] = dbe_->book1D(histname+"All","Matrching BC E/P_out: all Ecal ",100, 0., 5.); + hBCEnergyOverTrackPout_[1] = dbe_->book1D(histname+"Barrel","Matrching BC E/P_out: Barrel ",100, 0., 5.); + hBCEnergyOverTrackPout_[2] = dbe_->book1D(histname+"Endcap","Matrching BC E/P_out: Endcap ",100, 0., 5.); + } ////////////// test on OutIn tracks h_OIinnermostHitR_ = dbe_->book1D("OIinnermostHitR"," R innermost hit for OI tracks ",50, 0., 25); @@ -2182,23 +2185,23 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( phoIsInEndcap ) h_psE_->Fill( matchingPho.superCluster()->preshowerEnergy() ) ; // h_r9_[type][0]->Fill( r9 ); - h2_r9VsEta_[0] -> Fill (mcEta_, r9); - h2_r9VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r9); // h_r1_[type][0]->Fill( r1 ); - h2_r1VsEta_[0] -> Fill (mcEta_, r1); - h2_r1VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r1); // h_r2_[type][0]->Fill( r2 ); - h2_r2VsEta_[0] -> Fill (mcEta_, r2); - h2_r2VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r2); // h_sigmaIetaIeta_[type][0]->Fill( sigmaIetaIeta ); - h2_sigmaIetaIetaVsEta_[0] -> Fill (mcEta_, sigmaIetaIeta ); - h2_sigmaIetaIetaVsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); // h_hOverE_[type][0]->Fill( hOverE ); if ( ! isRunCentrally_ ) { + h2_r9VsEta_[0] -> Fill (mcEta_, r9); + h2_r9VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r9); + h2_r1VsEta_[0] -> Fill (mcEta_, r1); + h2_r1VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r1); + h2_r2VsEta_[0] -> Fill (mcEta_, r2); + h2_r2VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), r2); + h2_sigmaIetaIetaVsEta_[0] -> Fill (mcEta_, sigmaIetaIeta ); + h2_sigmaIetaIetaVsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); h2_hOverEVsEta_[0] -> Fill (mcEta_, hOverE ); h2_hOverEVsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), hOverE); } @@ -2220,24 +2223,26 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup } p_ecalRecHitSumEtConeDR04VsEta_[0] -> Fill (mcEta_, ecalIso ); - p_ecalRecHitSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); + if ( ! isRunCentrally_ ) p_ecalRecHitSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); // h_hcalTowerSumEtConeDR04_[type][0]->Fill( hcalIso ); p_hcalTowerSumEtConeDR04VsEta_[0] -> Fill (mcEta_, hcalIso ); - p_hcalTowerSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); // - h_hcalTowerBcSumEtConeDR04_[type][0]->Fill( newhcalIso ); + if ( ! isRunCentrally_ ) h_hcalTowerBcSumEtConeDR04_[type][0]->Fill( newhcalIso ); p_hcalTowerBcSumEtConeDR04VsEta_[0] -> Fill (mcEta_, newhcalIso ); - p_hcalTowerBcSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), newhcalIso); + if ( ! isRunCentrally_ ) p_hcalTowerBcSumEtConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), newhcalIso); // h_isoTrkSolidConeDR04_[type][0]->Fill( trkIso ); - h2_isoTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, trkIso ); - h2_isoTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), trkIso); - // h_nTrkSolidConeDR04_[type][0]->Fill( nIsoTrk ); - h2_nTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, nIsoTrk ); - h2_nTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); - // + + if ( ! isRunCentrally_ ) { + h2_isoTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, trkIso ); + h2_isoTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), trkIso); + h2_nTrkSolidConeDR04VsEta_[0] -> Fill (mcEta_, nIsoTrk ); + h2_nTrkSolidConeDR04VsEt_[0] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); + } + h_chHadIso_[0]-> Fill (chargedHadIso); h_nHadIso_[0]-> Fill (neutralHadIso); h_phoIso_[0]-> Fill (photonIso); @@ -2255,37 +2260,33 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_phoERes_[0][0]->Fill( photonE / (*mcPho).fourMomentum().e() ); h_phoEResRegr1_[0][0]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][0]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); - h2_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; - p_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; - //std::cout << " Debug 1.5 " << std::endl; - if ( ! isRunCentrally_ ) h2_eResVsEt_[0][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; + p_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; p_eResVsEt_[0][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; - h2_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - h2_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; - p_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - p_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; + if ( ! isRunCentrally_ ) h2_eResVsEta_[0]->Fill (mcEta_, photonE/(*mcPho).fourMomentum().e() ) ; + if ( ! isRunCentrally_ ) h2_eResVsEt_[0][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; + if ( ! isRunCentrally_ ) h2_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + if ( ! isRunCentrally_ ) h2_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; + if ( ! isRunCentrally_ ) p_eResVsR9_[0]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + if ( ! isRunCentrally_ ) p_sceResVsR9_[0]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; // //std::cout << " Debug 1.6 " << std::endl; if ( (*mcPho).isAConversion() == 0 ) { - h2_eResVsEta_[1]->Fill (mcEta_, photonE/ (*mcPho).fourMomentum().e() ) ; - - - - h2_r9VsEta_[1] -> Fill (mcEta_, r9); - h2_r9VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r9); - // - h2_r1VsEta_[1] -> Fill (mcEta_, r1); - h2_r1VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r1); - // - h2_r2VsEta_[1] -> Fill (mcEta_, r2); - h2_r2VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r2); - // - h2_sigmaIetaIetaVsEta_[1] -> Fill (mcEta_, sigmaIetaIeta ); - h2_sigmaIetaIetaVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); - // if ( ! isRunCentrally_ ) { + h2_eResVsEta_[1]->Fill (mcEta_, photonE/ (*mcPho).fourMomentum().e() ) ; + h2_r9VsEta_[1] -> Fill (mcEta_, r9); + h2_r9VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r9); + // + h2_r1VsEta_[1] -> Fill (mcEta_, r1); + h2_r1VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r1); + // + h2_r2VsEta_[1] -> Fill (mcEta_, r2); + h2_r2VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), r2); + // + h2_sigmaIetaIetaVsEta_[1] -> Fill (mcEta_, sigmaIetaIeta ); + h2_sigmaIetaIetaVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), sigmaIetaIeta); + // h2_hOverEVsEta_[1] -> Fill (mcEta_, hOverE ); h2_hOverEVsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), hOverE); } @@ -2296,15 +2297,15 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup if ( ! isRunCentrally_ ) { h2_ecalRecHitSumEtConeDR04VsEta_[1] -> Fill (mcEta_, ecalIso ); h2_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); + h2_isoTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, trkIso ); + h2_isoTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), trkIso); + h2_nTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, nIsoTrk ); + h2_nTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); + } p_ecalRecHitSumEtConeDR04VsEta_[1] -> Fill (mcEta_, ecalIso ); - p_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); + if ( ! isRunCentrally_ ) p_hcalTowerSumEtConeDR04VsEta_[1] -> Fill (mcEta_, hcalIso ); // - h2_isoTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, trkIso ); - h2_isoTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), trkIso); - // - h2_nTrkSolidConeDR04VsEta_[1] -> Fill (mcEta_, nIsoTrk ); - h2_nTrkSolidConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), nIsoTrk); //std::cout << " Debug 1.8 " << std::endl; } @@ -2369,11 +2370,11 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_phoERes_[0][1]->Fill( photonE / (*mcPho).fourMomentum().e() ); h_phoEResRegr1_[0][1]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][1]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); - h2_eResVsR9_[1]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - h2_sceResVsR9_[1]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; p_eResVsR9_[1]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; p_sceResVsR9_[1]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) { + h2_eResVsR9_[1]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + h2_sceResVsR9_[1]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; h2_ecalRecHitSumEtConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); h2_hcalTowerSumEtConeDR04VsEt_[1] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); h2_eResVsEt_[1][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; @@ -2435,12 +2436,12 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup //std::cout << " Looking for troubles 6 " << std::endl; h_phoEResRegr1_[0][2]->Fill( photonERegr1 / (*mcPho).fourMomentum().e() ); h_phoEResRegr2_[0][2]->Fill( photonERegr2 / (*mcPho).fourMomentum().e() ); - h2_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; - h2_sceResVsR9_[2]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; //std::cout << " Looking for troubles 7 " << std::endl; - p_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + p_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; p_sceResVsR9_[2]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; if ( ! isRunCentrally_ ) { + h2_eResVsR9_[2]->Fill (r9, photonE/(*mcPho).fourMomentum().e() ) ; + h2_sceResVsR9_[2]->Fill (r9, matchingPho.superCluster()->energy()/(*mcPho).fourMomentum().e() ) ; h2_ecalRecHitSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), ecalIso); h2_hcalTowerSumEtConeDR04VsEt_[2] -> Fill ((*mcPho).fourMomentum().et(), hcalIso); h2_eResVsEt_[2][0]->Fill ((*mcPho).fourMomentum().et(), photonE/(*mcPho).fourMomentum().e() ) ; @@ -3390,34 +3391,29 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_isoTrkSolidConeDR04Bkg_[0]->Fill( trkIso ); h_nTrkSolidConeDR04Bkg_[0]->Fill( nIsoTrk ); + if ( ! isRunCentrally_ ) { - h2_r9VsEtaBkg_ -> Fill (mcJetEta_, r9); - h2_r9VsEtBkg_ -> Fill (mcJetPt, r9); - - h2_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); - h2_r1VsEtBkg_ -> Fill (mcJetPt, r1); - p_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); - p_r1VsEtBkg_ -> Fill (mcJetPt, r1); - - h2_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); - h2_r2VsEtBkg_ -> Fill (mcJetPt, r2); - p_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); - p_r2VsEtBkg_ -> Fill (mcJetPt, r2); - - - h2_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); - p_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); - h2_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); - p_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); - - //std::cout << " Debug 18 " << std::endl; - - if ( ! isRunCentrally_ ) { + h2_r9VsEtaBkg_ -> Fill (mcJetEta_, r9); + h2_r9VsEtBkg_ -> Fill (mcJetPt, r9); + h2_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); + h2_r1VsEtBkg_ -> Fill (mcJetPt, r1); + h2_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); + h2_r2VsEtBkg_ -> Fill (mcJetPt, r2); + h2_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); + h2_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); h2_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); h2_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); + + p_r1VsEtaBkg_ -> Fill (mcJetEta_, r1); + p_r1VsEtBkg_ -> Fill (mcJetPt, r1); + p_r2VsEtaBkg_ -> Fill (mcJetEta_, r2); + p_r2VsEtBkg_ -> Fill (mcJetPt, r2); + p_sigmaIetaIetaVsEtaBkg_ -> Fill (mcJetEta_, sigmaIetaIeta ); + p_sigmaIetaIetaVsEtBkg_[0] -> Fill (mcJetPt, sigmaIetaIeta); + p_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); + p_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); + } - p_hOverEVsEtaBkg_ -> Fill (mcJetEta_, hOverE ); - p_hOverEVsEtBkg_ -> Fill (mcJetPt, hOverE); if ( ! isRunCentrally_ ) { @@ -3425,29 +3421,20 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h2_ecalRecHitSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, ecalIso); h2_hcalTowerSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, hcalIso ); h2_hcalTowerSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, hcalIso); - } - - p_ecalRecHitSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, ecalIso ); - p_ecalRecHitSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, ecalIso); + p_ecalRecHitSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, ecalIso ); + p_ecalRecHitSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, ecalIso); + p_hcalTowerSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, hcalIso ); + p_hcalTowerSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, hcalIso); + p_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); + p_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); + p_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); + p_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); + h2_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); + h2_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); + h2_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); + h2_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); - - - p_hcalTowerSumEtConeDR04VsEtaBkg_ -> Fill (mcJetEta_, hcalIso ); - - p_hcalTowerSumEtConeDR04VsEtBkg_[0] -> Fill ( mcJetPt, hcalIso); - - h2_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); - p_isoTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, trkIso ); - h2_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); - p_isoTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, trkIso); - - - h2_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); - p_nTrkSolidConeDR04VsEtaBkg_ -> Fill (mcJetEta_, nIsoTrk ); - h2_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); - p_nTrkSolidConeDR04VsEtBkg_[0] -> Fill (mcJetPt, nIsoTrk); - - //std::cout << " Debug 19 " << std::endl; + } if ( phoIsInBarrel ) { @@ -3464,19 +3451,17 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_isoTrkSolidConeDR04Bkg_[1]->Fill( trkIso ); h_nTrkSolidConeDR04Bkg_[1]->Fill( nIsoTrk ); - h2_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); - p_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); - p_ecalRecHitSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, ecalIso); - p_hcalTowerSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, hcalIso); - - h2_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); - p_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); - - h2_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); - p_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); if ( ! isRunCentrally_ ) { + h2_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); + h2_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); + h2_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); h2_ecalRecHitSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, ecalIso); h2_hcalTowerSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, hcalIso); + p_sigmaIetaIetaVsEtBkg_[1] -> Fill (mcJetPt, sigmaIetaIeta); + p_ecalRecHitSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, ecalIso); + p_hcalTowerSumEtConeDR04VsEtBkg_[1] -> Fill ( mcJetPt, hcalIso); + p_isoTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, trkIso); + p_nTrkSolidConeDR04VsEtBkg_[1] -> Fill (mcJetPt, nIsoTrk); } //std::cout << " Debug 20 " << std::endl; @@ -3493,19 +3478,17 @@ void PhotonValidator::analyze( const edm::Event& e, const edm::EventSetup& esup h_isoTrkSolidConeDR04Bkg_[2]->Fill( trkIso ); h_nTrkSolidConeDR04Bkg_[2]->Fill( nIsoTrk ); - h2_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); - p_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); - p_ecalRecHitSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, ecalIso); - p_hcalTowerSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, hcalIso); - - h2_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); - p_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); - - h2_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); - p_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); if ( ! isRunCentrally_ ) { + h2_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); + h2_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); + h2_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); h2_ecalRecHitSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, ecalIso); h2_hcalTowerSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, hcalIso); + p_sigmaIetaIetaVsEtBkg_[2] -> Fill (mcJetPt, sigmaIetaIeta); + p_ecalRecHitSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, ecalIso); + p_hcalTowerSumEtConeDR04VsEtBkg_[2] -> Fill ( mcJetPt, hcalIso); + p_isoTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, trkIso); + p_nTrkSolidConeDR04VsEtBkg_[2] -> Fill (mcJetPt, nIsoTrk); } //std::cout << " Debug 21 " << std::endl;