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.8 by khahn, Thu Jul 12 15:50:27 2012 UTC vs.
Revision 1.9 by dkralph, Mon Jul 16 10:21:13 2012 UTC

# Line 280 | Line 280 | void setEra(string fname, ControlFlags &
280   {
281   //----------------------------------------------------------------------------------------
282    if( ctrl.mc && (fname.find("f11-") != string::npos)  ) ctrl.era=2011 ;
283 <  if( ctrl.mc && (fname.find("s12-") != string::npos)  ) ctrl.era=2012 ;
284 <  if( !ctrl.mc && (fname.find("r11") != string::npos)  ) ctrl.era=2011 ;
285 <  if( !ctrl.mc && (fname.find("r12") != string::npos)  ) ctrl.era=2012 ;
283 >  else if( ctrl.mc && (fname.find("s12-") != string::npos)  ) ctrl.era=2012 ;
284 >  else if( !ctrl.mc && (fname.find("r11") != string::npos)  ) ctrl.era=2011 ;
285 >  else if( !ctrl.mc && (fname.find("r12") != string::npos)  ) ctrl.era=2012 ;
286 >  else assert(0);
287   }
288  
289   //----------------------------------------------------------------------------------------

Diff Legend

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