Changeset 17911 for trunk/Mars

Timestamp:

06/16/14 17:40:48 (10 years ago)

Author:

tbretz

Message:

Added a possibility to turn off exceptions for SetPtrAddress operations

File:

• trunk/Mars/mcore/fits.h (modified) (12 diffs)

trunk/Mars/mcore/fits.h

@@ -61 +61 @@
         kCompUnknown,
         kCompFACT
+    };
+
+    enum fitsstate
+    {
+        throwbit = 8
     };
 
@@ -477 +482 @@
     };
 
+    void Exception(const std::string &txt)
+    {
+#ifdef __EXCEPTIONS
+        if (exceptions()&throwbit)
+            throw std::runtime_error(txt);
+#endif
+        gLog << ___err___ << "ERROR - " << txt << std::endl;
+    }
+
 protected:
     std::ofstream fCopy;
@@ -559 +573 @@
         if (!good())
             return;
+
+        EnableAddressExceptions();
 
         if (memcmp(simple, "SIMPLE  = ", 10))
@@ -697 +713 @@
         {
 #ifdef __EXCEPTIONS
-            throw std::runtime_error("You are trying to read a compressed fits with the base fits class. Please use factfits instead.");
-#else
-            gLog << ___err___ << "ERROR - You are trying to read a compressed fits with the base fits class. Please use factfits instead." << std::endl;
+            throw std::runtime_error("Trying to read a compressed fits with the base fits class. Use factfits instead.");
+#else
+            gLog << ___err___ << "ERROR - Trying to read a compressed fits with the base fits class. Use factfits instead." << std::endl;
 #endif
             clear(rdstate()|std::ios::badbit);
@@ -711 +727 @@
         {
 #ifdef __EXCEPTIONS
-            throw std::runtime_error("You are trying to read a compressed fits with the base fits class. Please use factfits instead.");
-#else
-            gLog << ___err___ << "ERROR - You are trying to read a compressed fits with the base fits class. Please use factfits instead." << std::endl;
+            throw std::runtime_error("Trying to read a compressed fits with the base fits class. Use factfits instead.");
+#else
+            gLog << ___err___ << "ERROR - Trying to read a compressed fits with the base fits class. Use factfits instead." << std::endl;
 #endif
             clear(rdstate()|std::ios::badbit);
@@ -853 +869 @@
     }
 
+    void EnableAddressExceptions(bool b=true)
+    {
+        if (b)
+            exceptions(iostate(throwbit));
+        else
+            exceptions(iostate(exceptions()&~throwbit));
+    }
+
+    void DisableAddressExceptions()
+    {
+        EnableAddressExceptions(false);
+    }
+
     void *SetPtrAddress(const std::string &name)
     {
@@ -859 +888 @@
             std::ostringstream str;
             str << "SetPtrAddress('" << name << "') - Column not found.";
-#ifdef __EXCEPTIONS
-            throw std::runtime_error(str.str());
-#else
-            gLog << ___err___ << "ERROR - " << str.str() << std::endl;
+            Exception(str.str());
             return NULL;
-#endif
         }
 
@@ -888 +913 @@
             std::ostringstream str;
             str << "SetPtrAddress('" << name << "') - Column not found.";
-#ifdef __EXCEPTIONS
-            throw std::runtime_error(str.str());
-#else
-            gLog << ___err___ << "ERROR - " << str.str() << std::endl;
+            Exception(str.str());
             return false;
-#endif
         }
 
@@ -901 +922 @@
             str << "SetPtrAddress('" << name << "') - Element size mismatch: expected "
                 << fTable.cols[name].size << " from header, got " << sizeof(T);
-#ifdef __EXCEPTIONS
-            throw std::runtime_error(str.str());
-#else
-            gLog << ___err___ << "ERROR - " << str.str() << std::endl;
+            Exception(str.str());
             return false;
-#endif
         }
 
@@ -914 +931 @@
             str << "SetPtrAddress('" << name << "') - Element count mismatch: expected "
                 << fTable.cols[name].num << " from header, got " << cnt;
-#ifdef __EXCEPTIONS
-            throw std::runtime_error(str.str());
-#else
-            gLog << ___err___ << "ERROR - " << str.str() << std::endl;
+            Exception(str.str());
             return false;
-#endif
         }
 
@@ -962 +975 @@
             std::ostringstream str;
             str <<"SetPtrAddress('" << name << "') - Column not found.";
-#ifdef __EXCEPTIONS
-            throw std::runtime_error(str.str());
-#else
-            gLog << ___err___ << "ERROR - " << str.str() << std::endl;
+            Exception(str.str());
             return false;
-#endif
         }
 
@@ -975 +984 @@
             str << "SetPtrAddress('" << name << "') - Element count mismatch: expected "
                 << fTable.cols[name].num << " from header, got " << cnt;
-#ifdef __EXCEPTIONS
-            throw std::runtime_error(str.str());
-#else
-            gLog << ___err___ << "ERROR - " << str.str() << std::endl;
+            Exception(str.str());
             return false;
-#endif
         }