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

Timestamp:

Sep 1, 1999, 2:45:54 PM (26 years ago)

Author:

ansari

Message:

Integration detecteur d'etoiles DY

File:

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

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -5 +5 @@
 #include "toiiter.h"
 #include "toiinterpolator.h"
+#include "archparam.h"
 #include <dirent.h>
 #include <iostream.h>
@@ -27 +28 @@
  tEnd   = 9.e99;
  
- tBlock0 = -1;
- perEch = -1;
+ //tBlock0 = -1;
+ // perEch = -1;
  // Values for Trapani 99 = default values
- tBlock0 = 1376.8358818;
- perEch = 0.005836818076;
+ //tBlock0 = 1376.8358818;
+ //perEch = 0.005836818076;
  
  trigMask = 0;
@@ -53 +54 @@
   tStart = x.tStart;
   tEnd = x.tEnd;
-  tBlock0 = x.tBlock0;
-  perEch = x.perEch;
+  //tBlock0 = x.tBlock0;
+  //perEch = x.perEch;
   trigMask = x.trigMask;
   infos = x.infos;   
@@ -180 +181 @@
   // peu plus de details sur la facon dont le GPS est lu.
   
-  if (tBlock0 < 0) {
-    tBlock0 = file->getStartMJD();
+  if (archParam.acq.tBlock0 < 0) {
+    archParam.acq.tBlock0 = file->getStartMJD();
 
     file->pushMark();
@@ -187 +188 @@
       // le temps du bloc courant, en secondes
       double dt = file->blockNum() * file->perBlock();
-      tBlock0 = file->getGPSMJD() - dt/86400.;
+      archParam.acq.tBlock0 = file->getGPSMJD() - dt/86400.;
     } else { // pas de bloc GPS...
-      tBlock0 = file->getStartMJD();
+      archParam.acq.tBlock0 = file->getStartMJD();
     }
     file->popMark();
@@ -195 +196 @@
   tStart = oldTStart;  // on restaure
   
-  if (perEch < 0)
-    perEch = file->perEchant();
+  if (archParam.acq.perEch < 0)
+    archParam.acq.perEch = file->perEchant();
 
   bool hasInterp = false;
@@ -221 +222 @@
         case sstStarZ:
         case sstStarF:
+        case sstStarT:
           file->needSSTProcessMask(SSTHandler::findStars);
           trigMask |= block_sst_mask;
           break;
         case sstDiode:
-          file->needSSTProcessMask(SSTHandler::rmveOffset);
+          file->needSSTProcessMask(SSTHandler::permDiode);
           trigMask |= block_sst_mask;
           break;
@@ -284 +286 @@
   for (set<string>::iterator i = copy.begin(); i != copy.end(); i++) {
     double smp = file1stSamp[*i];
-    double t   = tBlock0 + smp * perEch/86400.;
+    double t   = archParam.acq.tBlock0 + smp * archParam.acq.perEch/86400.;
     if (t>tEnd) {  // premier echantillon apres tEnd
      files.erase(*i);
@@ -416 +418 @@
      case sstStarZ:
      case sstStarF:
-       return (file->lastSST() != NULL) && (file->getSSTStarZ(index, imes) >= 0);
+     case sstStarT:{
+       if (file->lastSST() == NULL) return false;
+       int n = file->getNumbStar(imes);
+       return (n > 0 && imes < n);
+       }
      case gyroRaw:
        return (file->lastGyro() != NULL);
@@ -472 +478 @@
        return getSampleIndex();
      case internalTime:
-       return getSampleIndex() * perEch;
+       return getSampleIndex() * archParam.acq.perEch;
      case mjd:
        return getMJD();
@@ -487 +493 @@
      case sstStarF:
        return file->getSSTStarF(index, imes);
+     case sstStarT:
+       return file->getSSTStarT(index, imes);
      case gyroRaw:
        return file->getGyro(index, imes);
@@ -535 +543 @@
      case sstStarZ:
      case sstStarF:
+     case sstStarT:
        return file->blockNum() == file->getSSTBlockNum();
      case gyroRaw:
@@ -616 +625 @@
   if (!initDone) Init();
   int sample = getSampleIndex();
-  return tBlock0 + sample*perEch/86400.;
+  return archParam.acq.tBlock0 + sample*archParam.acq.perEch/86400.;
 }