Changeset 12883 for trunk

Timestamp:

02/09/12 16:20:49 (13 years ago)

Author:

lyard

Message:

fixed first element output bug

File:

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

trunk/FACT++/src/fitsdump.cc

@@ -398 +398 @@
     out << "#" << endl;
 
+
+    vector<const void*> ptrs;
+    for (auto namesIt=listNamesOnly.begin(); namesIt!=listNamesOnly.end(); namesIt++)
+    {
+        ptrs.push_back(fFile->SetPtrAddress(*namesIt));
+    }
+
     while (fFile->GetNextRow())
     {
@@ -405 +412 @@
 
         rangesIt = ranges.begin();
-
-        for (vector<string>::const_iterator in=listNamesOnly.begin(); in!=listNamesOnly.end(); in++, rangesIt++)
+        auto ptrsIt=ptrs.begin();
+
+        for (vector<string>::const_iterator in=listNamesOnly.begin(); in!=listNamesOnly.end(); in++, rangesIt++, ptrsIt++)
         {
-            const void *ptr = fFile->SetPtrAddress(*in);
+            const void *ptr = *ptrsIt;
 
             const fits::Table::Column &cCol = fColMap.find(*in)->second;
@@ -623 +631 @@
     vector<minMaxStruct> statData(names.size());
 
+    vector<const void*> ptrs;
+    for (auto namesIt=names.begin(); namesIt!=names.end(); namesIt++)
+    {
+        ptrs.push_back(fFile->SetPtrAddress(*namesIt));
+    }
+
     // Loop over all columns in our list of requested columns
     while (fFile->GetNextRow())
@@ -632 +646 @@
         auto rangesIt = ranges.begin();
         auto statsIt  = statData.begin();
-
-        for (auto in=names.begin(); in!=names.end(); in++, rangesIt++, statsIt++)
+        auto ptrsIt = ptrs.begin();
+
+        for (auto in=names.begin(); in!=names.end(); in++, rangesIt++, statsIt++, ptrsIt++)
         {
-            const void *ptr = fFile->SetPtrAddress(*in);
+            const void *ptr = *ptrsIt;
 
             const fits::Table::Column &cCol = fColMap.find(*in)->second;
@@ -966 +981 @@
     {
         if (numElems%2 == 0)
-            out << "Med: " << double(val[numElems/2] + val[numElems/2+1])/2 << '\n';
+            out << "Med: " << double(val[(numElems-1)/2] + val[(numElems-1)/2+1])/2 << '\n';
         else
             out << "Med: " << double(val[numElems/2+1]) << '\n';
@@ -1018 +1033 @@
         statData.push_back(new char[(rangesIt->second - rangesIt->first)*cCol.size*fFile->GetNumRows()]);
     }
+    vector<const void*> ptrs;
+    for (auto namesIt=names.begin(); namesIt!=names.end(); namesIt++)
+    {
+        ptrs.push_back(fFile->SetPtrAddress(*namesIt));
+    }
 
     while (fFile->GetNextRow())
@@ -1027 +1047 @@
         rangesIt = ranges.begin();
         auto statsIt = statData.begin();
-
-        for (auto in=names.begin(); in!=names.end(); in++, rangesIt++, statsIt++)
+        auto ptrsIt = ptrs.begin();
+
+        for (auto in=names.begin(); in!=names.end(); in++, rangesIt++, statsIt++, ptrsIt++)
         {
-            const void *ptr = fFile->SetPtrAddress(*in);
+            const void *ptr = *ptrsIt;
 
             const fits::Table::Column &cCol = fColMap.find(*in)->second;