Changeset 16845

Timestamp:

06/14/13 14:21:53 (11 years ago)

Author:

lyard

Message:

Added guard handling of case where startCells not found and Drs requested

File:

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

trunk/FACT++/src/fitsCompressor.cc

@@ -1116 +1116 @@
             {
                 heapSize += _catalog[i][j].first;
+//              cout << "heapSize: " << heapSize << endl;
                 //set the catalog offsets to their actual values
                 _catalog[i][j].second = compressedOffset;
@@ -1133 +1134 @@
     }
     writeHeader(true);
+
     ostringstream str;
     str << _checksum.val();
@@ -1730 +1732 @@
             continue;
         outFile.setHeaderKey(i->second.fitsString);
+//        cout << i->first << endl;
     }
 
@@ -1756 +1759 @@
             drsCalib16[i] = (int16_t)(drsCalibFloat[i]*4096.f/2000.f);
 
-        //assign it to the ouput file
-        outFile.setDrsCalib(drsCalib16);
 
         //get the start cells offsets
@@ -1773 +1774 @@
         if (startCellOffset == -1)
         {
-            cout << "Could not find StartCellData in input file " << fileNameIn << ". Aborting."<< endl;
-            return -1;
+            cout << "WARNING: Could not find StartCellData in input file " << fileNameIn << ". Doing it uncalibrated"<< endl;
+        }
+        else
+        {
+            //assign it to the ouput file
+            outFile.setDrsCalib(drsCalib16);
         }
     }
@@ -1858 +1863 @@
     }
 
-    delete[] drsCalib16;
+    if (drsCalib16 != NULL)
+        delete[] drsCalib16;
 
     if (displayText) cout << "Done." << endl;
@@ -1875 +1881 @@
     //get a compressed reader
 //TEMP try to copy the file too
-//    string copyName("/scratch/copyFile.fz");
+//    string copyName("/gpfs/scratch/fact/etienne/copyFile.fz");
+//    string copyName(fileNameOut+".copy");
     string copyName("");
     factfits verifyFile(fileNameOut, copyName, tableName, false);
@@ -2037 +2044 @@
     else
     {
-        if (displayText) cout << "Ok" << endl;
+        if (true) cout << "Ok" << endl;
     }