Changeset 18953 for trunk/Mars/mcore

Timestamp:

03/05/18 16:30:25 (7 years ago)

Author:

tbretz

Message:

Implemented a specialized template for Entry::Get in case of a string, otherwise only the first word is returned; added id and comment to the Column to keep more details which are difficult to access later

File:

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

trunk/Mars/mcore/fits.h

@@ -85 +85 @@
             return t;
         }
+
+        /* Specialization needs to be outside namespace-scope, see below
+        template<>
+            std::string fits::Entry::Get<std::string>() const
+        {
+            return value;
+        }*/
     };
 
@@ -101 +108 @@
         struct Column
         {
+            size_t id;
             size_t offset;
             size_t num;
@@ -107 +115 @@
             char   type;
             std::string unit;
+            std::string comment;
             Compression_t comp;
         };
@@ -287 +296 @@
                 const std::string unit = Get<std::string>("TUNIT"+num, "");
                 const std::string comp = Get<std::string>("ZCTYP"+num, "");
+                const std::string comm = Get<std::string>("TCOMM"+num, "");
 
                 Compression_t compress = kCompUnknown;
@@ -331 +341 @@
                 }
 
-                const Table::Column col = { bytes, size_t(n), size, n*size, type, unit, compress};
+                const Table::Column col = { i, bytes, size_t(n), size, n*size, type, unit, comm, compress };
 
                 cols[id] = col;
@@ -1045 +1055 @@
 };
 
-#endif
+template<>
+std::string fits::Entry::Get<std::string>() const
+{
+    return value;
+}
+
+#endif