Changeset 17777 for trunk

Timestamp:

05/05/14 09:44:50 (10 years ago)

Author:

tbretz

Message:

Solved the problem that so far cint does not define __MARS__; added an option to PrintKeys; remove all reserved keywords from the list of printed keys; some minor code cleanup.

File:

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

trunk/Mars/mcore/fits.h

@@ -23 +23 @@
 #endif
 
-#ifndef __MARS__
+#if defined(__MARS__) || defined(__CINT__)
+#include "MLog.h"
+#include "MLogManip.h"
+#define ___err___   err
+#define ___warn___  warn
+#define ___all___   all
+#else
 #include <vector>
 #include <iomanip>
@@ -33 +39 @@
 #define ___all___   ""
 #endif
-#else
-#include "MLog.h"
-#include "MLogManip.h"
-#define ___err___   err
-#define ___warn___  warn
-#define ___all___   all
 #endif
 
@@ -49 +49 @@
 #endif
 
+#include "FITS.h"
 #include "checksum.h"
 
@@ -171 +172 @@
         Keys ParseBlock(const std::vector<std::string> &vec) const
         {
-            std::map<std::string,Entry> rc;
+            Keys rc;
 
             for (unsigned int i=0; i<vec.size(); i++)
@@ -203 +204 @@
                     // Set value, comment and type
                     // comments could be just spaces. take care of this.
-                    if (ppp!=std::string::npos && val.size() != ppp+1)
+                    if (ppp!=std::string::npos && val.size()!=ppp+1)
                         com = Trim(val.substr(ppp+1));
 
@@ -213 +214 @@
                     const size_t p = val.find_first_of('/');
 
-                    if (val.size() != p+1)
+                    if (p!=std::string::npos && val.size()!=p+1)
                         com = Trim(val.substr(p+2));
 
@@ -265 +266 @@
             num_rows      = is_compressed ? Get<size_t>("ZNAXIS2") : Get<size_t>("NAXIS2");
             num_cols      = Get<size_t>("TFIELDS");
-            datasum       = is_compressed ? Get<int64_t>("DATASUM", -1) : Get<int64_t>("DATASUM", -1);
-//cout << "IS COMPRESSED =-========= " << is_compressed << " " << Get<size_t>("NAXIS1") << endl;
+            datasum       = Get<int64_t>("DATASUM", -1);
             size_t bytes = 0;
 
@@ -329 +329 @@
 
                 cols[id] = col;
-                sorted_cols.push_back(col);
+                sorted_cols.emplace_back(col);
                 bytes  += n*size;
             }
@@ -353 +353 @@
             for (Keys::const_iterator it=keys.cbegin(); it!=keys.cend(); it++)
             {
-                if (!display_all &&
-                    (it->first.substr(0, 6)=="TTYPE" ||
-                     it->first.substr(0, 6)=="TFORM" ||
-                     it->first.substr(0, 6)=="TUNIT" ||
-                     it->first=="TFIELDS"  ||
-                     it->first=="XTENSION" ||
-                     it->first=="NAXIS"    ||
-                     it->first=="BITPIX"   ||
-                     it->first=="PCOUNT"   ||
-                     it->first=="GCOUNT")
-                   )
+                if (!display_all && FITS::IsReservedKeyWord(it->first))
                     continue;
 
                 gLog << ___all___ << std::setw(2) << it->second.type << '|' << it->first << '=' << it->second.value << '/' << it->second.comment << '|' << std::endl;
-            }}
+            }
+        }
 
         void PrintColumns() const
@@ -423 +414 @@
             T Get(const std::string &key) const
         {
-            const std::map<std::string,Entry>::const_iterator it = keys.find(key);
+            const Keys::const_iterator it = keys.find(key);
             if (it==keys.end())
             {
@@ -442 +433 @@
             T Get(const std::string &key, const T &deflt) const
         {
-            const std::map<std::string,Entry>::const_iterator it = keys.find(key);
+            const Keys::const_iterator it = keys.find(key);
             return it==keys.end() ? deflt :it->second.Get<T>();
         }
@@ -543 +534 @@
             }
 
-            vec.push_back(str);
+            vec.emplace_back(str);
         }
 
@@ -1023 +1014 @@
     operator bool() const { return fTable && fTable.offset!=0; }
 
-    void PrintKeys() const { fTable.PrintKeys(); }
+    void PrintKeys(bool all_keys=false) const { fTable.PrintKeys(all_keys); }
     void PrintColumns() const { fTable.PrintColumns(); }