Changeset 358 in Sophya

Timestamp:

Aug 6, 1999, 3:46:37 PM (26 years ago)

Author:

ansari

Message:

auxilliary GPS

Location:

trunk/Poubelle/archTOI.old

Files:

• archtoi.cc (modified) (2 diffs)
• asigps.cc (added)
• asigps.h (added)
• auxgps.h (added)
• auxinterpgps.cc (added)
• auxinterpgps.h (added)
• toiiter.cc (modified) (9 diffs)
• toiiter.h (modified) (3 diffs)
• toisvr.cc (modified) (1 diff)
• toisvr.h (modified) (2 diffs)

trunk/Poubelle/archTOI.old/archtoi.cc

@@ -11 +11 @@
 #include "toisvr.h"
 #include "archtoi.h"
+#include "asigps.h"
 
 using namespace std; 
@@ -159 +160 @@
     sscanf(arg.c_str(), "%lg", &t0);
     svr.SetPerEch(t0);
+  } else if (key == "#ASIGPS") {
+    ASIGPS* gps = new ASIGPS(arg);
+    gps->FitsDump("GPSDump.fits");
+    svr.UseAuxGPS(gps);
   } else if (key == "#END") {
     return false;

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -38 +38 @@
  lastSample = -1;
  maxLookAhead = 10000;
+ 
+ auxGPS = NULL;
 
 }
@@ -72 +74 @@
   lastSample = x.lastSample;
   maxLookAhead = x.maxLookAhead;
+  
+  auxGPS = x.auxGPS; 
+  if (auxGPS) auxGPS = auxGPS->clone();
 }
 
@@ -78 +83 @@
   delete rawIter;
   delete[] interp;
+  delete auxGPS;
 }
 
@@ -311 +317 @@
   while (1) {
     if (!NextSample()) return false; // end of files
-    double t = tBlock0+(file->blockNum() * file->nEchBlock() + imes) * perEch/86400.;
+    double t = getMJD();
     if (t < tStart) continue;
     if (t > tEnd) return false;
@@ -378 +384 @@
 bool TOIIter::canGetValue(int column) {
    if (column < 0 || column >= infos.size()) return false;
+   TOIKind kind = infos[column].kind;
+   if (auxGPS && 
+       (kind == longitude || kind == latitude || kind == altitude)) {
+         double dummy;
+         return auxGPS->getLocation(getMJD(), dummy, dummy, dummy) == 0;
+   }
    if (rawIter) {
        return interp[column].canGet(lastSample);
    }
-   TOIKind kind = infos[column].kind;
    int index = infos[column].index;
    switch (kind) {
@@ -418 +429 @@
 double TOIIter::getValue(int column) {
    if (column < 0 || column >= infos.size()) return -1;
+   TOIKind kind = infos[column].kind;
+   if (auxGPS && 
+       (kind == longitude || kind == latitude || kind == altitude)) {
+         double lat,lon,alt;
+         if (auxGPS->getLocation(getMJD(), lat, lon, alt)) return -99999;
+         if (kind == longitude) return lon;
+         if (kind == latitude)  return lat;
+         if (kind == altitude)  return alt;         
+   }
    if (rawIter) {
      if (infos[column].interpolated)
@@ -424 +444 @@
        return interp[column].getEValue(lastSample);
    }
-   TOIKind kind = infos[column].kind;
    int index = infos[column].index;
    switch (kind) {
      case sampleNum:
-       return file->blockNum() * file->nEchBlock() + imes;
+       return getSampleIndex();
      case internalTime:
-       //return (file->blockNum() * file->nEchBlock() + imes) * file->perEchant();
-       return (file->blockNum() * file->nEchBlock() + imes) * perEch;
+       return getSampleIndex() * perEch;
      case mjd:
-      /* printf("mjd: %d %d %g %g %g\n",file->blockNum(),
-         (file->blockNum() * file->nEchBlock() + imes),
-         file->perEchant(),
-         (file->blockNum() * file->nEchBlock() + imes) * file->perEchant()/86400.,
-         tBlock0+(file->blockNum() * file->nEchBlock() + imes) * file->perEchant()/86400.); */
-       //return tBlock0+(file->blockNum() * file->nEchBlock() + imes) * file->perEchant()/86400.;
-       return tBlock0+(file->blockNum() * file->nEchBlock() + imes) * perEch/86400.;
+       return getMJD();
      case boloTens:
        return file->getMuVBolo(index, imes);
@@ -474 +486 @@
 bool   TOIIter::newValue(int column) {
    if (column < 0 || column >= infos.size()) return false;
+   TOIKind kind = infos[column].kind;
+   if (auxGPS && 
+       (kind == longitude || kind == latitude || kind == altitude)) {
+      return true;
+   }
    if (rawIter) {
        return interp[column].isNewValue(lastSample);
    }
-   TOIKind kind = infos[column].kind;
    switch (kind) {
      case sampleNum:
@@ -567 +583 @@
    }
 }
+
+double TOIIter::getMJD() {
+  int sample = getSampleIndex();
+  return tBlock0 + sample*perEch/86400.;
+}
  
 bool TOIIter::fetchAhead() { // Seulement si delegation

trunk/Poubelle/archTOI.old/toiiter.h

@@ -11 +11 @@
 #include <string>
 #include "archeopsfile.h"
+#include "auxgps.h"
 
 enum TOIKind {
@@ -61 +62 @@
    int    getBlockSampleIndex();        // numero d''echantillon dans dernier bloc bolo
    int    getSampleIndex();             // numero d''echantillon 
+   double getMJD();            
 
    block_type_param*         lastParam();  
@@ -125 +127 @@
    bool fetchAhead(); // avance d''une TOI en nourrissant les interpolateurs
    
+   AuxGPS* auxGPS;
+   
    private:
 };

trunk/Poubelle/archTOI.old/toisvr.cc

@@ -15 +15 @@
   iter.files.insert(f);
 }
+
+void TOISvr::UseAuxGPS(AuxGPS* gps) {
+  if (iter.auxGPS) delete iter.auxGPS;
+  iter.auxGPS = gps;
+}
+
 
 void TOISvr::SetMJD0(double t0) {

trunk/Poubelle/archTOI.old/toisvr.h

@@ -7 +7 @@
 
 #include "toiiter.h"
+
+class AuxGPS;
 
 class TOISvr {
@@ -17 +19 @@
   void SetMJD0(double);
   void SetPerEch(double);
+  void UseAuxGPS(AuxGPS* gps);
   
   void SetTimeInterval(double tStart, double tEnd);