Changeset 17006 for trunk/FACT++

Timestamp:

08/14/13 13:15:58 (11 years ago)

Author:

lyard

Message:

this is version with improved wrong channels output

File:

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

trunk/FACT++/src/fitsCompressor.cc

@@ -1583 +1583 @@
     }
 
+
     //should we use specific compression on some columns ?
     const vector<string> columnsCompression = conf.Vec<string>("compression");
@@ -1876 +1877 @@
     ostringstream wrongChannels;
     map<int, int> wrongChannelsMap;
+    map<int, int> wrongChannelsLastValues;
     for (uint32_t i=0;i<1440;i++)
+    {
         wrongChannelsMap[i] = 0;
+        wrongChannelsLastValues[i] = 0;
+    }
     for (uint32_t i=0;i<inFile.GetNumRows();i++)
     {
         if (displayText) cout << "\r Row " << i+1 << flush;
-        inFile.GetNextRow();
+        if (!inFile.GetNextRow())
+        {
+            cout << "ERROR: file has less rows than advertized. aborting" << endl;
+            exit(0);
+        }
         //copy from inFile internal structures to buffer
         int32_t count=0;
@@ -1910 +1919 @@
                 {
                     wrongChannelsMap[j]++;
+                    wrongChannelsLastValues[j] = thisStartCell;
                     wrongChannels << j;
                 }
@@ -1926 +1936 @@
         {
             if (wrongChannelsMap[i] != 0)
-                cout << i << "(" << wrongChannelsMap[i] << ") ";
+                cout << i << "(" << wrongChannelsMap[i] << "|" << wrongChannelsLastValues[i] << ") ";
         }
         cout << endl;
@@ -2117 +2127 @@
         cout << "ERROR: file checksums seems wrong" << endl;
 
-    reconstructedFile.close();
+    if (!reconstructedFile.close())
+    {
+        cout << "ERROR: disk probably full..." << endl;
+        return -1;
+    }
 
     //get original and reconstructed checksum and datasum