Changeset 19946 for trunk

Timestamp:

04/13/20 17:47:27 (5 years ago)

Author:

tbretz

Message:

Added a streaming mode which ignores the number of rows in the file.

File:

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

trunk/FACT++/src/fitsdump.cc

@@ -68 +68 @@
 private:
     string fFilename;
+    bool fStream;
 
     // Convert CCfits::ValueType into a human readable string
@@ -105 +106 @@
 //!        the ostream where to redirect the outputs
 //
-FitsDumper::FitsDumper(const string &fname, const string &tablename) : factfits(fname, tablename), fFilename(fname)
+FitsDumper::FitsDumper(const string &fname, const string &tablename) : factfits(fname, tablename), fFilename(fname), fStream(false)
 {
 }
@@ -568 +569 @@
     const size_t last = limit ? first + limit : size_t(-1);
 
-    while (GetRow(first++))
+    while (GetRow(first++, !fStream))
     {
         const size_t row = GetRow();
-        if (row==GetNumRows() || row==last)
+        if ((!fStream && row==GetNumRows()) || row==last)
             break;
 
@@ -831 +832 @@
     const size_t last = limit ? first + limit : size_t(-1);
 
-    while (GetRow(first++))
+    while (GetRow(first++, !fStream))
     {
         const size_t row = GetRow();
-        if (row==GetNumRows() || row==last)
+        if ((!fStream && row==GetNumRows()) || row==last)
             break;
 
@@ -862 +863 @@
     const size_t last = limit ? first + limit : size_t(-1);
 
-    while (GetRow(first++))
+    while (GetRow(first++, !fStream))
     {
         const size_t row = GetRow();
-        if (row==GetNumRows() || row==last)
+        if ((!fStream && row==GetNumRows()) || row==last)
             break;
 
@@ -1002 +1003 @@
     uint64_t counter = 0;
 
-    while (GetRow(first++))
+    while (GetRow(first++, !fStream))
     {
         const size_t row = GetRow();
-        if (row==GetNumRows() || row==last)
+        if ((!fStream && row==GetNumRows()) || row==last)
             break;
 
@@ -1083 +1084 @@
 int FitsDumper::Exec(Configuration& conf)
 {
+    fStream = conf.Get<bool>("stream");
+
     if (conf.Get<bool>("autocal"))
         resetCalibration();
@@ -1291 +1294 @@
         ("%,%",         vars<string>(),         "Format for the output (currently not available in root-mode)")
         ("force",       po_switch(),            "Force reading the fits file even if END key is missing")
+        ("stream",      po_switch(),            "Stream reading the fits file (ignore the row count in the header)")
         ("first",       var<size_t>(size_t(0)), "First number of row to read")
         ("limit",       var<size_t>(size_t(0)), "Limit for the maximum number of rows to read (0=unlimited)")