Changeset 409 in Sophya

Timestamp:

Sep 22, 1999, 11:56:54 AM (26 years ago)

Author:

ansari

Message:

nouvelles toi

Location:

trunk/Poubelle/archTOI.old

Files:

• Makefile (modified) (3 diffs)
• archeopsfile.cc (modified) (4 diffs)
• archeopsfile.h (modified) (1 diff)
• gpsparser.cc (modified) (7 diffs)

trunk/Poubelle/archTOI.old/Makefile

@@ -7 +7 @@
          ssthandler.o toiinterpolator.o gpsparser.o asigps.o \
          auxinterpgps.o tsid.o archparam.o dyffttools.o fft_mayer.o \
-         formepulse.o pisteetoile.o sstetoile.o transfelec.o
+         formepulse.o pisteetoile.o sstetoile.o transfelec.o \
+         gyrohandler.o
         $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lm 
 archdump: archtoidump.o archeopsfile.o decompress.o archeops.o ssthandler.o
@@ -14 +15 @@
 archeopsfile.o: archeopsfile.cc archeopsfile.h archeops.h \
  archeops_28.h ssthandler.h gpsparser.h compress.h
+#       cxx  -O -g -I../cfitsio  -c archeopsfile.cc -o archeopsfile.o -assume noaligned_objects
 archtoi.o: archtoi.cc archeopsfile.h archeops.h archeops_28.h \
  ssthandler.h gpsparser.h toisvr.h toiiter.h auxgps.h tsid.h archtoi.h \
@@ -54 +56 @@
 fft_mayer.o: fft_mayer.cc mayer_fft.h trigtbl.h
 archparam.o: archparam.cc archparam.h
+gyrohandler.o: gyrohandler.cc gyrohandler.h archeops.h archeops_28.h

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -675 +675 @@
 }
 #endif
-  
+
 long ArcheopsFile::searchNextBlock(long pos) {
   static char* buffer = 0;
@@ -692 +692 @@
     //if (read<taille_maxi_block_archeops*2) return -1; 
     // EA 150999 changed i+=4 to i++ -> unaligned, but can lose bytes in flight recorder
-    for (size_t i=4; i<read; i++) {
-      if (*(int4*)(buffer+i) == debswp) {
+#ifndef __DECCXX
+#define __unaligned 
+#endif
+     for (size_t i=4; i<read; i++) {
+      if (*(__unaligned int4*)(buffer+i) == debswp) {
         cout << "trying to skip " << i << " bytes to pos="<<pos+i << endl;
         return pos+i;
@@ -704 +707 @@
 }
 
-  
+
 
 
@@ -931 +934 @@
 }
 
+double ArcheopsFile::getMuVBolo2T(int ibolo, int imesure) {
+  return getMuVBolo2(ibolo, imesure) - getDACV(ibolo);
+}
 
 // SST, gyros...

trunk/Poubelle/archTOI.old/archeopsfile.h

@@ -135 +135 @@
   double getDACV(int ibolo); // offset en microvolt
   double getDACI(int ibolo); // courant en picoAmps
+  double getMuVBolo2T(int ibolo, int imesure); // avec soustraction dacV
   
   // SST, gyros, etc

trunk/Poubelle/archTOI.old/gpsparser.cc

@@ -83 +83 @@
   
   // UTC
+  if (*p < '0' || *p > '9') return;
   double t;
   sscanf(p, "%lg", &t);
@@ -94 +95 @@
   
   // LATITUDE
+  if (*p < '0' || *p > '9') return;
   sscanf(p, "%lg", &t);
   int d = int(t/100); t -= d*100;
@@ -108 +110 @@
 
   // LONGITUDE
+  if (*p < '0' || *p > '9') return;
   sscanf(p, "%lg", &t);
   d = int(t/100); t -= d*100;
@@ -130 +133 @@
   
   // NSAT
+  if (*p < '0' || *p > '9') return;
   sscanf(p, "%d", &nsat);
   p += 2;
@@ -136 +140 @@
   
   // HDOP
+  if (*p < '0' || *p > '9') return;
   sscanf(p, "%lg", &hdop);
   while (*p != ',' && p<fence) p++;
@@ -142 +147 @@
   
   // Altitude
+  if (*p < '0' || *p > '9') return;
   sscanf(p, "%lg", &alt);
   while (*p != ',' && p<fence) p++;
@@ -152 +158 @@
 
   // Geoid separation
+  if (*p < '0' || *p > '9') return;
   sscanf(p, "%lg", &gsep);
   while (*p != ',' && p<fence) p++;