Changeset 616 in Sophya for trunk/Poubelle

Timestamp:

Nov 22, 1999, 11:16:16 AM (26 years ago)

Author:

ansari

Message:

fin fichier

File:

• trunk/Poubelle/archTOI.old/toiiter.cc (modified) (2 diffs)

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -257 +257 @@
   return true;
 }
-<<<<<<< toiiter.cc
 
 bool TOIIter::next1() {
@@ -298 +297 @@
       if ((*i).second->canGetValue(curSample, (*i).first)) {found=true;break;}
       //if ((*i).second->lastSampleNum((*i).first)>curSample) valuesAhead=true;
-=======
-
-bool TOIIter::next1() {
-// On tente de produire curSample+1 pour toutes les toi
-// Eventuellement en avancant sur le fichier...
-// Puis on regarde si une TOI triggering a eu une nouvelle
-// valeur.
-// Si on a epuise les fichiers de donnees, on s'arrete des qu'aucune
-// TOI n'a de valeurs apres curSample...
-  if (curSample <= 0) curSample = sStart-1;  
-  if (curSample <= 0) {
-    long sn = archParam.acq.MJD2SN(mjdStart) - 1;
-    if (sn > curSample) curSample = sn;
-  }
-  
-  if (curSample <= 0) curSample = fset.getSampleIndex()-1;
-  
-  if (curSample >= sEnd || archParam.acq.SN2MJD(curSample) >= mjdEnd) return false;
-  
-  static long lastClean = 0;
-  if (curSample - lastClean > 100) {
-    for (int i=0; i<request.size(); i++)
-      request[i].second->wontNeedEarlier(request[i].first, this, curSample);
-    lastClean = curSample;
-  }
-
-  bool endFound = false;
-  while(1) {
-    curSample++;
-    for (vector<TOIInfo>::iterator i = request.begin(); i != request.end(); i++) {
-      while ((*i).second->canGetValueLater(curSample, (*i).first)) {
-        if (! fset.next()) {endFound = true; break;} //return false;
-      }     
     }
-    bool found=false;
-    //bool valuesAhead = false;
-    for (vector<TOIInfo>::iterator i = request.begin(); i != request.end(); i++) {
-      if (((*i).third & triggering) == 0) continue;
-      if ((*i).second->canGetValue(curSample, (*i).first)) {found=true;break;}
-      //if ((*i).second->lastSampleNum((*i).first)>curSample) valuesAhead=true;
->>>>>>> 1.24
-    }
-<<<<<<< toiiter.cc
     if (found) break;
-=======
-    if (found) break;
-    if (endFound && curSample >= fset.getSampleIndex()+71) return false;
->>>>>>> 1.24
   }
   return true;