ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/rootEWKanalyzer/src/baseClass.C
(Generate patch)

Comparing UserCode/rootEWKanalyzer/src/baseClass.C (file contents):
Revision 1.5 by jueugste, Mon Nov 15 09:51:22 2010 UTC vs.
Revision 1.6 by jueugste, Tue Dec 21 15:25:39 2010 UTC

# Line 627 | Line 627 | int baseClass::WPElectronID(int i, Nminu
627    double eta = ElSCEta[i];
628   //   double eta = ElEta[i];
629  
630 <  double dPhiCorr=dphiCorrections(eta, ElPhi[i]);
631 <  double dEtaCorr=detaCorrections(eta, ElPhi[i]);
630 > //   double dPhiCorr=dphiCorrections(eta, ElPhi[i]);
631 > //   double dEtaCorr=detaCorrections(eta, ElPhi[i]);
632 >  double dPhiCorr=0.;//dphiCorrections(eta, ElPhi[i]);
633 >  double dEtaCorr=0.;//detaCorrections(eta, ElPhi[i]);
634  
635    double See  = ElSigmaIetaIeta[i];
636    // apply the correction for the endcaps
# Line 641 | Line 643 | int baseClass::WPElectronID(int i, Nminu
643    double combIso_B = (trkIso + max(0., ecalIso - 1.) + hcalIso) / ElPt[i];
644    double combIso_E = (trkIso + ecalIso + hcalIso) / ElPt[i];
645    bool isConversion;
646 <  if((fabs(ElConvPartnerTrkDist[i])<dist && fabs(ElConvPartnerTrkDCot[i])<cot) /*|| ElNumberOfMissingInnerHits[i]>hits*/) isConversion=true;
646 >  if((fabs(ElConvPartnerTrkDist[i])<=dist && fabs(ElConvPartnerTrkDCot[i])<=cot) || ElNumberOfMissingInnerHits[i]>hits) isConversion=true;
647    else isConversion=false;
648  
649    if(c==see)  cutOn_See  = false;
# Line 652 | Line 654 | int baseClass::WPElectronID(int i, Nminu
654    if(c==conversion) cutOn_conversion = false;
655  
656    if(fabs(eta)<=etaMax_B) {
657 <    if(cutOn_See)  if(See  > SeeMax_B)  return 1;
658 <    if(cutOn_dPhi) if(dPhi > dPhiMax_B) return 2;
659 <    if(cutOn_dEta) if(dEta > dEtaMax_B) return 3;
660 <    if(cutOn_HoE)  if(HoE  > HoEMax_B)  return 4;
657 >    if(ElIDsimpleWP80relIso[i] < 5 || ElIDsimpleWP80relIso[i] == 6) return 1;
658 > //     if(cutOn_See)  if(See  > SeeMax_B)  return 1;
659 > //     if(cutOn_dPhi) if(dPhi > dPhiMax_B) return 2;
660 > //     if(cutOn_dEta) if(dEta > dEtaMax_B) return 3;
661 > //     if(cutOn_HoE)  if(HoE  > HoEMax_B)  return 4;
662      if(cutOn_combIso) if(combIso_B > combIsoMax_B) return 5;
663 <    if(cutOn_conversion) if(isConversion==true) return 6;
663 > //     if(cutOn_combIso) if(trkIso / ElPt[i] < 0.09 && ecalIso / ElPt[i] < 0.07 && hcalIso / ElPt[i] < 0.1) return 5;
664 > //     if(cutOn_conversion) if(isConversion==true) return 6;
665      return 0;
666    }
667    if(fabs(eta)>etaMin_E && fabs(eta)<etaMax_E) {
668 <    if(cutOn_See)  if(See  > SeeMax_E)  return 1;
669 <    if(cutOn_dPhi) if(dPhi > dPhiMax_E) return 2;
670 <    if(cutOn_dEta) if(dEta > dEtaMax_E) return 3;
671 <    if(cutOn_HoE)  if(HoE  > HoEMax_E)  return 4;
668 >    if(ElIDsimpleWP80relIso[i] < 5 || ElIDsimpleWP80relIso[i] == 6) return 1;
669 > //     if(cutOn_See)  if(See  > SeeMax_E)  return 1;
670 > //     if(cutOn_dPhi) if(dPhi > dPhiMax_E) return 2;
671 > //     if(cutOn_dEta) if(dEta > dEtaMax_E) return 3;
672 > //     if(cutOn_HoE)  if(HoE  > HoEMax_E)  return 4;    
673      if(cutOn_combIso) if(combIso_E > combIsoMax_E) return 5;
674 <    if(cutOn_conversion) if(isConversion==true) return 6;
674 > //     if(cutOn_combIso) if(trkIso / ElPt[i] < 0.04 && ecalIso / ElPt[i] < 0.05 && hcalIso / ElPt[i] < 0.025) return 5;
675 > //     if(cutOn_conversion) if(isConversion==true) return 6;
676      return 0;
677    }
678    else {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines