Changeset 363 in Sophya

Timestamp:

Aug 6, 1999, 11:58:04 PM (26 years ago)

Author:

ansari

Message:

Gestion tsid

Location:

trunk/Poubelle/archTOI.old

Files:

• archtoimain.cc (modified) (1 diff)
• asigps.cc (modified) (1 diff)
• asigps.h (modified) (1 diff)
• auxgps.h (modified) (1 diff)
• auxinterpgps.cc (modified) (1 diff)
• auxinterpgps.h (modified) (1 diff)
• toiiter.cc (modified) (5 diffs)
• toiiter.h (modified) (2 diffs)
• tsid.cc (added)
• tsid.h (added)

trunk/Poubelle/archTOI.old/archtoimain.cc

@@ -26 +26 @@
       return(-1);
     }
+    
     ArchTOI toi(argv[1]);
     toi.run(argv[2]);

trunk/Poubelle/archTOI.old/asigps.cc

@@ +1 @@
+// asigps.cc
+// Eric Aubourg         CEA/DAPNIA/SPP   aout 1999
+
 #include "asigps.h"
 #include <fstream.h>

trunk/Poubelle/archTOI.old/asigps.h

@@ +1 @@
+// asigps.h
+// Eric Aubourg         CEA/DAPNIA/SPP   aout 1999
+
 #ifndef ASIGPS_H
 #define ASIGPS_H

trunk/Poubelle/archTOI.old/auxgps.h

@@ +1 @@
+// auxgps.h
+// Eric Aubourg         CEA/DAPNIA/SPP   aout 1999
+
 #ifndef AUXGPS_H
 #define AUXGPS_H

trunk/Poubelle/archTOI.old/auxinterpgps.cc

@@ +1 @@
+// auxinterpgps.cc
+// Eric Aubourg         CEA/DAPNIA/SPP   aout 1999
+
 #include "auxinterpgps.h"
 #include "fitsio.h"

trunk/Poubelle/archTOI.old/auxinterpgps.h

@@ +1 @@
+// auxinterpgps.h
+// Eric Aubourg         CEA/DAPNIA/SPP   aout 1999
+
 #ifndef AUXINTERPGPS_H
 #define AUXINTERPGPS_H

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -386 +386 @@
    TOIKind kind = infos[column].kind;
    if (auxGPS && 
-       (kind == longitude || kind == latitude || kind == altitude)) {
+       (kind == longitude || kind == latitude || kind == altitude || kind == tsid)) {
          double dummy;
          return auxGPS->getLocation(getMJD(), dummy, dummy, dummy) == 0;
@@ -419 +419 @@
      case altitude:
        return file->hasGPSAlt();
+     case tsid:
+       return file->hasGPSPos();
      case azimut:
      case alphaAxis:
      case deltaAxis:
-       return (file->lastGPS() != NULL && file->lastSST() != NULL);
+       return false;
+       //return (file->lastGPS() != NULL && file->lastSST() != NULL);
+     case alphaSst:
+     case deltaSst:
+     case alphaBolo:
+     case deltaBolo:
+       return false;
+       
+     case boloTemp:
+       return false;
    }
    return false;
@@ -431 +442 @@
    TOIKind kind = infos[column].kind;
    if (auxGPS && 
-       (kind == longitude || kind == latitude || kind == altitude)) {
+       (kind == longitude || kind == latitude || kind == altitude || kind == tsid)) {
          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 (kind == altitude)  return alt;
+         if (kind == tsid) {
+           tSid.setLongitude(lon);
+           return tSid.getLST(getMJD());
+         }
    }
    if (rawIter) {
@@ -474 +489 @@
      case altitude:
        return file->getGPSAlt();
+     case tsid:
+       tSid.setLongitude(file->getGPSLong());
+       return tSid.getLST(getMJD());
      case azimut:
        return file->getAzimut(imes);
@@ -498 +516 @@
      case internalTime:
      case mjd:
+     case tsid:
        return true;
      case boloTens:

trunk/Poubelle/archTOI.old/toiiter.h

@@ -12 +12 @@
 #include "archeopsfile.h"
 #include "auxgps.h"
+#include "tsid.h"
 
 enum TOIKind {
@@ -128 +129 @@
    
    AuxGPS* auxGPS;
+   TSid tSid;
    
    private: