Changeset 612 in Sophya for trunk/Poubelle/archTOI.old/toiiter.cc

Timestamp:

Nov 22, 1999, 10:43:44 AM (26 years ago)

Author:

ansari

Message:

fin de fichier, start

File:

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

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -205 +205 @@
   processRequest("#UTCORIGIN 1376.5");
   processRequest("#ASIGPS ASI_GPS_archeops1999.ascii");
-  processRequest("#COMMENT Archtoi V2 -- october 1999 -- Eric Aubourg CEA/DAPNIA");
-  processRequest("#COMMENT ***WARNING***");
-  processRequest("#COMMENT ***SOME TOI'S ARE PRELIMINARY***");
-  processRequest("#COMMENT gyroSpeed is not calibrated");
-  processRequest("#COMMENT azimut/alpha/delta use galaxy crossings and ASI GPS data");
-  processRequest("#COMMENT   and assume no pendulation");
-  processRequest("#COMMENT Focal plane center elevation found at 41.5 deg");
-  processRequest("#COMMENT   with Jupiter");
-  processRequest("#COMMENT boloMuV2 is not protected against glitches");
+  processRequest("#COMMENT Archtoi V3 -- novembre 1999 -- Eric Aubourg CEA/DAPNIA");
 }
 
@@ -233 +225 @@
   }
 
-  fset.setMJDRange(mjdStart-0.01, mjdEnd+0.01);
-  fset.setSNumRange(sStart-1000, sEnd+1000);
+  // Let's add some time on each side, 30 seconds should be ok, at least
+  // for Trapani
+  
+  double delT = 30. / 86400;
+  long   delSN = long(delT / archParam.acq.perEch);
+
+  fset.setMJDRange(mjdStart-delT, mjdEnd+delT);
+  fset.setSNumRange(sStart-delSN, sEnd+delSN);
 
   fset.init();
@@ -267 +265 @@
 // 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) 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;
   
@@ -288 +291 @@
     }
     bool found=false;
-    bool valuesAhead = 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;
+      //if ((*i).second->lastSampleNum((*i).first)>curSample) valuesAhead=true;
     }
     if (found) break;
-    if (endFound && !valuesAhead) return false;
+    if (endFound && curSample >= fset.getSampleIndex()+71) return false;
   }
   return true;