Changeset 11964 for trunk

Timestamp:

09/05/11 16:25:15 (13 years ago)

Author:

tbretz

Message:

Added default values to the getter, allow TUNIT to be empty.

File:

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

trunk/Mars/mcore/fits.h

@@ -227 +227 @@
                 const string id   = Get<string>("TTYPE"+num.str());
                 const string fmt  = Get<string>("TFORM"+num.str());
-                const string unit = Get<string>("TUNIT"+num.str());
+                const string unit = Get<string>("TUNIT"+num.str(), "");
 
                 istringstream sin(fmt);
@@ -359 +359 @@
         }
 
+            // Values of keys are always signed
+        template<typename T>
+            T Get(const string &key, const string &deflt) const
+        {
+            const map<string,Entry>::const_iterator it = keys.find(key);
+            return it==keys.end() ? deflt :it->second.Get<T>();
+        }
+
         size_t GetN(const string &key) const
         {
@@ -641 +649 @@
     }
 
+    template<typename T>
+        T Get(const string &key, const string &deflt) const
+    {
+        return fTable.Get<T>(key, deflt);
+    }
+
     bool SetPtrAddress(const string &name, void *ptr)
     {