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.23 by khahn, Wed May 23 14:50:06 2012 UTC vs.
Revision 1.24 by anlevin, Wed May 23 22:06:39 2012 UTC

# Line 1114 | Line 1114 | double  muonPFIso04(ControlFlags &ctrl,
1114    }
1115  
1116    double rho=0;
1117 <  if (!(isnan(fPUEnergyDensity->At(0)->Rho()) || isinf(fPUEnergyDensity->At(0)->Rho())))
1118 <    rho = fPUEnergyDensity->At(0)->Rho();
1117 >  if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral()) || isinf(fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral())))
1118 >    rho = fPUEnergyDensity->At(0)->RhoKt6PFJetsCentralNeutral();
1119  
1120    // WARNING!!!!  
1121    // hardcode for sync ...
1122 <  EffectiveAreaVersion = muT.kMuEAData2011;
1122 >  EffectiveAreaVersion = muT.kMuEAData2012;
1123    // WARNING!!!!  
1124  
1125  
# Line 2248 | Line 2248 | void initElectronIsoMVA() {
2248  
2249  
2250   //--------------------------------------------------------------------------------------------------
2251 – // hacked version
2251   float electronPFIso04(ControlFlags &ctrl,
2252                        const mithep::Electron * ele,
2253                        const mithep::Vertex * vtx,
# Line 2445 | Line 2444 | float electronPFIso04(ControlFlags &ctrl
2444  
2445  
2446    double rho=0;
2447 <  if (!(isnan(fPUEnergyDensity->At(0)->Rho()) || isinf(fPUEnergyDensity->At(0)->Rho())))
2448 <    rho = fPUEnergyDensity->At(0)->Rho();
2447 >  if (!(isnan(fPUEnergyDensity->At(0)->RhoKt6PFJets()) || isinf(fPUEnergyDensity->At(0)->RhoKt6PFJets())))
2448 >    rho = fPUEnergyDensity->At(0)->RhoKt6PFJets();
2449 >
2450 >
2451  
2452    // WARNING!!!!  
2453    // hardcode for sync ...
2454 <  EffectiveAreaVersion = eleT.kEleEAData2011;
2454 >  EffectiveAreaVersion = eleT.kEleEAData2012;
2455    // WARNING!!!!  
2456  
2457 +        eleT.ElectronEffectiveArea(eleT.kEleGammaAndNeutralHadronIso04,ele->Eta(),EffectiveAreaVersion) << endl;
2458 +
2459  
2460    double pfIso = fChargedIso + fmax(0.0,(fGammaIso + fNeutralHadronIso
2461                                          -rho*eleT.ElectronEffectiveArea(eleT.kEleGammaAndNeutralHadronIso04,

Diff Legend

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