Changeset 419 in Sophya

Timestamp:

Sep 23, 1999, 1:09:36 PM (26 years ago)

Author:

ansari

Message:

nouvelles tois

Location:

trunk/Poubelle/archTOI.old

Files:

• aa_hadec.c (added)
• aa_hadec.h (added)
• archeopsfile.cc (modified) (1 diff)
• archeopsfile.h (modified) (1 diff)
• templocator.cc (added)
• templocator.h (added)
• toiiter.cc (modified) (5 diffs)
• toiiter.h (modified) (1 diff)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -1079 +1079 @@
 
 
-double ArcheopsFile::getAzimut(int imesure) {return imesure*360/nEchBlock();}
+double ArcheopsFile::getAzimut(int imesure) {return 0;}
 double ArcheopsFile::getPendDirect(int /*imesure*/) {return 0;}
 double ArcheopsFile::getPendOrth(int /*imesure*/) {return 0;}
-double ArcheopsFile::getAlpha(int /*imesure*/) {return 0;}
-double ArcheopsFile::getDelta(int /*imesure*/) {return 0;}
+double ArcheopsFile::getAlphaAxis(int /*imesure*/) {return 0;}
+double ArcheopsFile::getDeltaAxis(int /*imesure*/) {return 0;}

trunk/Poubelle/archTOI.old/archeopsfile.h

@@ -168 +168 @@
   double getPendOrth(int imesure);
   
-  double getAlpha(int imesure);
-  double getDelta(int imesure);
+  double getAlphaAxis(int imesure);
+  double getDeltaAxis(int imesure);
   
   static double decodeMJD(string const& dateString); // sans tenir compte de TU-TLeg

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -16 +16 @@
 #include <dirent.h>
 #include <iostream.h>
+#include "templocator.h"
 
 // Format bloc GPS
@@ -238 +239 @@
         break;
       case azimut:
-        file->needSSTProcessMask(SSTHandler::findPeriod);
-        trigMask |= block_sst_mask;
+        trigMask |= block_bolo_mask;
+        //file->needSSTProcessMask(SSTHandler::findPeriod);
+        //trigMask |= block_sst_mask;
         break;
       case sstStarCnt:
@@ -270 +272 @@
       case alphaBolo:
       case deltaBolo:
-        file->needSSTProcessMask(SSTHandler::findAxis);
-        trigMask |= block_sst_mask;
+        trigMask |= block_bolo_mask;
+        //file->needSSTProcessMask(SSTHandler::findAxis);
+        //trigMask |= block_sst_mask;
         break;
       }
@@ -484 +487 @@
    case alphaAxis:
    case deltaAxis:
-     return false;
+     return true;
      //return (file->lastGPS() != NULL && file->lastSST() != NULL);
    case alphaSst:
@@ -587 +590 @@
      return tSid.getLST(getMJD());
    case azimut:
-     return file->getAzimut(imes);
    case alphaAxis:
-     return file->getAlpha(imes);
-   case deltaAxis:
-     return file->getDelta(imes);
+   case deltaAxis: {
+        double lat, lon;
+        if (auxGPS) {
+          double alti;
+          auxGPS->getLocation(getMJD(), lat, lon, alti);
+        } else {
+          lon = file->getGPSLong();
+          lat = file->getGPSLat();
+        }
+        tSid.setLongitude(lon);
+        double ts = tSid.getLST(getMJD());
+        tempLocator.setEarthPos(lon, lat);
+        tempLocator.setTSid(ts);
+        if ((kind) == alphaAxis) return tempLocator.getAlphaZenith();
+        if ((kind) == deltaAxis) return tempLocator.getDeltaZenith();
+        return 0;
+     }
    }
    return -1;

trunk/Poubelle/archTOI.old/toiiter.h

@@ -43 +43 @@
   gyroSpeed,     // vitesse gyro, deg/s, index = 0,1,2, calibree...
   gpsTime,       // temps fourni par GPS
-  longitude,     // position ballon, degrees
-  latitude,      // position ballon, degrees
+  longitude,     // position ballon, degrees  +=EST
+  latitude,      // position ballon, degrees  +=NORD
   altitude,      // position ballon, m
   tsid,          // temps sideral en secondes