Changeset 17284

Timestamp:

10/21/13 12:04:02 (11 years ago)

Author:

lyard

Message:

added special case for sanity checks if calibration table is compressed

File:

• trunk/Mars/mcore/factfits.h (modified) (1 diff)

trunk/Mars/mcore/factfits.h

@@ -157 +157 @@
             clear(rdstate()|std::ios::badbit);
 #ifdef __EXCEPTIONS
-            throw std::runtime_error("Table 'DrsCalib' found, but first column is not the one expected");
-#else
-            gLog << ___err___ << "ERROR - Table 'DrsCalib' found, but first column is not the one expected" << std::endl;
-            return;
-#endif
-        }
-        if (calib.GetStr("TFORM1") != "1474560I")  // 1024*1440
-        {
-            clear(rdstate()|std::ios::badbit);
-#ifdef __EXCEPTIONS
-            throw std::runtime_error("Table 'DrsCalib' has wrong column format (TFROM1)");
-#else
-            gLog << ___err___ << "ERROR - Table 'DrsCalib' has wrong column format (TFORM1)" << std::endl;
+            throw std::runtime_error("Table 'ZDrsCellOffsets' found, but first column is not the one expected");
+#else
+            gLog << ___err___ << "ERROR - Table 'ZDrsCellOffsets' found, but first column is not the one expected" << std::endl;
+            return;
+#endif
+        }
+        bool isColumnPresent = false;
+        if (calib.HasKey("TFORM1") && calib.GetStr("TFORM1") == "1474560I") isColumnPresent = true;
+        if (calib.HasKey("ZFORM1") && calib.GetStr("ZFORM1") == "1474560I") isColumnPresent = true;
+        if (!isColumnPresent)  // 1024*1440
+        {
+            clear(rdstate()|std::ios::badbit);
+#ifdef __EXCEPTIONS
+            throw std::runtime_error("Table 'ZDrsCellOffsets' has wrong column format (TFROM1)");
+#else
+            gLog << ___err___ << "ERROR - Table 'ZDrsCellOffsets' has wrong column format (TFORM1)" << std::endl;
             return;
 #endif