Changeset 16898

Timestamp:

06/24/13 16:04:52 (11 years ago)

Author:

lyard

Message:

Propagated the new naming of enums to other files....

Location:

trunk

Files:

• FACT++/src/fitsCompressor.cc (modified) (7 diffs)
• Mars/mcore/zfits.h (modified) (2 diffs)

trunk/FACT++/src/fitsCompressor.cc

@@ -38 +38 @@
     unsigned char numProcs;
     BlockHeader(uint64_t      s=0,
-                char          o=FACT_ROW_MAJOR,
+                char          o=zfits::kOrderByRow,
                 unsigned char n=1) : size(s),
                                      ordering(o),
@@ -1175 +1175 @@
         switch (_columns[i].getColumnOrdering())//getCompression())
         {
-            case FACT_ROW_MAJOR:
+            case zfits::kOrderByRow:
                 for (uint32_t k=0;k<thisRoundNumRows;k++)
                 {//regular, "semi-transposed" copy
@@ -1183 +1183 @@
             break;
 
-            case FACT_COL_MAJOR :
+            case zfits::kOrderByCol :
                 for (int j=0;j<_columns[i].numElems();j++)
                     for (uint32_t k=0;k<thisRoundNumRows;k++)
@@ -1323 +1323 @@
             switch (sequence[j])
             {
-                case FACT_RAW:
+                case zfits::kFactRaw:
 //                    if (head.numProcs == 1)
                         compressedOffset += compressUNCOMPRESSED(&(_compressedBuffer[threadIndex][compressedOffset]), &(_transposedBuffer[threadIndex][offset]), thisRoundNumRows, _columns[i].sizeOfElems(), _columns[i].numElems());
                 break;
-                case FACT_SMOOTHING:
+                case zfits::kFactSmoothing:
                         applySMOOTHING(&(_compressedBuffer[threadIndex][compressedOffset]), &(_transposedBuffer[threadIndex][offset]), thisRoundNumRows, _columns[i].sizeOfElems(), _columns[i].numElems());
                 break;
-                case FACT_HUFFMAN16:
-                    if (head.ordering == FACT_COL_MAJOR)
+                case zfits::kFactHuffman16:
+                    if (head.ordering == zfits::kOrderByCol)
                         compressedOffset += compressHUFFMAN(&(_compressedBuffer[threadIndex][compressedOffset]), &(_transposedBuffer[threadIndex][offset]), thisRoundNumRows, _columns[i].sizeOfElems(), _columns[i].numElems());
                     else
@@ -1343 +1343 @@
 
         //check if compressed size is larger than uncompressed
-        if (sequence[0] != FACT_RAW &&
+        if (sequence[0] != zfits::kFactRaw &&
             compressedOffset - previousOffset > _columns[i].sizeOfElems()*_columns[i].numElems()*thisRoundNumRows+sizeof(BlockHeader)+sizeof(uint16_t)*sequence.size())
         {//if so set flag and redo it uncompressed
@@ -1352 +1352 @@
             he.size = compressedOffset - previousOffset;
             he.numProcs = 1;
-            he.ordering = FACT_ROW_MAJOR;
+            he.ordering = zfits::kOrderByRow;
             memcpy(&(_compressedBuffer[threadIndex][previousOffset]), (char*)(&he), sizeof(BlockHeader));
-            _compressedBuffer[threadIndex][previousOffset+sizeof(BlockHeader)] = FACT_RAW;
+            _compressedBuffer[threadIndex][previousOffset+sizeof(BlockHeader)] = zfits::kFactRaw;
             offset += thisRoundNumRows*_columns[i].sizeOfElems()*_columns[i].numElems();
            _catalog[currentCatalogRow][i].first = compressedOffset - _catalog[currentCatalogRow][i].second;
@@ -1684 +1684 @@
         //get header structures
         BlockHeader rawHeader;
-        BlockHeader smoothmanHeader(0, FACT_ROW_MAJOR, 2);
+        BlockHeader smoothmanHeader(0, zfits::kOrderByRow, 2);
         vector<uint16_t> rawProcessings(1);
-        rawProcessings[0] = FACT_RAW;
+        rawProcessings[0] = zfits::kFactRaw;
         vector<uint16_t> smoothmanProcessings(2);
-        smoothmanProcessings[0] = FACT_SMOOTHING;
-        smoothmanProcessings[1] = FACT_HUFFMAN16;
+        smoothmanProcessings[0] = zfits::kFactSmoothing;
+        smoothmanProcessings[1] = zfits::kFactHuffman16;
 //        smoothmanProcessings[2] = FACT_RAW;
 

trunk/Mars/mcore/zfits.h

@@ -145 +145 @@
         if (fTable.is_compressed)
         for (auto it=fTable.sorted_cols.begin(); it!= fTable.sorted_cols.end(); it++)
-            if (it->comp != kCompFACT)
             {
                 if (it->comp == kCompFACT)
@@ -158 +157 @@
 #endif
             }
-        }
 
         fColumnOrdering.resize(fTable.sorted_cols.size());