Changeset 12732

Timestamp:

12/22/11 12:19:16 (13 years ago)

Author:

tbretz

Message:

Adapted memember function names to Mars convention; fixed a type in a log-stream

File:

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

trunk/Mars/mcore/fits.h

@@ -347 +347 @@
         }
 
-        const Columns& getColumns() const
+        const Columns &GetColumns() const
         {
             return cols;
         }
 
-        const Keys& getKeys() const
+        const Keys &GetKeys() const
         {
             return keys;
         }
 
-
-
-            // Values of keys are always signed
+        // Values of keys are always signed
         template<typename T>
             T Get(const string &key) const
@@ -378 +376 @@
         }
 
-            // Values of keys are always signed
+        // Values of keys are always signed
         template<typename T>
             T Get(const string &key, const string &deflt) const
@@ -504 +502 @@
                         throw runtime_error("END keyword missing in FITS header.");
 #else
-                        gLog << ___err__ << "ERROR - END keyword missing in FITS file... file might be corrupted." << endl;
+                        gLog << ___err___ << "ERROR - END keyword missing in FITS file... file might be corrupted." << endl;
                         return;
 #endif
@@ -715 +713 @@
     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); }