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

Timestamp:

Aug 4, 1999, 4:10:06 PM (26 years ago)

Author:

ansari

Message:

Gestion TRANGE, MJD0, PERECH....

File:

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

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ +1 @@
+// archeopsfile.cc
+// Eric Aubourg         CEA/DAPNIA/SPP   juillet 1999
+
+
 #define utilitaires_de_block_archeops
 #include "archeopsfile.h"
@@ -335 +339 @@
         type_block(peekBlock) < 0 || type_block(peekBlock) > 19 ||
         longueur_block(peekBlock) != long_block[type_block(peekBlock)]) {
-      cout << "block de type/longueur invalide" << endl;
+      cout << "invalid block, bad type or length" << endl;
       memset(peekBlock, 0, sizeof(block_type_modele)); // don't keep trash...
       peekPos = searchNextBlock(peekPos);
@@ -343 +347 @@
     swapContent(peekBlock);
     if (verifie_block(peekBlock) != block_correct) {
-      cout << "block invalide " << numero_block(peekBlock);
+      cout << "invalid block " << numero_block(peekBlock);
       if (!fixBlock(peekBlock)) {
         cout << " -- skipped" << endl;
@@ -378 +382 @@
 }
 
-bool ArcheopsFile::fixBlock(block_type_modele* blk) {
+bool ArcheopsFile::fixBlock(block_type_modele* ) {
   return false;
 }
@@ -505 +509 @@
            #else
            block_type_param* param = lastParam();
+           if (!param) return;
            int jc=0;for(int j=0;j<nb_max_bolo;j++)       // jc = bolo_comprime  //   j=bolo normal
            {
@@ -730 +735 @@
   if (*p2 == ':' || *p2 == '/') p2++;
   if (*p2 == 'h') p2++;
-  if (!strncmp(p2, "ARK",3)) {
+  if (!strncmp(p2, "ARK",3) || !strncmp(p2,"ark",3)) {
     rawMJD = 1377.4;
   } else {
@@ -806 +811 @@
 bool ArcheopsFile::hasGPSTime() { 
   if (!lastGPS()) return false;
-  return blockSet->gpsParser.hasGPSTime();
+ // return blockSet->gpsParser.hasGPSTime();
+  return blockSet->gpsParser.hasTime();
 }