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

Comparing UserCode/MitHzz4l/Selection/src/SelectionFuncs.cc (file contents):
Revision 1.6 by dkralph, Thu Jun 21 21:50:39 2012 UTC vs.
Revision 1.7 by khahn, Fri Jun 22 03:10:32 2012 UTC

# Line 255 | Line 255 | void setEra(string fname, ControlFlags &
255   //----------------------------------------------------------------------------------------
256    if( ctrl.mc && (fname.find("f11-") != string::npos)  ) ctrl.era=2011 ;
257    if( ctrl.mc && (fname.find("s12-") != string::npos)  ) ctrl.era=2012 ;
258 <  if( !ctrl.mc && (fname.find("r11-") != string::npos)  ) ctrl.era=2011 ;
259 <  if( !ctrl.mc && (fname.find("r12-") != string::npos)  ) ctrl.era=2012 ;
258 >  if( !ctrl.mc && (fname.find("r11") != string::npos)  ) ctrl.era=2011 ;
259 >  if( !ctrl.mc && (fname.find("r12") != string::npos)  ) ctrl.era=2012 ;
260   }
261  
262   //----------------------------------------------------------------------------------------
# Line 305 | Line 305 | double getPUWeight(unsigned era,unsigned
305   {
306    if( era == 2011 )
307      return hpu_2011->GetBinContent(hpu_2011->FindBin(npu));
308 <  else if (era == 2012 )
308 >  else if (era == 2012 ) {
309 >    cerr << "npu : " << npu
310 >         << "\tbin: " << hpu_2012->FindBin(npu)
311 >         << "\tnpuw: " << hpu_2012->GetBinContent(hpu_2012->FindBin(npu))
312 >         << endl;
313      return hpu_2012->GetBinContent(hpu_2012->FindBin(npu));
314 +  }
315    else return 1;
316   }
317  

Diff Legend

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