ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitHzz4l/LeptonSelection/src/IsolationSelection.cc
(Generate patch)

Comparing UserCode/MitHzz4l/LeptonSelection/src/IsolationSelection.cc (file contents):
Revision 1.31 by khahn, Tue Jun 12 01:23:03 2012 UTC vs.
Revision 1.34 by dkralph, Tue Oct 23 10:41:23 2012 UTC

# Line 9 | Line 9
9   #include "ElectronTools.h"
10   #include "ElectronIDMVA.h"
11  
12 < using namespace mithep;
13 <
14 < mithep::MuonIDMVA     * muIsoMVA;
15 < mithep::MuonTools       muT;
16 < mithep::ElectronIDMVA * eleIsoMVA;
17 < mithep::ElectronTools   eleT;
12 > MuonIDMVA     * muIsoMVA;
13 > MuonTools       muT;
14 > ElectronIDMVA * eleIsoMVA;
15 > ElectronTools   eleT;
16  
17   // global hack to sync
18   double gChargedIso;
# Line 24 | Line 22 | double gNeutralIso;
22   extern vector<bool> PFnoPUflag;
23  
24   //--------------------------------------------------------------------------------------------------
25 < Float_t computePFMuonIso(const mithep::Muon *muon,
26 <                         const mithep::Vertex * vtx,
27 <                         const mithep::Array<mithep::PFCandidate> * fPFCandidates,
25 > Float_t computePFMuonIso(const Muon *muon,
26 >                         const Vertex * vtx,
27 >                         const Array<PFCandidate> * fPFCandidates,
28                           const Double_t dRMax)
29   //--------------------------------------------------------------------------------------------------
30   {
# Line 59 | Line 57 | Float_t computePFMuonIso(const mithep::M
57   }
58  
59   //--------------------------------------------------------------------------------------------------
60 < Float_t computePFEleIso(const mithep::Electron *electron,
61 <                        const mithep::Vertex * fVertex,
62 <                        const mithep::Array<mithep::PFCandidate> * fPFCandidates,
60 > Float_t computePFEleIso(const Electron *electron,
61 >                        const Vertex * fVertex,
62 >                        const Array<PFCandidate> * fPFCandidates,
63                          const Double_t dRMax)
64   //--------------------------------------------------------------------------------------------------
65   {
# Line 101 | Line 99 | Float_t computePFEleIso(const mithep::El
99    
100    return iso;
101   };
104
105 //--------------------------------------------------------------------------------------------------
106 bool pairwiseIsoSelection( ControlFlags &ctrl,
107                           vector<SimpleLepton> &lepvec,
108                           float rho )
109 //--------------------------------------------------------------------------------------------------
110 {
111
112  bool passiso=true;
113
114  for( int i=0; i<lepvec.size(); i++ )
115    {
116      
117      if( !(lepvec[i].is4l) ) continue;
118      
119      float effArea_ecal_i, effArea_hcal_i;
120      if( lepvec[i].isEB ) {
121        if( lepvec[i].type == 11 ) {
122          effArea_ecal_i = 0.101;
123          effArea_hcal_i = 0.021;
124        } else {
125          effArea_ecal_i = 0.074;
126          effArea_hcal_i = 0.022;
127        }
128      } else {
129        if( lepvec[i].type == 11 ) {
130          effArea_ecal_i = 0.046;
131          effArea_hcal_i = 0.040;
132        } else {
133          effArea_ecal_i = 0.045;
134          effArea_hcal_i = 0.030;
135        }
136      }
137      
138      float isoEcal_corr_i = lepvec[i].isoEcal - (effArea_ecal_i*rho);
139      float isoHcal_corr_i = lepvec[i].isoHcal - (effArea_hcal_i*rho);
140
141      for( int j=i+1; j<lepvec.size(); j++ )
142        {
143
144          if( !(lepvec[j].is4l) ) continue;
145
146          float effArea_ecal_j, effArea_hcal_j;
147          if( lepvec[j].isEB ) {
148            if( lepvec[j].type == 11 ) {
149              effArea_ecal_j = 0.101;
150              effArea_hcal_j = 0.021;
151            } else {
152              effArea_ecal_j = 0.074;
153              effArea_hcal_j = 0.022;
154            }
155          } else {
156            if( lepvec[j].type == 11 ) {
157              effArea_ecal_j = 0.046;
158              effArea_hcal_j = 0.040;
159            } else {
160              effArea_ecal_j = 0.045;
161              effArea_hcal_j = 0.030;
162            }
163          }
164
165          float isoEcal_corr_j = lepvec[j].isoEcal - (effArea_ecal_j*rho);
166          float isoHcal_corr_j = lepvec[j].isoHcal - (effArea_hcal_j*rho);
167          float RIso_i = (lepvec[i].isoTrk+isoEcal_corr_i+isoHcal_corr_i)/lepvec[i].vec.Pt();
168          float RIso_j = (lepvec[j].isoTrk+isoEcal_corr_j+isoHcal_corr_j)/lepvec[j].vec.Pt();      
169          float comboIso = RIso_i + RIso_j;
170          
171          if( comboIso > 0.35 ) {
172            if( ctrl.debug ) cout << "combo failing for indices: " << i << "," << j << endl;
173            passiso = false;
174            return passiso;
175          }
176        }
177    }
178  
179  return passiso;
180 }
181
102   //--------------------------------------------------------------------------------------------------
103   SelectionStatus muonIsoSelection(ControlFlags &ctrl,
104 <                                 const mithep::Muon * mu,
105 <                                 const mithep::Vertex * vtx,
106 <                                 const mithep::Array<mithep::PFCandidate> * fPFCandidateCol   )
104 >                                 const Muon * mu,
105 >                                 const Vertex * vtx,
106 >                                 const Array<PFCandidate> * fPFCandidateCol   )
107   //--------------------------------------------------------------------------------------------------
108   {
109    float reliso = computePFMuonIso(mu,vtx,fPFCandidateCol,0.3)/mu->Pt();
# Line 211 | Line 131 | SelectionStatus muonIsoSelection(Control
131  
132   //--------------------------------------------------------------------------------------------------
133   SelectionStatus electronIsoSelection(ControlFlags &ctrl,
134 <                                     const mithep::Electron * ele,
135 <                                     const mithep::Vertex *fVertex,
136 <                                     const mithep::Array<mithep::PFCandidate> * fPFCandidates)
134 >                                     const Electron * ele,
135 >                                     const Vertex *fVertex,
136 >                                     const Array<PFCandidate> * fPFCandidates)
137   //--------------------------------------------------------------------------------------------------
138   {
139  
# Line 250 | Line 170 | bool noIso(ControlFlags &, vector<Simple
170          return true;
171   }
172  
253
173   //--------------------------------------------------------------------------------------------------
174   SelectionStatus muonIsoMVASelection(ControlFlags &ctrl,
175 <                                    const mithep::Muon * mu,
176 <                                    const mithep::Vertex * vtx,
177 <                                    const mithep::Array<mithep::PFCandidate> * fPFCandidates,
178 <                                    const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
179 <                                    mithep::MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
180 <                                    vector<const mithep::Muon*> muonsToVeto,
181 <                                    vector<const mithep::Electron*> electronsToVeto)
175 >                                    const Muon * mu,
176 >                                    const Vertex * vtx,
177 >                                    const Array<PFCandidate> * fPFCandidates,
178 >                                    const Array<PileupEnergyDensity> * fPUEnergyDensity,
179 >                                    MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
180 >                                    vector<const Muon*> muonsToVeto,
181 >                                    vector<const Electron*> electronsToVeto)
182   //--------------------------------------------------------------------------------------------------
183   {
184  
185    if( ctrl.debug ) {
186      cout << "muonIsoMVASelection :: muons to veto " << endl;
187      for( int i=0; i<muonsToVeto.size(); i++ ) {
188 <      const mithep::Muon * vmu = muonsToVeto[i];
188 >      const Muon * vmu = muonsToVeto[i];
189        cout << "\tpt: " << vmu->Pt()
190             << "\teta: " << vmu->Eta()
191             << "\tphi: " << vmu->Phi()
# Line 274 | Line 193 | SelectionStatus muonIsoMVASelection(Cont
193      }
194      cout << "muonIsoMVASelection :: electrson to veto " << endl;
195      for( int i=0; i<electronsToVeto.size(); i++ ) {
196 <      const mithep::Electron * vel = electronsToVeto[i];
196 >      const Electron * vel = electronsToVeto[i];
197        cout << "\tpt: " << vel->Pt()
198             << "\teta: " << vel->Eta()
199             << "\tphi: " << vel->Phi()
# Line 341 | Line 260 | SelectionStatus muonIsoMVASelection(Cont
260  
261      if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
262  
263 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
263 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
264  
265      Double_t deta = (mu->Eta() - pf->Eta());
266 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
267 <    Double_t dr = mithep::MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
266 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
267 >    Double_t dr = MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
268      if (dr > 1.0) continue;
269  
270      if (pf->HasTrackerTrk() && (pf->TrackerTrk() == mu->TrackerTrk()) ) continue;
# Line 360 | Line 279 | SelectionStatus muonIsoMVASelection(Cont
279        // Check for electrons
280        //
281        for (Int_t q=0; q < electronsToVeto.size(); ++q) {
282 <        const mithep::Electron *tmpele = electronsToVeto[q];
282 >        const Electron *tmpele = electronsToVeto[q];
283          // 4l electron
284          if( pf->HasTrackerTrk() ) {
285            if( pf->TrackerTrk() == tmpele->TrackerTrk() )
# Line 372 | Line 291 | SelectionStatus muonIsoMVASelection(Cont
291          }
292          // PF charged
293          if (pf->Charge() != 0 && fabs(tmpele->SCluster()->Eta()) >= 1.479
294 <            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.015)
294 >            && MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.015)
295            IsLeptonFootprint = kTRUE;
296          // PF gamma
297          if (abs(pf->PFType()) == PFCandidate::eGamma && fabs(tmpele->SCluster()->Eta()) >= 1.479
298 <            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.08)
298 >            && MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.08)
299            IsLeptonFootprint = kTRUE;
300        } // loop over electrons
301        
# Line 385 | Line 304 | SelectionStatus muonIsoMVASelection(Cont
304        // Check for muons
305        //
306        for (Int_t q=0; q < muonsToVeto.size(); ++q) {
307 <        const mithep::Muon *tmpmu = muonsToVeto[q];
307 >        const Muon *tmpmu = muonsToVeto[q];
308          // 4l muon
309          if( pf->HasTrackerTrk() ) {
310            if( pf->TrackerTrk() == tmpmu->TrackerTrk() )
311              IsLeptonFootprint = kTRUE;
312          }
313          // PF charged
314 <        if (pf->Charge() != 0 && mithep::MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01)
314 >        if (pf->Charge() != 0 && MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01)
315            IsLeptonFootprint = kTRUE;
316        } // loop over muons
317        */
# Line 595 | Line 514 | SelectionStatus muonIsoMVASelection(Cont
514  
515   //--------------------------------------------------------------------------------------------------
516   SelectionStatus muonIsoMVASelection(ControlFlags &ctrl,
517 <                                    const mithep::Muon * mu,
518 <                                    const mithep::Vertex * vtx,
519 <                                    const mithep::Array<mithep::PFCandidate> * fPFCandidates,
517 >                                    const Muon * mu,
518 >                                    const Vertex * vtx,
519 >                                    const Array<PFCandidate> * fPFCandidates,
520                                      float rho,
521 <                                    //const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
522 <                                    mithep::MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
523 <                                    vector<const mithep::Muon*> muonsToVeto,
524 <                                    vector<const mithep::Electron*> electronsToVeto)
521 >                                    //const Array<PileupEnergyDensity> * fPUEnergyDensity,
522 >                                    MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
523 >                                    vector<const Muon*> muonsToVeto,
524 >                                    vector<const Electron*> electronsToVeto)
525   //--------------------------------------------------------------------------------------------------
526   // hacked version
527   {
# Line 610 | Line 529 | SelectionStatus muonIsoMVASelection(Cont
529    if( ctrl.debug ) {
530      cout << "muonIsoMVASelection :: muons to veto " << endl;
531      for( int i=0; i<muonsToVeto.size(); i++ ) {
532 <      const mithep::Muon * vmu = muonsToVeto[i];
532 >      const Muon * vmu = muonsToVeto[i];
533        cout << "\tpt: " << vmu->Pt()
534             << "\teta: " << vmu->Eta()
535             << "\tphi: " << vmu->Phi()
# Line 618 | Line 537 | SelectionStatus muonIsoMVASelection(Cont
537      }
538      cout << "muonIsoMVASelection :: electrson to veto " << endl;
539      for( int i=0; i<electronsToVeto.size(); i++ ) {
540 <      const mithep::Electron * vel = electronsToVeto[i];
540 >      const Electron * vel = electronsToVeto[i];
541        cout << "\tpt: " << vel->Pt()
542             << "\teta: " << vel->Eta()
543             << "\tphi: " << vel->Phi()
# Line 685 | Line 604 | SelectionStatus muonIsoMVASelection(Cont
604  
605      if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
606  
607 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
607 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
608  
609      Double_t deta = (mu->Eta() - pf->Eta());
610 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
611 <    Double_t dr = mithep::MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
610 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
611 >    Double_t dr = MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
612      if (dr > 1.0) continue;
613  
614      if (pf->HasTrackerTrk() && (pf->TrackerTrk() == mu->TrackerTrk()) ) continue;
# Line 704 | Line 623 | SelectionStatus muonIsoMVASelection(Cont
623        // Check for electrons
624        //
625        for (Int_t q=0; q < electronsToVeto.size(); ++q) {
626 <        const mithep::Electron *tmpele = electronsToVeto[q];
626 >        const Electron *tmpele = electronsToVeto[q];
627          // 4l electron
628          if( pf->HasTrackerTrk() ) {
629            if( pf->TrackerTrk() == tmpele->TrackerTrk() )
# Line 716 | Line 635 | SelectionStatus muonIsoMVASelection(Cont
635          }
636          // PF charged
637          if (pf->Charge() != 0 && fabs(tmpele->SCluster()->Eta()) >= 1.479
638 <            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.015)
638 >            && MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.015)
639            IsLeptonFootprint = kTRUE;
640          // PF gamma
641          if (abs(pf->PFType()) == PFCandidate::eGamma && fabs(tmpele->SCluster()->Eta()) >= 1.479
642 <            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.08)
642 >            && MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.08)
643            IsLeptonFootprint = kTRUE;
644        } // loop over electrons
645        
# Line 729 | Line 648 | SelectionStatus muonIsoMVASelection(Cont
648        // Check for muons
649        //
650        for (Int_t q=0; q < muonsToVeto.size(); ++q) {
651 <        const mithep::Muon *tmpmu = muonsToVeto[q];
651 >        const Muon *tmpmu = muonsToVeto[q];
652          // 4l muon
653          if( pf->HasTrackerTrk() ) {
654            if( pf->TrackerTrk() == tmpmu->TrackerTrk() )
655              IsLeptonFootprint = kTRUE;
656          }
657          // PF charged
658 <        if (pf->Charge() != 0 && mithep::MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01)
658 >        if (pf->Charge() != 0 && MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01)
659            IsLeptonFootprint = kTRUE;
660        } // loop over muons
661        */
# Line 939 | Line 858 | SelectionStatus muonIsoMVASelection(Cont
858   //--------------------------------------------------------------------------------------------------
859   void initMuonIsoMVA() {
860   //--------------------------------------------------------------------------------------------------
861 <  muIsoMVA = new mithep::MuonIDMVA();
861 >  muIsoMVA = new MuonIDMVA();
862    vector<string> weightFiles;
863    weightFiles.push_back("./data/MuonIsoMVAWeights/MuonIsoMVA_BDTG_V0_barrel_lowpt.weights.xml");
864    weightFiles.push_back("./data/MuonIsoMVAWeights/MuonIsoMVA_BDTG_V0_barrel_highpt.weights.xml");
# Line 948 | Line 867 | void initMuonIsoMVA() {
867    weightFiles.push_back("./data/MuonIsoMVAWeights/MuonIsoMVA_BDTG_V0_tracker.weights.xml");
868    weightFiles.push_back("./data/MuonIsoMVAWeights/MuonIsoMVA_BDTG_V0_global.weights.xml");
869    muIsoMVA->Initialize( "MuonIsoMVA",
870 <                        mithep::MuonIDMVA::kIsoRingsV0,
870 >                        MuonIDMVA::kIsoRingsV0,
871                          kTRUE, weightFiles);
872   }
873  
874  
875  
957
876   //--------------------------------------------------------------------------------------------------
877   double  muonPFIso04(ControlFlags &ctrl,
878 <                    const mithep::Muon * mu,
879 <                    const mithep::Vertex * vtx,
880 <                    const mithep::Array<mithep::PFCandidate> * fPFCandidates,
881 <                    const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
882 <                    mithep::MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
883 <                    vector<const mithep::PFCandidate*> photonsToVeto)
878 >                    const Muon * mu,
879 >                    const Vertex * vtx,
880 >                    const Array<PFCandidate> * fPFCandidates,
881 >                    const Array<PileupEnergyDensity> * fPUEnergyDensity,
882 >                    MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
883 >                    vector<const PFCandidate*> photonsToVeto)
884   //--------------------------------------------------------------------------------------------------
885   {
886  
# Line 980 | Line 898 | double  muonPFIso04(ControlFlags &ctrl,
898    //
899    //Loop over PF Candidates
900    //
901 +  if(ctrl.debug) cout << "  muonPFIso04(): ----> " << endl;
902    for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
903  
904      if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
905 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
905 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
906  
907      //
908      // veto FSR recovered photons
# Line 1000 | Line 919 | double  muonPFIso04(ControlFlags &ctrl,
919      //
920  
921      Double_t deta = (mu->Eta() - pf->Eta());
922 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
923 <    Double_t dr = mithep::MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
922 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
923 >    Double_t dr = MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
924      if (dr > 0.4) continue;
925  
926      if (pf->HasTrackerTrk() && (pf->TrackerTrk() == mu->TrackerTrk()) ) continue;
# Line 1021 | Line 940 | double  muonPFIso04(ControlFlags &ctrl,
940      //
941      else if (abs(pf->PFType()) == PFCandidate::eGamma) {
942        // KH, add to sync
943 <      if( pf->Pt() > 0.5 )
943 >      if( pf->Pt() > 0.5 && dr > 0.01)
944        fGammaIso += pf->Pt();
945      }
946      
# Line 1029 | Line 948 | double  muonPFIso04(ControlFlags &ctrl,
948      // Other Neutrals
949      //
950      else {
951 <      if( pf->Pt() > 0.5 )
951 >    
952 >      if( pf->Pt() > 0.5  && dr > 0.01)
953          fNeutralHadronIso += pf->Pt();
954      }
955    }
956  
957    double rho=0;
958 <  if( (EffectiveAreaVersion == mithep::MuonTools::kMuEAFall11MC) ||
959 <      (EffectiveAreaVersion == mithep::MuonTools::kMuEAData2011) ) {
958 >  if( (EffectiveAreaVersion == MuonTools::kMuEAFall11MC) ||
959 >      (EffectiveAreaVersion == MuonTools::kMuEAData2011) ) {
960      if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25()) ||
961            isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25())))
962        rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25();
963      //rho = fPUEnergyDensity->At(0)->Rho();
964      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
965 <    EffectiveAreaVersion  = mithep::MuonTools::kMuEAData2011;
965 >    EffectiveAreaVersion  = MuonTools::kMuEAData2011;
966      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
967    } else {
968      if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral()) ||
969            isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral())))
970        rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral();
971      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
972 <    EffectiveAreaVersion  = mithep::MuonTools::kMuEAData2012;
972 >    EffectiveAreaVersion  = MuonTools::kMuEAData2012;
973      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
974    }
975 <  if(ctrl.debug) cout << "rho: " << rho << endl;
975 >  if(ctrl.debug) cout << "    rho: " << rho << endl;
976  
977    TLorentzVector  tmpvec;
978    tmpvec.SetPtEtaPhiM(mu->Pt(),mu->Eta(),mu->Phi(),mu->Mass());
979    for( int p=0; p<photonsToVeto.size(); p++ ) {
980 <    const mithep::PFCandidate * pf  = photonsToVeto[p];
980 >    const PFCandidate * pf  = photonsToVeto[p];
981      TLorentzVector pfvec;
982      pfvec.SetPtEtaPhiM(pf->Pt(),pf->Eta(),pf->Phi(),0.);
983      tmpvec += pfvec;
# Line 1072 | Line 992 | double  muonPFIso04(ControlFlags &ctrl,
992    gNeutralIso = fNeutralHadronIso;
993    
994    if( ctrl.debug ) {
995 <    cout << "PFiso: " << pfIso
995 >    cout << "    PFiso: " << pfIso
996           << "\tfChargedIso: " << fChargedIso
997           << "\tfGammaIso: " << fGammaIso
998           << "\tfNeutralHadronIso: " << fNeutralHadronIso
# Line 1082 | Line 1002 | double  muonPFIso04(ControlFlags &ctrl,
1002    return pfIso;
1003   }
1004  
1085
1086
1087
1088 //--------------------------------------------------------------------------------------------------
1089 // hacked version
1090 double  muonPFIso04(ControlFlags &ctrl,
1091                    const mithep::Muon * mu,
1092                    const mithep::Vertex * vtx,
1093                    const mithep::Array<mithep::PFCandidate> * fPFCandidates,
1094                    float rho,
1095                    mithep::MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
1096                    vector<const mithep::Muon*> muonsToVeto,
1097                    vector<const mithep::Electron*> electronsToVeto)
1098 //--------------------------------------------------------------------------------------------------
1099 {
1100
1101  extern double gChargedIso;  
1102  extern double  gGammaIso;      
1103  extern double  gNeutralIso;
1104  
1105  if( ctrl.debug ) {
1106    cout << "muonIsoMVASelection :: muons to veto " << endl;
1107    for( int i=0; i<muonsToVeto.size(); i++ ) {
1108      const mithep::Muon * vmu = muonsToVeto[i];
1109      cout << "\tpt: " << vmu->Pt()
1110           << "\teta: " << vmu->Eta()
1111           << "\tphi: " << vmu->Phi()
1112           << endl;
1113    }
1114    cout << "muonIsoMVASelection :: electrson to veto " << endl;
1115    for( int i=0; i<electronsToVeto.size(); i++ ) {
1116      const mithep::Electron * vel = electronsToVeto[i];
1117      cout << "\tpt: " << vel->Pt()
1118           << "\teta: " << vel->Eta()
1119           << "\tphi: " << vel->Phi()
1120           << endl;
1121    }
1122  }
1123
1124  //
1125  // final iso
1126  //
1127  Double_t fChargedIso  = 0.0;
1128  Double_t fGammaIso  = 0.0;
1129  Double_t fNeutralHadronIso  = 0.0;
1130
1131  //
1132  //Loop over PF Candidates
1133  //
1134  for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
1135
1136    if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
1137    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
1138
1139    Double_t deta = (mu->Eta() - pf->Eta());
1140    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(mu->Phi()),Double_t(pf->Phi()));
1141    Double_t dr = mithep::MathUtils::DeltaR(mu->Phi(),mu->Eta(), pf->Phi(), pf->Eta());
1142    if (dr > 0.4) continue;
1143
1144    if (pf->HasTrackerTrk() && (pf->TrackerTrk() == mu->TrackerTrk()) ) continue;
1145
1146    //
1147    // Lepton Footprint Removal
1148    //
1149    Bool_t IsLeptonFootprint = kFALSE;
1150    if (dr < 1.0) {
1151
1152      //
1153      // Check for electrons
1154      //
1155      for (Int_t q=0; q < electronsToVeto.size(); ++q) {
1156        const mithep::Electron *tmpele = electronsToVeto[q];
1157        // 4l electron
1158        if( pf->HasTrackerTrk() ) {
1159          if( pf->TrackerTrk() == tmpele->TrackerTrk() )
1160            IsLeptonFootprint = kTRUE;
1161        }
1162        if( pf->HasGsfTrk() ) {
1163          if( pf->GsfTrk() == tmpele->GsfTrk() )
1164            IsLeptonFootprint = kTRUE;
1165        }
1166        // PF charged
1167        if (pf->Charge() != 0 && fabs(tmpele->SCluster()->Eta()) > 1.479
1168            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.015)
1169          IsLeptonFootprint = kTRUE;
1170        // PF gamma
1171        if (abs(pf->PFType()) == PFCandidate::eGamma && fabs(tmpele->SCluster()->Eta()) > 1.479
1172            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.08)
1173          IsLeptonFootprint = kTRUE;
1174      } // loop over electrons
1175
1176      /* KH - comment for sync      
1177      //
1178      // Check for muons
1179      //
1180      for (Int_t q=0; q < muonsToVeto.size(); ++q) {
1181        const mithep::Muon *tmpmu = muonsToVeto[q];
1182        // 4l muon
1183        if( pf->HasTrackerTrk() ) {
1184          if( pf->TrackerTrk() == tmpmu->TrackerTrk() )
1185            IsLeptonFootprint = kTRUE;
1186        }
1187        // PF charged
1188        if (pf->Charge() != 0 && mithep::MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01)
1189          IsLeptonFootprint = kTRUE;
1190      } // loop over muons
1191      */
1192
1193    if (IsLeptonFootprint)
1194      continue;
1195
1196    //
1197    // Charged Iso
1198    //
1199    if (pf->Charge() != 0 && (pf->HasTrackerTrk()||pf->HasGsfTrk()) ) {
1200
1201      //if( dr < 0.01 ) continue; // only for muon iso mva?
1202      if (abs(pf->PFType()) == PFCandidate::eElectron || abs(pf->PFType()) == PFCandidate::eMuon) continue;
1203
1204
1205 //       if( pf->HasTrackerTrk() ) {
1206 //      if (abs(pf->TrackerTrk()->DzCorrected(vtx)) > 0.2) continue;
1207 //      if( ctrl.debug ) cout << "charged:: " << pf->PFType() << " " << pf->Pt() << " "
1208 //                            << abs(pf->TrackerTrk()->DzCorrected(vtx)) << " "
1209 //                            << dr << endl;
1210 //       }
1211 //       if( pf->HasGsfTrk() ) {
1212 //      if (abs(pf->GsfTrk()->DzCorrected(vtx)) > 0.2) continue;
1213 //      if( ctrl.debug ) cout << "charged:: " << pf->PFType() << " " << pf->Pt() << " "
1214 //                            << abs(pf->GsfTrk()->DzCorrected(vtx)) << " "
1215 //                            << dr << endl;
1216 //       }
1217
1218
1219      fChargedIso += pf->Pt();
1220    }
1221
1222    //
1223    // Gamma Iso
1224    //
1225    else if (abs(pf->PFType()) == PFCandidate::eGamma) {
1226      // KH, add to sync
1227      if( pf->Pt() > 0.5 )
1228      fGammaIso += pf->Pt();
1229    }
1230
1231    //
1232    // Other Neutrals
1233    //
1234    else {
1235      // KH, add to sync
1236      if( pf->Pt() > 0.5 )
1237        fNeutralHadronIso += pf->Pt();
1238    }
1239    
1240    }
1241    
1242  }
1243  
1244 //   double rho = 0;
1245 //   if (!(isnan(fPUEnergyDensity->At(0)->Rho()) || isinf(fPUEnergyDensity->At(0)->Rho())))
1246 //     rho = fPUEnergyDensity->At(0)->Rho();
1247
1248  // WARNING!!!!  
1249  // hardcode for sync ...
1250  EffectiveAreaVersion = muT.kMuEAData2011;
1251  // WARNING!!!!  
1252
1253
1254  double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
1255                                        -rho*muT.MuonEffectiveArea(muT.kMuGammaAndNeutralHadronIso04,
1256                                                                   mu->Eta(),EffectiveAreaVersion)));
1257  gChargedIso = fChargedIso;
1258  gGammaIso   = fGammaIso;
1259  gNeutralIso = fNeutralHadronIso;
1260  
1261  return pfIso;
1262 }
1263
1264
1005   //--------------------------------------------------------------------------------------------------
1006   SelectionStatus muonReferenceIsoSelection(ControlFlags &ctrl,
1007 <                                          const mithep::Muon * mu,
1008 <                                          const mithep::Vertex * vtx,
1009 <                                          const mithep::Array<mithep::PFCandidate> * fPFCandidates,
1010 <                                          const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
1011 <                                          mithep::MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
1012 <                                          vector<const mithep::PFCandidate*> photonsToVeto)
1007 >                                          const Muon * mu,
1008 >                                          const Vertex * vtx,
1009 >                                          const Array<PFCandidate> * fPFCandidates,
1010 >                                          const Array<PileupEnergyDensity> * fPUEnergyDensity,
1011 >                                          MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
1012 >                                          vector<const PFCandidate*> photonsToVeto)
1013   //--------------------------------------------------------------------------------------------------
1014   {
1015    
# Line 1277 | Line 1017 | SelectionStatus muonReferenceIsoSelectio
1017  
1018    double pfIso = muonPFIso04( ctrl, mu, vtx, fPFCandidates, fPUEnergyDensity,
1019                                EffectiveAreaVersion, photonsToVeto);
1280  //  cout << "--------------> setting muon isoPF04 to" << pfIso << endl;
1281  status.isoPF04 = pfIso;
1282  status.chisoPF04 = gChargedIso;
1283  status.gaisoPF04 = gGammaIso;
1284  status.neisoPF04 = gNeutralIso;
1285
1286  bool pass = false;
1287  if( (pfIso/mu->Pt()) < MUON_REFERENCE_PFISO_CUT ) pass = true;
1288  
1289  if( pass ) {
1290    status.orStatus(SelectionStatus::LOOSEISO);
1291    status.orStatus(SelectionStatus::TIGHTISO);
1292  }
1293  if(ctrl.debug) {
1294    cout << "mu relpfIso: " << pfIso/mu->Pt() << endl;
1295    cout << "returning status : " << hex << status.getStatus() << dec << endl;
1296  }
1297  return status;
1298  
1299 }
1300
1301
1302 //--------------------------------------------------------------------------------------------------
1303 // hacked version
1304 SelectionStatus muonReferenceIsoSelection(ControlFlags &ctrl,
1305                                          const mithep::Muon * mu,
1306                                          const mithep::Vertex * vtx,
1307                                          const mithep::Array<mithep::PFCandidate> * fPFCandidates,
1308                                          float rho,
1309                                          mithep::MuonTools::EMuonEffectiveAreaTarget EffectiveAreaVersion,
1310                                          vector<const mithep::Muon*> muonsToVeto,
1311                                          vector<const mithep::Electron*> electronsToVeto)
1312 //--------------------------------------------------------------------------------------------------
1313 {
1314  
1315  SelectionStatus status;
1316  
1317  double pfIso = muonPFIso04( ctrl, mu, vtx, fPFCandidates, rho,
1318                              EffectiveAreaVersion, muonsToVeto ,electronsToVeto );
1319
1020    status.isoPF04 = pfIso;
1021    status.chisoPF04 = gChargedIso;
1022    status.gaisoPF04 = gGammaIso;
# Line 1329 | Line 1029 | SelectionStatus muonReferenceIsoSelectio
1029      status.orStatus(SelectionStatus::LOOSEISO);
1030      status.orStatus(SelectionStatus::TIGHTISO);
1031    }
1032 <  if(ctrl.debug) cout << "returning status : " << hex << status.getStatus() << dec << endl;
1032 >  if(ctrl.debug)
1033 >    cout << "  --> mu relpfIso: " << pfIso/mu->Pt() << ", returning status : " << hex << status.getStatus() << dec << endl;
1034    return status;
1334  
1035   }
1036  
1337
1338
1339
1037   //--------------------------------------------------------------------------------------------------
1038   SelectionStatus electronIsoMVASelection(ControlFlags &ctrl,
1039 <                                        const mithep::Electron * ele,
1040 <                                        const mithep::Vertex * vtx,
1041 <                                        const mithep::Array<mithep::PFCandidate> * fPFCandidates,
1042 <                                        const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
1043 <                                        mithep::ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
1044 <                                        vector<const mithep::Muon*> muonsToVeto,
1045 <                                        vector<const mithep::Electron*> electronsToVeto)
1039 >                                        const Electron * ele,
1040 >                                        const Vertex * vtx,
1041 >                                        const Array<PFCandidate> * fPFCandidates,
1042 >                                        const Array<PileupEnergyDensity> * fPUEnergyDensity,
1043 >                                        ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
1044 >                                        vector<const Muon*> muonsToVeto,
1045 >                                        vector<const Electron*> electronsToVeto)
1046   //--------------------------------------------------------------------------------------------------
1047   {
1048  
1049    if( ctrl.debug ) {
1050      cout << "electronIsoMVASelection :: muons to veto " << endl;
1051      for( int i=0; i<muonsToVeto.size(); i++ ) {
1052 <      const mithep::Muon * vmu = muonsToVeto[i];
1052 >      const Muon * vmu = muonsToVeto[i];
1053        cout << "\tpt: " << vmu->Pt()
1054             << "\teta: " << vmu->Eta()
1055             << "\tphi: " << vmu->Phi()
# Line 1360 | Line 1057 | SelectionStatus electronIsoMVASelection(
1057      }
1058      cout << "electronIsoMVASelection :: electrson to veto " << endl;
1059      for( int i=0; i<electronsToVeto.size(); i++ ) {
1060 <      const mithep::Electron * vel = electronsToVeto[i];
1060 >      const Electron * vel = electronsToVeto[i];
1061        cout << "\tpt: " << vel->Pt()
1062             << "\teta: " << vel->Eta()
1063             << "\tphi: " << vel->Phi()
# Line 1424 | Line 1121 | SelectionStatus electronIsoMVASelection(
1121  
1122      if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
1123  
1124 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
1124 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
1125      Double_t deta = (ele->Eta() - pf->Eta());
1126 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
1127 <    Double_t dr = mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
1126 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
1127 >    Double_t dr = MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
1128      if (dr > 1.0) continue;
1129  
1130      if(ctrl.debug) {
# Line 1453 | Line 1150 | SelectionStatus electronIsoMVASelection(
1150        //
1151  
1152        for (Int_t q=0; q < electronsToVeto.size(); ++q) {
1153 <        const mithep::Electron *tmpele = electronsToVeto[q];
1154 <        double tmpdr = mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta());
1153 >        const Electron *tmpele = electronsToVeto[q];
1154 >        double tmpdr = MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta());
1155  
1156          // 4l electron
1157          if( pf->HasTrackerTrk()  ) {
# Line 1488 | Line 1185 | SelectionStatus electronIsoMVASelection(
1185        // Check for muons
1186        //
1187        for (Int_t q=0; q < muonsToVeto.size(); ++q) {
1188 <        const mithep::Muon *tmpmu = muonsToVeto[q];
1188 >        const Muon *tmpmu = muonsToVeto[q];
1189          // 4l muon
1190          if( pf->HasTrackerTrk() ) {
1191            if (pf->TrackerTrk() == tmpmu->TrackerTrk() ){
# Line 1497 | Line 1194 | SelectionStatus electronIsoMVASelection(
1194            }
1195          }
1196          // PF charged
1197 <        if (pf->Charge() != 0 && mithep::MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01) {
1197 >        if (pf->Charge() != 0 && MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01) {
1198            if( ctrl.debug) cout << "\tcharged trk, dR matches 4L mu ..." << endl;
1199            IsLeptonFootprint = kTRUE;
1200          }
# Line 1758 | Line 1455 | SelectionStatus electronIsoMVASelection(
1455  
1456   //--------------------------------------------------------------------------------------------------
1457   SelectionStatus electronIsoMVASelection(ControlFlags &ctrl,
1458 <                                        const mithep::Electron * ele,
1459 <                                        const mithep::Vertex * vtx,
1460 <                                        const mithep::Array<mithep::PFCandidate> * fPFCandidates,
1458 >                                        const Electron * ele,
1459 >                                        const Vertex * vtx,
1460 >                                        const Array<PFCandidate> * fPFCandidates,
1461                                          float rho,
1462 <                                        //const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
1463 <                                        mithep::ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
1464 <                                        vector<const mithep::Muon*> muonsToVeto,
1465 <                                        vector<const mithep::Electron*> electronsToVeto)
1462 >                                        //const Array<PileupEnergyDensity> * fPUEnergyDensity,
1463 >                                        ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
1464 >                                        vector<const Muon*> muonsToVeto,
1465 >                                        vector<const Electron*> electronsToVeto)
1466   //--------------------------------------------------------------------------------------------------
1467   // hacked version
1468   {
# Line 1776 | Line 1473 | SelectionStatus electronIsoMVASelection(
1473    if( ctrl.debug ) {
1474      cout << "electronIsoMVASelection :: muons to veto " << endl;
1475      for( int i=0; i<muonsToVeto.size(); i++ ) {
1476 <      const mithep::Muon * vmu = muonsToVeto[i];
1476 >      const Muon * vmu = muonsToVeto[i];
1477        cout << "\tpt: " << vmu->Pt()
1478             << "\teta: " << vmu->Eta()
1479             << "\tphi: " << vmu->Phi()
# Line 1784 | Line 1481 | SelectionStatus electronIsoMVASelection(
1481      }
1482      cout << "electronIsoMVASelection :: electrson to veto " << endl;
1483      for( int i=0; i<electronsToVeto.size(); i++ ) {
1484 <      const mithep::Electron * vel = electronsToVeto[i];
1484 >      const Electron * vel = electronsToVeto[i];
1485        cout << "\tpt: " << vel->Pt()
1486             << "\teta: " << vel->Eta()
1487             << "\tphi: " << vel->Phi()
# Line 1848 | Line 1545 | SelectionStatus electronIsoMVASelection(
1545  
1546      if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
1547  
1548 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
1548 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
1549      Double_t deta = (ele->Eta() - pf->Eta());
1550 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
1551 <    Double_t dr = mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
1550 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
1551 >    Double_t dr = MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
1552      if (dr > 1.0) continue;
1553  
1554      if(ctrl.debug) {
# Line 1877 | Line 1574 | SelectionStatus electronIsoMVASelection(
1574        //
1575  
1576        for (Int_t q=0; q < electronsToVeto.size(); ++q) {
1577 <        const mithep::Electron *tmpele = electronsToVeto[q];
1578 <        double tmpdr = mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta());
1577 >        const Electron *tmpele = electronsToVeto[q];
1578 >        double tmpdr = MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta());
1579  
1580          // 4l electron
1581          if( pf->HasTrackerTrk()  ) {
# Line 1912 | Line 1609 | SelectionStatus electronIsoMVASelection(
1609        // Check for muons
1610        //
1611        for (Int_t q=0; q < muonsToVeto.size(); ++q) {
1612 <        const mithep::Muon *tmpmu = muonsToVeto[q];
1612 >        const Muon *tmpmu = muonsToVeto[q];
1613          // 4l muon
1614          if( pf->HasTrackerTrk() ) {
1615            if (pf->TrackerTrk() == tmpmu->TrackerTrk() ){
# Line 1921 | Line 1618 | SelectionStatus electronIsoMVASelection(
1618            }
1619          }
1620          // PF charged
1621 <        if (pf->Charge() != 0 && mithep::MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01) {
1621 >        if (pf->Charge() != 0 && MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01) {
1622            if( ctrl.debug) cout << "\tcharged trk, dR matches 4L mu ..." << endl;
1623            IsLeptonFootprint = kTRUE;
1624          }
# Line 2183 | Line 1880 | SelectionStatus electronIsoMVASelection(
1880   //--------------------------------------------------------------------------------------------------
1881   void initElectronIsoMVA() {
1882   //--------------------------------------------------------------------------------------------------
1883 <  eleIsoMVA = new mithep::ElectronIDMVA();
1883 >  eleIsoMVA = new ElectronIDMVA();
1884    vector<string> weightFiles;
1885    weightFiles.push_back("../MitPhysics/data/ElectronMVAWeights/ElectronIso_BDTG_V0_BarrelPt5To10.weights.xml");
1886    weightFiles.push_back("../MitPhysics/data/ElectronMVAWeights/ElectronIso_BDTG_V0_EndcapPt5To10.weights.xml");
1887    weightFiles.push_back("../MitPhysics/data/ElectronMVAWeights/ElectronIso_BDTG_V0_BarrelPt10ToInf.weights.xml");
1888    weightFiles.push_back("../MitPhysics/data/ElectronMVAWeights/ElectronIso_BDTG_V0_EndcapPt10ToInf.weights.xml");
1889    eleIsoMVA->Initialize( "ElectronIsoMVA",
1890 <                        mithep::ElectronIDMVA::kIsoRingsV0,
1890 >                        ElectronIDMVA::kIsoRingsV0,
1891                          kTRUE, weightFiles);
1892   }
1893  
# Line 2199 | Line 1896 | void initElectronIsoMVA() {
1896  
1897   //--------------------------------------------------------------------------------------------------
1898   float electronPFIso04(ControlFlags &ctrl,
1899 <                      const mithep::Electron * ele,
1900 <                      const mithep::Vertex * vtx,
1901 <                      const mithep::Array<mithep::PFCandidate> * fPFCandidates,
1902 <                      const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
1903 <                      mithep::ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
1904 <                      vector<const mithep::PFCandidate*> photonsToVeto)        
1899 >                      const Electron * ele,
1900 >                      const Vertex * vtx,
1901 >                      const Array<PFCandidate> * fPFCandidates,
1902 >                      const Array<PileupEnergyDensity> * fPUEnergyDensity,
1903 >                      ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
1904 >                      vector<const PFCandidate*> photonsToVeto)        
1905   //--------------------------------------------------------------------------------------------------
1906   {
1907  
# Line 2219 | Line 1916 | float electronPFIso04(ControlFlags &ctrl
1916    //
1917    //Loop over PF Candidates
1918    //
1919 +  if(ctrl.debug) cout << "  electronPFIso04(): ----> " << endl;
1920    for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
1921  
1922 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
1922 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
1923  
1924      //
1925      // veto FSR recovered photons
# Line 2235 | Line 1933 | float electronPFIso04(ControlFlags &ctrl
1933      } if( vetoPhoton ) continue;
1934  
1935      Double_t deta = (ele->Eta() - pf->Eta());
1936 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
1937 <    Double_t dr = mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
1936 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
1937 >    Double_t dr = MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
1938  
1939      if (dr > 0.4) continue;
1940      if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
1941  
1942      if(ctrl.debug) {
1943 <      cout << "pf :: type: " << pf->PFType() << "\tpt: " << pf->Pt() << "\tdR: " << dr;
1943 >      cout << "    pf :: type: " << pf->PFType() << "\tpt: " << pf->Pt() << "\tdR: " << dr;
1944        if( pf->HasTrackerTrk() ) cout << "\tdZ: " << pf->TrackerTrk()->DzCorrected(*vtx)
1945                                       << "\ttrk: " << pf->HasTrackerTrk()
1946                                       << "\tgsf: " << pf->HasGsfTrk();
2249      
1947        cout << endl;
1948      }
1949  
2253
1950      //
1951      // sync : I don't think theyre doing this ...
1952      //
# Line 2275 | Line 1971 | float electronPFIso04(ControlFlags &ctrl
1971  
1972        // Veto any PFmuon, or PFEle
1973        if (abs(pf->PFType()) == PFCandidate::eElectron || abs(pf->PFType()) == PFCandidate::eMuon) {
1974 <        if( ctrl.debug ) cout << "\t skipping, pf is and ele or mu .." <<endl;
1974 >        if( ctrl.debug ) cout << "    skipping, pf is an ele or mu .." <<endl;
1975          continue;
1976        }
1977  
1978        // Footprint Veto
1979        if (fabs(ele->SCluster()->Eta()) > 1.479 && dr < 0.015) continue;
1980  
1981 <      if( ctrl.debug) cout << "charged:: pt: " << pf->Pt()
1981 >      if( ctrl.debug) cout << "    charged:: pt: " << pf->Pt()
1982                             << "\ttype: " << pf->PFType()
1983                             << "\ttrk: " << pf->TrackerTrk() << endl;
1984  
# Line 2295 | Line 1991 | float electronPFIso04(ControlFlags &ctrl
1991      else if (abs(pf->PFType()) == PFCandidate::eGamma) {
1992  
1993        if (fabs(ele->SCluster()->Eta()) > 1.479) {
1994 <        if (mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta()) < 0.08) continue;
1994 >        if (MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta()) < 0.08) continue;
1995        }
1996 <      if( ctrl.debug) cout << "gamma:: " << pf->Pt() << " "
1996 >
1997 >      assert(ele->HasSuperCluster());
1998 >      if(ele->GsfTrk()->NExpectedHitsInner()>0 && pf->MvaGamma() > 0.99 && pf->HasSCluster() && ele->SCluster() == pf->SCluster())      continue;
1999 >
2000 >
2001 >      if( ctrl.debug) cout << "    gamma:: " << pf->Pt() << " "
2002                             << dr << endl;
2003        // KH, add to sync
2004        //      if( pf->Pt() > 0.5 )
# Line 2308 | Line 2009 | float electronPFIso04(ControlFlags &ctrl
2009      // Neutral Iso
2010      //
2011      else {
2012 <      if( ctrl.debug) cout << "neutral:: " << pf->Pt() << " "
2012 >      if( ctrl.debug) cout << "    neutral:: " << pf->Pt() << " "
2013                             << dr << endl;
2014        // KH, add to sync
2015        //      if( pf->Pt() > 0.5 )
# Line 2321 | Line 2022 | float electronPFIso04(ControlFlags &ctrl
2022  
2023  
2024    double rho=0;
2025 <  if( (EffectiveAreaVersion == mithep::ElectronTools::kEleEAFall11MC) ||
2026 <      (EffectiveAreaVersion == mithep::ElectronTools::kEleEAData2011) ) {
2025 >  if( (EffectiveAreaVersion == ElectronTools::kEleEAFall11MC) ||
2026 >      (EffectiveAreaVersion == ElectronTools::kEleEAData2011) ) {
2027      if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25()) ||
2028            isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25())))
2029        rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsForIso25();
2030      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2031 <    EffectiveAreaVersion  = mithep::ElectronTools::kEleEAData2011;
2031 >    EffectiveAreaVersion  = ElectronTools::kEleEAData2011;
2032      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2033    } else {
2034      if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJets()) ||
2035            isinf(fPUEnergyDensity->At(0)->RhoKt6PFJets())))
2036        rho = fPUEnergyDensity->At(0)->RhoKt6PFJets();
2037      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2038 <    EffectiveAreaVersion  = mithep::ElectronTools::kEleEAData2012;
2038 >    EffectiveAreaVersion  = ElectronTools::kEleEAData2012;
2039      // !!!!!!!!!!!!! TMP HACK FOR SYNC !!!!!!!!!!!!!!!!!!!!!
2040    }
2041 <  if(ctrl.debug) cout << "rho: " << rho << endl;
2041 >  if(ctrl.debug) cout << "    rho: " << rho << endl;
2042  
2043    double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
2044                                          -rho*eleT.ElectronEffectiveArea(eleT.kEleGammaAndNeutralHadronIso04,
# Line 2349 | Line 2050 | float electronPFIso04(ControlFlags &ctrl
2050    gNeutralIso = fNeutralHadronIso;  
2051  
2052    if( ctrl.debug ) {
2053 <    cout << "PFiso: " << pfIso
2053 >    cout << "    PFiso: " << pfIso
2054           << "\tfChargedIso: " << fChargedIso
2055           << "\tfGammaIso: " << fGammaIso
2056           << "\tfNeutralHadronIso: " << fNeutralHadronIso
# Line 2359 | Line 2060 | float electronPFIso04(ControlFlags &ctrl
2060    return pfIso;
2061   }
2062  
2362
2363
2364 //--------------------------------------------------------------------------------------------------
2365 // hacked version
2366 float electronPFIso04(ControlFlags &ctrl,
2367                      const mithep::Electron * ele,
2368                      const mithep::Vertex * vtx,
2369                      const mithep::Array<mithep::PFCandidate> * fPFCandidates,
2370                      float rho,
2371                      mithep::ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
2372                      vector<const mithep::Muon*> muonsToVeto,
2373                      vector<const mithep::Electron*> electronsToVeto)
2374 //--------------------------------------------------------------------------------------------------
2375 {
2376
2377  if( ctrl.debug ) {
2378    cout << "electronIsoMVASelection :: muons to veto " << endl;
2379    for( int i=0; i<muonsToVeto.size(); i++ ) {
2380      const mithep::Muon * vmu = muonsToVeto[i];
2381      cout << "\tpt: " << vmu->Pt()
2382           << "\teta: " << vmu->Eta()
2383           << "\tphi: " << vmu->Phi()
2384           << endl;
2385    }
2386    cout << "electronIsoMVASelection :: electrons to veto " << endl;
2387    for( int i=0; i<electronsToVeto.size(); i++ ) {
2388      const mithep::Electron * vel = electronsToVeto[i];
2389      cout << "\tpt: " << vel->Pt()
2390           << "\teta: " << vel->Eta()
2391           << "\tphi: " << vel->Phi()
2392           << "\ttrk: " << vel->TrackerTrk()
2393           << endl;
2394    }
2395  }
2396
2397
2398  //
2399  // final iso
2400  //
2401  Double_t fChargedIso = 0.0;
2402  Double_t fGammaIso = 0.0;
2403  Double_t fNeutralHadronIso = 0.0;
2404
2405
2406  //
2407  //Loop over PF Candidates
2408  //
2409  for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
2410
2411
2412    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
2413    Double_t deta = (ele->Eta() - pf->Eta());
2414    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(ele->Phi()),Double_t(pf->Phi()));
2415    Double_t dr = mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta());
2416
2417    if (dr > 0.4) continue;
2418    if( !(PFnoPUflag[k]) ) continue; // my PF no PU hack
2419
2420    if(ctrl.debug) {
2421      cout << "pf :: type: " << pf->PFType() << "\tpt: " << pf->Pt() << "\tdR: " << dr;
2422      if( pf->HasTrackerTrk() ) cout << "\tdZ: " << pf->TrackerTrk()->DzCorrected(*vtx)
2423                                     << "\ttrk: " << pf->HasTrackerTrk()
2424                                     << "\tgsf: " << pf->HasGsfTrk();
2425      
2426      cout << endl;
2427    }
2428
2429
2430    //
2431    // sync : I don't think theyre doing this ...
2432    //
2433    //     if ( (pf->HasTrackerTrk() && (pf->TrackerTrk() == ele->TrackerTrk())) ||
2434    //   (pf->HasGsfTrk() && (pf->GsfTrk() == ele->GsfTrk()))) {
2435    //       if( ctrl.debug ) cout << "\tskipping, matches to the electron ..."  << endl;
2436    //       continue;
2437    //     }
2438
2439
2440    //
2441    // Lepton Footprint Removal
2442    //
2443    Bool_t IsLeptonFootprint = kFALSE;
2444    if (dr < 1.0) {
2445
2446      //
2447      // Check for electrons
2448      //
2449      for (Int_t q=0; q < electronsToVeto.size(); ++q) {
2450        const mithep::Electron *tmpele = electronsToVeto[q];
2451        /*
2452        // 4l electron
2453        if( pf->HasTrackerTrk()  ) {
2454          if( pf->TrackerTrk() == tmpele->TrackerTrk() ) {
2455            if( ctrl.debug) cout << "\tcharged tktrk, matches 4L ele ..." << endl;
2456            IsLeptonFootprint = kTRUE;
2457          }
2458        }
2459        if( pf->HasGsfTrk()  ) {
2460          if( pf->GsfTrk() == tmpele->GsfTrk() ) {
2461            if( ctrl.debug) cout << "\tcharged gsftrk, matches 4L ele ..." << endl;
2462            IsLeptonFootprint = kTRUE;
2463          }
2464        }
2465        */
2466        // PF charged
2467        if (pf->Charge() != 0 && fabs(tmpele->SCluster()->Eta()) > 1.479
2468            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.015) {
2469          if( ctrl.debug) cout << "\tcharged trk, dR matches 4L ele ..." << endl;
2470          IsLeptonFootprint = kTRUE;
2471        }
2472        // PF gamma
2473        if (abs(pf->PFType()) == PFCandidate::eGamma && fabs(tmpele->SCluster()->Eta()) > 1.479
2474            && mithep::MathUtils::DeltaR(tmpele->Phi(),tmpele->Eta(), pf->Phi(), pf->Eta()) < 0.08) {
2475          if( ctrl.debug) cout << "\tPF gamma, matches 4L ele ..." << endl;
2476          IsLeptonFootprint = kTRUE;
2477        }
2478      } // loop over electrons
2479
2480      /* KH - comment for sync            
2481      //
2482      // Check for muons
2483      //
2484      for (Int_t q=0; q < muonsToVeto.size(); ++q) {
2485        const mithep::Muon *tmpmu = muonsToVeto[q];
2486        // 4l muon
2487        if( pf->HasTrackerTrk() ) {
2488          if (pf->TrackerTrk() == tmpmu->TrackerTrk() ){
2489            if( ctrl.debug) cout << "\tmatches 4L mu ..." << endl;
2490            IsLeptonFootprint = kTRUE;
2491          }
2492        }
2493        // PF charged
2494        if (pf->Charge() != 0 && mithep::MathUtils::DeltaR(tmpmu->Phi(),tmpmu->Eta(), pf->Phi(), pf->Eta()) < 0.01) {
2495          if( ctrl.debug) cout << "\tcharged trk, dR matches 4L mu ..." << endl;
2496          IsLeptonFootprint = kTRUE;
2497        }
2498      } // loop over muons
2499      */
2500
2501    if (IsLeptonFootprint)
2502      continue;
2503
2504    //
2505    // Charged Iso
2506    //
2507    if (pf->Charge() != 0 && (pf->HasTrackerTrk()||pf->HasGsfTrk()) ) {
2508
2509 //       if( pf->HasTrackerTrk() )
2510 //      if (abs(pf->TrackerTrk()->DzCorrected(vtx)) > 0.2) continue;
2511 //       if( pf->HasGsfTrk() )
2512 //      if (abs(pf->GsfTrk()->DzCorrected(vtx)) > 0.2) continue;
2513
2514      // Veto any PFmuon, or PFEle
2515      if (abs(pf->PFType()) == PFCandidate::eElectron || abs(pf->PFType()) == PFCandidate::eMuon) {
2516        if( ctrl.debug ) cout << "\t skipping, pf is and ele or mu .." <<endl;
2517        continue;
2518      }
2519
2520      // Footprint Veto
2521      if (fabs(ele->SCluster()->Eta()) > 1.479 && dr < 0.015) continue;
2522
2523      if( ctrl.debug) cout << "charged:: pt: " << pf->Pt()
2524                           << "\ttype: " << pf->PFType()
2525                           << "\ttrk: " << pf->TrackerTrk() << endl;
2526
2527      fChargedIso += pf->Pt();
2528    }
2529
2530    //
2531    // Gamma Iso
2532    //
2533    else if (abs(pf->PFType()) == PFCandidate::eGamma) {
2534
2535      if (fabs(ele->SCluster()->Eta()) > 1.479) {
2536        if (mithep::MathUtils::DeltaR(ele->Phi(),ele->Eta(), pf->Phi(), pf->Eta()) < 0.08) continue;
2537      }
2538      if( ctrl.debug) cout << "gamma:: " << pf->Pt() << " "
2539                           << dr << endl;
2540      // KH, add to sync
2541      //      if( pf->Pt() > 0.5 )
2542        fGammaIso += pf->Pt();
2543    }
2544
2545    //
2546    // Neutral Iso
2547    //
2548    else {
2549      if( ctrl.debug) cout << "neutral:: " << pf->Pt() << " "
2550                           << dr << endl;
2551      // KH, add to sync
2552      //      if( pf->Pt() > 0.5 )
2553        fNeutralHadronIso += pf->Pt();
2554    }
2555
2556    }
2557
2558  }
2559
2560 //   double rho = 0;
2561 //   if (!(isnan(fPUEnergyDensity->At(0)->Rho()) || isinf(fPUEnergyDensity->At(0)->Rho())))
2562 //     rho = fPUEnergyDensity->At(0)->Rho();
2563
2564  // WARNING!!!!  
2565  // hardcode for sync ...
2566  EffectiveAreaVersion = eleT.kEleEAData2011;
2567  // WARNING!!!!  
2568
2569
2570  double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
2571                                        -rho*eleT.ElectronEffectiveArea(eleT.kEleGammaAndNeutralHadronIso04,
2572                                                                   ele->Eta(),EffectiveAreaVersion)));
2573
2574
2575  gChargedIso = fChargedIso;
2576  gGammaIso = fGammaIso;
2577  gNeutralIso = fNeutralHadronIso;  
2578  return pfIso;
2579 }
2580
2581
2063   //--------------------------------------------------------------------------------------------------
2064   SelectionStatus electronReferenceIsoSelection(ControlFlags &ctrl,
2065 <                                              const mithep::Electron * ele,
2066 <                                              const mithep::Vertex * vtx,
2067 <                                              const mithep::Array<mithep::PFCandidate> * fPFCandidates,
2068 <                                              const mithep::Array<mithep::PileupEnergyDensity> * fPUEnergyDensity,
2069 <                                              mithep::ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
2070 <                                              vector<const mithep::PFCandidate*> photonsToVeto)
2065 >                                              const Electron * ele,
2066 >                                              const Vertex * vtx,
2067 >                                              const Array<PFCandidate> * fPFCandidates,
2068 >                                              const Array<PileupEnergyDensity> * fPUEnergyDensity,
2069 >                                              ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
2070 >                                              vector<const PFCandidate*> photonsToVeto)
2071   //--------------------------------------------------------------------------------------------------
2072   {
2073  
# Line 2594 | Line 2075 | SelectionStatus electronReferenceIsoSele
2075  
2076    double pfIso = electronPFIso04( ctrl, ele, vtx, fPFCandidates, fPUEnergyDensity,
2077                                    EffectiveAreaVersion, photonsToVeto);
2597  //  cout << "--------------> setting electron isoPF04 to " << pfIso << endl;
2078    status.isoPF04 = pfIso;
2079    status.chisoPF04 = gChargedIso;
2080    status.gaisoPF04 = gGammaIso;
# Line 2607 | Line 2087 | SelectionStatus electronReferenceIsoSele
2087      status.orStatus(SelectionStatus::LOOSEISO);
2088      status.orStatus(SelectionStatus::TIGHTISO);
2089    }
2090 <  if(ctrl.debug) {
2091 <    cout << "el relpfIso: " << pfIso/ele->Pt() << endl;
2612 <    cout << "returning status : " << hex << status.getStatus() << dec << endl;
2613 <  }
2614 <  return status;
2615 <
2616 < }
2617 <
2618 <
2619 < //--------------------------------------------------------------------------------------------------
2620 < // hacked version
2621 < SelectionStatus electronReferenceIsoSelection(ControlFlags &ctrl,
2622 <                                              const mithep::Electron * ele,
2623 <                                              const mithep::Vertex * vtx,
2624 <                                              const mithep::Array<mithep::PFCandidate> * fPFCandidates,
2625 <                                              float rho,
2626 <                                              mithep::ElectronTools::EElectronEffectiveAreaTarget EffectiveAreaVersion,
2627 <                                              vector<const mithep::Muon*> muonsToVeto,
2628 <                                              vector<const mithep::Electron*> electronsToVeto)
2629 < //--------------------------------------------------------------------------------------------------
2630 < {
2631 <
2632 <  SelectionStatus status;
2633 <
2634 <  double pfIso = electronPFIso04( ctrl, ele, vtx, fPFCandidates, rho,
2635 <                                  EffectiveAreaVersion, muonsToVeto ,electronsToVeto );
2636 <  status.isoPF04 = pfIso;
2637 <  status.chisoPF04 = gChargedIso;
2638 <  status.gaisoPF04 = gGammaIso;
2639 <  status.neisoPF04 = gNeutralIso;
2640 <  bool pass = false;
2641 <  if( (pfIso/ele->Pt()) < ELECTRON_REFERENCE_PFISO_CUT ) pass = true;
2642 <
2643 <  if( pass ) {
2644 <    status.orStatus(SelectionStatus::LOOSEISO);
2645 <    status.orStatus(SelectionStatus::TIGHTISO);
2646 <  }
2647 <  if(ctrl.debug) cout << "returning status : " << hex << status.getStatus() << dec << endl;
2090 >  if(ctrl.debug)
2091 >    cout << "  --> ele relpfIso: " << pfIso/ele->Pt() << ", returning status : " << hex << status.getStatus() << dec << endl;
2092    return status;
2649
2093   }
2094  
2652
2653
2095   //--------------------------------------------------------------------------------------------------
2096   double  dbetaCorrectedIsoDr03(ControlFlags & ctrl,
2097 <                              const mithep::PFCandidate * photon,
2098 <                              const mithep::Muon * lepton,
2099 <                              const mithep::Array<mithep::PFCandidate> * fPFCandidates)
2097 >                              const PFCandidate * photon,
2098 >                              const Muon * lepton,
2099 >                              const Array<PFCandidate> * fPFCandidates)
2100   //--------------------------------------------------------------------------------------------------
2101   {
2102  
# Line 2672 | Line 2113 | double  dbetaCorrectedIsoDr03(ControlFla
2113    //
2114    for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
2115  
2116 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
2116 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
2117      
2118      Double_t deta = (photon->Eta() - pf->Eta());
2119 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2120 <    Double_t dr = mithep::MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2119 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2120 >    Double_t dr = MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2121      if (dr > 0.3) continue;
2122  
2123      if( !(PFnoPUflag[k]) && pf->Charge() != 0 ) {
# Line 2688 | Line 2129 | double  dbetaCorrectedIsoDr03(ControlFla
2129      //
2130      // skip this photon
2131      //
2132 <    if( abs(pf->PFType()) == mithep::PFCandidate::eGamma &&
2132 >    if( abs(pf->PFType()) == PFCandidate::eGamma &&
2133          pf->Et() == photon->Et() ) continue;
2134      
2135        
# Line 2704 | Line 2145 | double  dbetaCorrectedIsoDr03(ControlFla
2145      //
2146      // Gamma Iso
2147      //
2148 <    else if (abs(pf->PFType()) == mithep::PFCandidate::eGamma) {
2148 >    else if (abs(pf->PFType()) == PFCandidate::eGamma) {
2149        if( pf->Pt() > 0.5 && dr > 0.01)
2150          fGammaIso += pf->Pt();
2151      }
# Line 2720 | Line 2161 | double  dbetaCorrectedIsoDr03(ControlFla
2161    }
2162    
2163    if( ctrl.debug ) {
2164 <    cout << "photon dbetaIso :: " << endl;
2164 >    cout << "  ---> photon dbetaIso :: " << endl;
2165      cout << "\tfChargedIso: " << fChargedIso
2166           << "\tfGammaIso: " << fGammaIso
2167           << "\tfNeutralHadronIso: " << fNeutralHadronIso
# Line 2734 | Line 2175 | double  dbetaCorrectedIsoDr03(ControlFla
2175  
2176   //--------------------------------------------------------------------------------------------------
2177   double  dbetaCorrectedIsoDr03(ControlFlags & ctrl,
2178 <                              const mithep::PFCandidate * photon,
2179 <                              const mithep::Electron * lepton,
2180 <                              const mithep::Array<mithep::PFCandidate> * fPFCandidates)
2178 >                              const PFCandidate * photon,
2179 >                              const Electron * lepton,
2180 >                              const Array<PFCandidate> * fPFCandidates)
2181   //--------------------------------------------------------------------------------------------------
2182   {
2183  
# Line 2753 | Line 2194 | double  dbetaCorrectedIsoDr03(ControlFla
2194    //
2195    for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
2196  
2197 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
2197 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
2198      
2199      Double_t deta = (photon->Eta() - pf->Eta());
2200 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2201 <    Double_t dr = mithep::MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2200 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2201 >    Double_t dr = MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2202      if (dr > 0.3) continue;
2203  
2204      if( !(PFnoPUflag[k]) && pf->Charge() != 0 ) {
# Line 2769 | Line 2210 | double  dbetaCorrectedIsoDr03(ControlFla
2210      //
2211      // skip this photon
2212      //
2213 <    if( abs(pf->PFType()) == mithep::PFCandidate::eGamma &&
2213 >    if( abs(pf->PFType()) == PFCandidate::eGamma &&
2214          pf->Et() == photon->Et() ) continue;
2215      
2216        
# Line 2785 | Line 2226 | double  dbetaCorrectedIsoDr03(ControlFla
2226      //
2227      // Gamma Iso
2228      //
2229 <    else if (abs(pf->PFType()) == mithep::PFCandidate::eGamma) {
2229 >    else if (abs(pf->PFType()) == PFCandidate::eGamma) {
2230        if( pf->Pt() > 0.5 && dr > 0.01)
2231          fGammaIso += pf->Pt();
2232      }
# Line 2801 | Line 2242 | double  dbetaCorrectedIsoDr03(ControlFla
2242    }
2243    
2244    if( ctrl.debug ) {
2245 <    cout << "photon dbetaIso :: " << endl;
2245 >    cout << "  ---> photon dbetaIso :: " << endl;
2246      cout << "\tfChargedIso: " << fChargedIso
2247           << "\tfGammaIso: " << fGammaIso
2248           << "\tfNeutralHadronIso: " << fNeutralHadronIso
# Line 2818 | Line 2259 | double  dbetaCorrectedIsoDr03(ControlFla
2259  
2260   //--------------------------------------------------------------------------------------------------
2261   double  nonCorrectedIsoDr03(ControlFlags & ctrl,
2262 <                            const mithep::PFCandidate * photon,
2263 <                            const mithep::Muon * lepton,
2264 <                            const mithep::Array<mithep::PFCandidate> * fPFCandidates)
2262 >                            const PFCandidate * photon,
2263 >                            const Muon * lepton,
2264 >                            const Array<PFCandidate> * fPFCandidates)
2265   //--------------------------------------------------------------------------------------------------
2266   {
2267  
# Line 2837 | Line 2278 | double  nonCorrectedIsoDr03(ControlFlags
2278    //
2279    for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
2280  
2281 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
2281 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
2282  
2283      Double_t deta = (photon->Eta() - pf->Eta());
2284 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2285 <    Double_t dr = mithep::MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2284 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2285 >    Double_t dr = MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2286      if (dr > 0.3) continue;
2287  
2288      if( !(PFnoPUflag[k]) && pf->Charge() != 0 ) {
# Line 2853 | Line 2294 | double  nonCorrectedIsoDr03(ControlFlags
2294      //
2295      // skip this photon
2296      //
2297 <    if( abs(pf->PFType()) == mithep::PFCandidate::eGamma &&
2297 >    if( abs(pf->PFType()) == PFCandidate::eGamma &&
2298          pf->Et() == photon->Et() ) continue;
2299      
2300        
# Line 2869 | Line 2310 | double  nonCorrectedIsoDr03(ControlFlags
2310      //
2311      // Gamma Iso
2312      //
2313 <    else if (abs(pf->PFType()) == mithep::PFCandidate::eGamma) {
2313 >    else if (abs(pf->PFType()) == PFCandidate::eGamma) {
2314        if( pf->Pt() > 0.5 && dr > 0.01)
2315          fGammaIso += pf->Pt();
2316      }
# Line 2885 | Line 2326 | double  nonCorrectedIsoDr03(ControlFlags
2326    }
2327    
2328    if( ctrl.debug ) {
2329 <    cout << "photon dbetaIso :: " << endl;
2329 >    cout << "  ---> photon dbetaIso :: " << endl;
2330      cout << "\tfChargedIso: " << fChargedIso
2331           << "\tfGammaIso: " << fGammaIso
2332           << "\tfNeutralHadronIso: " << fNeutralHadronIso
# Line 2900 | Line 2341 | double  nonCorrectedIsoDr03(ControlFlags
2341  
2342   //--------------------------------------------------------------------------------------------------
2343   double  nonCorrectedIsoDr03(ControlFlags & ctrl,
2344 <                            const mithep::PFCandidate * photon,
2345 <                            const mithep::Electron * lepton,
2346 <                            const mithep::Array<mithep::PFCandidate> * fPFCandidates)
2344 >                            const PFCandidate * photon,
2345 >                            const Electron * lepton,
2346 >                            const Array<PFCandidate> * fPFCandidates)
2347   //--------------------------------------------------------------------------------------------------
2348   {
2349  
# Line 2919 | Line 2360 | double  nonCorrectedIsoDr03(ControlFlags
2360    //
2361    for(int k=0; k<fPFCandidates->GetEntries(); ++k) {
2362  
2363 <    const mithep::PFCandidate *pf = (mithep::PFCandidate*)((*fPFCandidates)[k]);
2363 >    const PFCandidate *pf = (PFCandidate*)((*fPFCandidates)[k]);
2364  
2365      Double_t deta = (photon->Eta() - pf->Eta());
2366 <    Double_t dphi = mithep::MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2367 <    Double_t dr = mithep::MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2366 >    Double_t dphi = MathUtils::DeltaPhi(Double_t(photon->Phi()),Double_t(pf->Phi()));
2367 >    Double_t dr = MathUtils::DeltaR(photon->Phi(),photon->Eta(), pf->Phi(), pf->Eta());
2368      if (dr > 0.3) continue;
2369  
2370      if( !(PFnoPUflag[k]) && pf->Charge() != 0 ) {
# Line 2935 | Line 2376 | double  nonCorrectedIsoDr03(ControlFlags
2376      //
2377      // skip this photon
2378      //
2379 <    if( abs(pf->PFType()) == mithep::PFCandidate::eGamma &&
2379 >    if( abs(pf->PFType()) == PFCandidate::eGamma &&
2380          pf->Et() == photon->Et() ) continue;
2381      
2382        
# Line 2951 | Line 2392 | double  nonCorrectedIsoDr03(ControlFlags
2392      //
2393      // Gamma Iso
2394      //
2395 <    else if (abs(pf->PFType()) == mithep::PFCandidate::eGamma) {
2395 >    else if (abs(pf->PFType()) == PFCandidate::eGamma) {
2396        if( pf->Pt() > 0.5 && dr > 0.01)
2397          fGammaIso += pf->Pt();
2398      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines