Changeset 16897 for trunk/Mars/mcore

Timestamp:

06/24/13 15:57:53 (11 years ago)

Author:

lyard

Message:

Removed bytes swapping for RAWSUM

Location:

trunk/Mars/mcore

Files:

• checksum.h (modified) (4 diffs)
• zfits.h (modified) (4 diffs)

trunk/Mars/mcore/checksum.h

@@ -47 +47 @@
 
 
-    bool add(const char *buf, size_t len)
+    bool add(const char *buf, size_t len, bool big_endian = true)
     {
         // Avoid overflows in carry bits
@@ -73 +73 @@
         uint32_t *hilo  = reinterpret_cast<uint32_t*>(&buffer);
 
+
+        const uint16_t *end = sbuf + len/2;
+
+        if (big_endian)
+            addLoopSwapping(sbuf, end, hilo);
+        else
+            addLoop(sbuf, end, hilo);
+        /*const uint16_t *end = sbuf + len/2;
+        while (1)
+        {
+            if (sbuf==end)
+                break;
+
+            hilo[0] += ntohs(*sbuf++);
+
+            if (sbuf==end)
+                break;
+
+            hilo[1] += ntohs(*sbuf++);
+        }*/
+
+        HandleCarryBits();
+
+        return true;
+    }
+
+    void addLoopSwapping(const uint16_t *sbuf, const uint16_t *end, uint32_t* hilo)
+    {
         /*
         for (size_t i = 0; i < len/2; i++)
@@ -83 +111 @@
         // This is about as twice as fast as the loop above
         // ntohs is CPU optimized, i%2 doesn't need to be computed
-        const uint16_t *end = sbuf + len/2;
         while (1)
         {
@@ -96 +123 @@
             hilo[1] += ntohs(*sbuf++);
         }
-
-        HandleCarryBits();
-
-        return true;
-    }
-
-    bool add(const vector<char> &v)
-    {
-        return add(v.data(), v.size());
+    }
+
+    void addLoop(const uint16_t *sbuf, const uint16_t *end, uint32_t* hilo)
+    {
+        while (1)
+        {
+            if (sbuf==end)
+                break;
+
+            hilo[0] += ntohs(*sbuf++);
+
+            if (sbuf==end)
+                break;
+
+            hilo[1] += ntohs(*sbuf++);
+        }
+    }
+
+    bool add(const vector<char> &v, bool big_endian = true)
+    {
+        return add(v.data(), v.size(), big_endian);
     }
 

trunk/Mars/mcore/zfits.h

@@ -70 +70 @@
     }
 
+    virtual bool IsFileOk() const
+    {
+        bool rawsum = true;
+
+        if (HasKey("RAWSUM"))
+        {
+                ostringstream str;
+                str << fRawsum.val();
+                rawsum = (GetStr("RAWSUM") == str.str());
+        }
+
+        return fits::IsFileOk() && rawsum;
+    };
+
 protected:
 
@@ -130 +144 @@
 
         if (fTable.is_compressed)
-        {
-            for (auto it=fTable.sorted_cols.begin(); it!= fTable.sorted_cols.end(); it++)
+        for (auto it=fTable.sorted_cols.begin(); it!= fTable.sorted_cols.end(); it++)
+            if (it->comp != kCompFACT)
             {
                 if (it->comp == kCompFACT)
@@ -190 +204 @@
     vector<size_t>                         fTileSize; ///< size in bytes of each compressed tile
     vector<vector<size_t>>                 fTileOffsets; ///< offset from start of tile of a given compressed column
+
+    Checksum fRawsum;   ///< Checksum of the uncompressed, raw data
 
     // Get buffer space
@@ -270 +286 @@
     //overrides fits.h method with empty one
     //work is done in ReadBinaryRow because it requires volatile data from ReadBinaryRow
-    virtual void WriteRowToCopyFile(size_t )
-    {
-
+    virtual void WriteRowToCopyFile(size_t row)
+    {
+        if (row == fRow+1)
+            fRawsum.add(fBufferRow, false);
     }