Changeset 16820 for trunk/FACT++

Timestamp:

06/13/13 08:55:25 (11 years ago)

Author:

lyard

Message:

Modified block header's sequence scheme

File:

• trunk/FACT++/src/fitsCompressor.cc (modified) (2 diffs)

trunk/FACT++/src/fitsCompressor.cc

@@ -1300 +1300 @@
             {
                 case FACT_RAW:
-                    if (head.numProcs == 1)
+//                    if (head.numProcs == 1)
                         compressedOffset += compressUNCOMPRESSED(&(_compressedBuffer[threadIndex][compressedOffset]), &(_transposedBuffer[threadIndex][offset]), thisRoundNumRows, _columns[i].sizeOfElems(), _columns[i].numElems());
                 break;
@@ -1656 +1656 @@
         //get header structures
         BlockHeader rawHeader;
-        BlockHeader smoothmanHeader(0, FACT_ROW_MAJOR, 3);
+        BlockHeader smoothmanHeader(0, FACT_ROW_MAJOR, 2);
         vector<uint16_t> rawProcessings(1);
         rawProcessings[0] = FACT_RAW;
-        vector<uint16_t> smoothmanProcessings(3);
+        vector<uint16_t> smoothmanProcessings(2);
         smoothmanProcessings[0] = FACT_SMOOTHING;
         smoothmanProcessings[1] = FACT_HUFFMAN16;
-        smoothmanProcessings[2] = FACT_RAW;
+//        smoothmanProcessings[2] = FACT_RAW;
 
         //first lets see if we do have an explicit request