Changeset 19726 for trunk/Mars

Timestamp:

10/05/19 20:51:15 (5 years ago)

Author:

tbretz

Message:

Switch to compressed files -- the algorithm which columnis compressed how is a bit arbitrary and might only work for our raw files.

File:

• trunk/Mars/mfileio/MWriteFitsFile.cc (modified) (4 diffs)

trunk/Mars/mfileio/MWriteFitsFile.cc

@@ -464 +464 @@
       {
 
-      ofits* fitsTable = new ofits();
+      ofits* fitsTable = new zofits();
       fitsTable->AllowCommentsTrimming(true);
       TString dol = fileNameNoExt;
@@ -476 +476 @@
           dol = dol(0, dol.Length()-5);
       }
+      if (dol(dol.Length()-8, dol.Length()) == ".fits.fz")
+      {
+          dol = dol(0, dol.Length()-8);
+      }
       dol += "_";
       dol += i_table->first;
-      dol += ".fits";
+      dol += ".fits.fz";
       fitsTable->open(dol.Data());
       *fLog << inf << "Opening FITS file: " << dol.Data() << endl;
@@ -551 +555 @@
          dol2 += "_";
          dol2 += i_table->first;
-         dol2 += ".fits";
+         dol2 += ".fits.fz";
 
          if (fOpenOption == "RECREATE") 
@@ -1150 +1154 @@
 //    *fLog << warn << "In table " << tableName << " Adding column |" << truncatedName << "| |" << truncatedComment << "| |" << count << "| |" << typeChar;
 //    *fLog << warn << "| Real: "<< columnName << " comment: " << comment << endl;
-    fFitsTables[tableName]->AddColumn(count, typeChar, truncatedName, unit, truncatedComment);
+
+    if (count>=1440 && colWidth>count)
+    {
+        vector<uint16_t> processing;
+        if (count>1440)
+            processing.push_back(FITS::kFactSmoothing);
+        processing.push_back(FITS::kFactHuffman16);
+
+        const FITS::Compression comp(processing, FITS::kOrderByRow);
+        fFitsTables[tableName]->AddColumn(comp, count, typeChar, truncatedName, unit, truncatedComment);
+
+        *fLog << inf2 << "FITS: Compressing '" << truncatedName << "' [" << count << "]" << endl;
+    }
+    else
+        fFitsTables[tableName]->AddColumn(count, typeChar, truncatedName, unit, truncatedComment);
 }