Changeset 17748

Timestamp:

05/01/14 17:30:50 (12 years ago)

Author:

tbretz

Message:

Minor simplifications.

File:

• trunk/Mars/mcore/zfits.h (modified) (2 diffs)

trunk/Mars/mcore/zfits.h

@@ -48 +48 @@
     virtual bool IsFileOk() const
     {
-        bool rawsum = true;
-
-        if (HasKey("RAWSUM"))
-        {
-                std::ostringstream str;
-                str << fRawsum.val();
-                rawsum = (GetStr("RAWSUM") == str.str());
-        }
-
+        if (!HasKey("RAWSUM"))
+            return fits::IsFileOk();
+
+        const bool rawsum = GetStr("RAWSUM") == std::to_string(fRawsum.val());
         return fits::IsFileOk() && rawsum;
     };
@@ -62 +57 @@
     size_t GetNumRows() const
     {
-        if (fTable.is_compressed)
-            return fTable.Get<size_t>("ZNAXIS2");
-        else
-            return fTable.Get<size_t>("NAXIS2");
-    }
+        return fTable.Get<size_t>(fTable.is_compressed ? "ZNAXIS2" : "NAXIS2");
+    }
+
     size_t GetBytesPerRow() const
     {
-        if (fTable.is_compressed)
-            return fTable.Get<size_t>("ZNAXIS1");
-        else
-            return fTable.Get<size_t>("NAXIS1");
+        return fTable.Get<size_t>(fTable.is_compressed ? "ZNAXIS1" : "NAXIS1");
     }