Changeset 407 in Sophya for trunk/Poubelle/archTOI.old/archeopsfile.cc

Timestamp:

Sep 18, 1999, 2:08:23 PM (26 years ago)

Author:

ansari

Message:

apres grenoble

File:

• trunk/Poubelle/archTOI.old/archeopsfile.cc (modified) (9 diffs)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -5 +5 @@
 #define utilitaires_de_block_archeops
 #include "archeopsfile.h"
+#include "gyrohandler.h"
+
 extern "C" {
 #include "compress.h"
@@ -41 +43 @@
   block_type_modele         peekBlock;
   
-  SSTHandler sstHandler;
-  GPSParser  gpsParser;
+  SSTHandler   sstHandler;
+  GyroHandler  gyroHandler;
+  GPSParser    gpsParser;
 };
 
@@ -85 +88 @@
 
 BlockSet::BlockSet(BlockSet const& x) 
-: sstHandler(x.sstHandler)
+: sstHandler(x.sstHandler), gyroHandler(x.gyroHandler)
 {
   lastParam      = NULL;
@@ -567 +570 @@
        blockSet->sstHandler.ProcessBlock((block_type_sst*)&blockSet->curBlock);
      }
+     case block_gyro : {
+       blockSet->gyroHandler.ProcessBlock((block_type_gyro*)&blockSet->curBlock);
+     }
      case block_gps : {
        blockSet->gpsParser.ProcessBlock((block_type_gps*)&blockSet->curBlock);
@@ -673 +679 @@
   static char* buffer = 0;
   static int4  debswp = debut_block_mesure;
-  static int4  longmax = taille_maxi_block_archeops*20;
+  static int4  longmax = taille_maxi_block_archeops*20; 
   if (!buffer) {
     buffer = new char[longmax];
@@ -680 +686 @@
 #endif
   }
-  fseek(f,pos,SEEK_SET);
-  size_t read = fread(buffer,1,taille_maxi_block_archeops*2,f);
-  //if (read<taille_maxi_block_archeops*2) return -1;
-  for (int i=4; i<read; i+=4) {
-    if (*(int4*)(buffer+i) == debswp) {
-      cout << "trying to skip " << i << " bytes to pos="<<pos+i << endl;
-      return pos+i;
+  size_t read = longmax;
+  while (read == longmax) {
+    fseek(f,pos,SEEK_SET);
+    read = fread(buffer,1,longmax,f);
+    //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) {
+        cout << "trying to skip " << i << " bytes to pos="<<pos+i << endl;
+        return pos+i;
+      }
     }
+    pos += read;
   }
   cout << "cannot find block start" << endl;
@@ -758 +769 @@
 }
 
+int ArcheopsFile::getReglageBlockNum() {
+  if (!lastReglage()) return -1;
+  return numero_block(lastReglage());
+}
+
+
 int ArcheopsFile::getSSTBlockNum() {
   if (!lastSST()) return -1;
@@ -864 +881 @@
 }
 
+double ArcheopsFile::getGainAmpli(int ibolo) {
+     return gain_ampli(lastReglage()->reglage.bolo[ibolo]);
+}
 
 // SST, gyros...
@@ -895 +915 @@
 }
 
-long ArcheopsFile::getGyro(int igyro, int imesure) {   
-  if (igyro<0 || igyro>2) return 0;
-  if (imesure<0 || imesure>= nb_per_block*2) return 0;
-  block_type_gyro* blk = lastGyro() ;
-  if (!blk) return 0;
-#if version_num<=25
-  return blk->gyros[igyro][imesure]-32768.;
-#else
-  return blk->gyro[igyro][imesure]-32768.;
-#endif
-}
+long ArcheopsFile::getGyroRaw(int igyro, int imesure) {   
+  return blockSet->gyroHandler.getRawSignal(imesure, igyro);
+}
+
+double ArcheopsFile::getGyroTens(int igyro, int imesure) {   
+  return blockSet->gyroHandler.getSignal(imesure, igyro);
+}
+
+double ArcheopsFile::getGyroSpeed(int igyro, int imesure) {   
+  return blockSet->gyroHandler.getSpeed(imesure, igyro);
+}
+
+