Merge cms-sw#4118 into CMSSW_7_1_X.

boudoul · Jun 19, 2014 · 41db123 · 41db123
2 parents abba198 + e1fc314
commit 41db123
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/RecoLuminosity/LumiProducer/plugins/fPoly.cc b/RecoLuminosity/LumiProducer/plugins/fPoly.cc
@@ -32,14 +32,10 @@ lumi::fPoly::getCorrection(float luminonorm,float intglumi,unsigned int nBXs)con
     avglumi=c1*luminonorm/nBXs;
   }
   float Afterglow=1.0;
-  if(m_afterglowmap.size()!=0){
-    std::map< unsigned int, float >::const_iterator afterglowit=--m_afterglowmap.end();
-    if(nBXs>=afterglowit->first){
-      Afterglow=afterglowit->second;
-    }else{
-      afterglowit=m_afterglowmap.upper_bound(nBXs);
-      --afterglowit;
-      Afterglow=afterglowit->second;
+  if(!m_afterglowmap.empty()){
+    std::map< unsigned int, float >::const_iterator afterglowit=m_afterglowmap.lower_bound(nBXs+1);
+    if(afterglowit != m_afterglowmap.begin()){
+      Afterglow=(--afterglowit)->second;
     }
   }
   float driftterm=1.0;