---

yaml --- r: 76667 b: "refs/heads/CMSSW_7_1_X" c: 3cdfe70 h: "refs/heads/CMSSW_7_1_X" i: 76665: 06ed73c 76663: 4e979b7 v: v3
cms-sw · Oct 30, 2009 · aa5ff69 · aa5ff69
1 parent fd80dbc
commit aa5ff69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": e0bd451bb2665002b911b29e02283b9c4c6421d9
+"refs/heads/CMSSW_7_1_X": 3cdfe70d5fd8351cff63f30edf3edfef8d6fc6a3
diff --git a/trunk/CondCore/ESSources/src/PoolDBESSource.cc b/trunk/CondCore/ESSources/src/PoolDBESSource.cc
@@ -203,7 +203,8 @@ PoolDBESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& iKey
   }
 
   cond::ValidityInterval recordValidity(0,cond::TIMELIMIT);
-
+  cond::TimeType timetype;
+  bool userTime=true;
   for (ProxyMap::const_iterator p=b;p!=e;++p) {
     // refresh if required...
     if (doRefresh)  { 
@@ -220,33 +221,32 @@ PoolDBESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& iKey
     }
 
 
-    cond::TimeType timetype = (*p).second->proxy()->timetype();
+    timetype = (*p).second->proxy()->timetype();
 
     cond::Time_t abtime = cond::fromIOVSyncValue(iTime,timetype);
-    bool userTime= (0==abtime);
+    userTime = (0==abtime);
 
     //std::cout<<"abtime "<<abtime<<std::endl;
 
     cond::ValidityInterval validity = (*p).second->proxy()->setIntervalFor(abtime);
 
-    recondValidity.first = std::max(recondValidity.first,validity.fist);
-    recondValidity.second = std::min(recondValidity.second,validity.second);
+    recondValidity.first = std::max(recordValidity.first,validity.first);
+    recondValidity.second = std::min(recordValidity.second,validity.second);
   }      
 
     // to force refresh we set end-value to the minimum such an IOV can exend to: current run or lumiblock
 
-   if (!userTime) {
-     edm::IOVSyncValue start = cond::toIOVSyncValue(recordValidity.first, timetype, true);
-     edm::IOVSyncValue stop = doRefresh ? cond::limitedIOVSyncValue (iTime, timetype)
-       : cond::toIOVSyncValue(recordValidity.second, timetype, false);
+  if (!userTime) {
+    edm::IOVSyncValue start = cond::toIOVSyncValue(recordValidity.first, timetype, true);
+    edm::IOVSyncValue stop = doRefresh ? cond::limitedIOVSyncValue (iTime, timetype)
+      : cond::toIOVSyncValue(recordValidity.second, timetype, false);
 
     //std::cout<<"setting validity "<<recordValidity.first<<" "<<recordValidity.second<<" for ibtime "<<abtime<< std::endl;
 
-     oInterval = edm::ValidityInterval( start, stop );
+    oInterval = edm::ValidityInterval( start, stop );
    }
-  }
-
 }
+
 
 void 
 PoolDBESSource::registerProxies(const edm::eventsetup::EventSetupRecordKey& iRecordKey , KeyedProxies& aProxyList) {