Changeset 12737 for trunk/Mars

Timestamp:

12/22/11 15:47:41 (13 years ago)

Author:

tbretz

Message:

added an unordered_map to allow access to the read members by name

File:

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

trunk/Mars/mcore/fits.h

@@ -15 +15 @@
 #ifdef __CINT__
 #define off_t size_t
+#else
+#include <unordered_map>
 #endif
 
@@ -399 +401 @@
     Addresses fAddresses;
 
+#ifdef __CINT__
+    typedef map<string, void*> Pointers;
+#else
+    typedef unordered_map<string, void*> Pointers;
+#endif
+    Pointers fPointers;
+
+    vector<vector<char>> fGarbage;
+
     vector<char> fBufferRow;
     vector<char> fBufferDat;
@@ -614 +625 @@
     }
 
+    template<class T, class S>
+    const T &GetAs(const string &name)
+    {
+        return *reinterpret_cast<S*>(fPointers[name]);
+    }
+
+    void *SetPtrAddress(const string &name)
+    {
+        if (fTable.cols.count(name)==0)
+        {
+            ostringstream str;
+            str <<"SetPtrAddress('" << name << "') - Column not found." << endl;
+#ifdef __EXCEPTIONS
+            throw runtime_error(str.str());
+#else
+            gLog << ___err___ << "ERROR - " << str.str() << endl;
+            return NULL;
+#endif
+        }
+
+        fGarbage.push_back(vector<char>(fTable.cols[name].size*fTable.cols[name].num));
+
+        void *ptr = fGarbage.back().data();
+
+        fPointers[name] = ptr;
+        fAddresses.push_back(make_pair(ptr, fTable.cols[name]));
+        sort(fAddresses.begin(), fAddresses.end(), Compare);
+        return ptr;
+    }
+
     template<typename T>
     bool SetPtrAddress(const string &name, T *ptr, size_t cnt)
@@ -659 +700 @@
 
         //fAddresses[ptr] = fTable.cols[name];
+        fPointers[name] = ptr;
         fAddresses.push_back(make_pair(ptr, fTable.cols[name]));
         sort(fAddresses.begin(), fAddresses.end(), Compare);
@@ -706 +748 @@
 
         //fAddresses[ptr] = fTable.cols[name];
+        fPointers[name] = ptr;
         fAddresses.push_back(make_pair(ptr, fTable.cols[name]));
         sort(fAddresses.begin(), fAddresses.end(), Compare);
@@ -713 +756 @@
     bool     HasKey(const string &key) const { return fTable.HasKey(key); }
     bool     HasColumn(const string& col) const { return fTable.HasColumn(col);}
-    const Table::Columns &GetColumns() const { return fTable.getColumns();}
-    const Table::Keys &GetKeys() const { return fTable.getKeys();}
+    const Table::Columns &GetColumns() const { return fTable.GetColumns();}
+    const Table::Keys &GetKeys() const { return fTable.GetKeys();}
 
     int64_t  GetInt(const string &key) const { return fTable.Get<int64_t>(key); }