Changeset 3063 for trunk

Timestamp:

11/20/15 19:26:02 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-8062

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Sort output POINTING table by time.

File:

• trunk/src/MSWriter.cpp (modified) (2 diffs)

trunk/src/MSWriter.cpp

@@ -912 +912 @@
     // fill empty FIELD rows
     infillField() ;
+
+    // sort POINTING rows
+    sortPointing();
   }
 
@@ -1017 +1020 @@
     porow.put( nrow ) ;
   }
+
+  void sortPointing()
+  {
+    ScalarColumn<Double> timeCol(potab, "TIME");
+    Vector<Double> originalTime = timeCol.getColumn();
+    Sort sort;
+    sort.sortKey(&originalTime[0], TpDouble, 0, Sort::Ascending);
+    Vector<uInt> sortIndex;
+    sort.sort(sortIndex, originalTime.nelements());
+
+    sortPointingTime(sortIndex);
+    sortPointingNumPoly(sortIndex);
+    sortPointingInterval(sortIndex);
+    sortPointingName(sortIndex);
+    sortPointingDirection(sortIndex);
+  }
+
+  void sortPointingTime(const Vector<uInt> &sortIndex)
+  {
+    sortScalarColumn<Double>("TIME", sortIndex, "TIME_ORIGIN");
+  }
+
+  void sortPointingNumPoly(const Vector<uInt> &sortIndex)
+  {
+    sortScalarColumn<Int>("NUM_POLY", sortIndex);
+  }
+
+  void sortPointingInterval(const Vector<uInt> &sortIndex)
+  {
+    sortScalarColumn<Double>("INTERVAL", sortIndex);
+  }
+
+  void sortPointingName(const Vector<uInt> &sortIndex)
+  {
+    sortScalarColumn<String>("NAME", sortIndex);
+  }
+
+  void sortPointingDirection(const Vector<uInt> &sortIndex)
+  {
+    ArrayColumn<Double> col(potab, "DIRECTION");
+    Cube<Double> data = col.getColumn();
+    Cube<Double> sortedData(data.shape());
+    for (size_t i = 0; i < sortIndex.nelements(); ++i) {
+      sortedData.xyPlane(i) = data.xyPlane(sortIndex[i]);
+    }
+
+    col.putColumn(sortedData);
+    col.attach(potab, "TARGET");
+    col.putColumn(sortedData);
+  }
+
+  template<class T>
+  void sortScalarColumn(const String &columnName, const Vector<uInt> &sortIndex, const String &copyColumnName="")
+  {
+    ScalarColumn<T> col(potab, columnName);
+    Vector<T> data = col.getColumn();
+    Vector<T> sortedData(data.shape());
+    for (size_t i = 0; i < sortIndex.nelements(); ++i) {
+      sortedData[i] = data[sortIndex[i]];
+    }
+    col.putColumn(sortedData);
+    if (copyColumnName.size() > 0) {
+      col.attach(potab, copyColumnName);
+      col.putColumn(sortedData);
+    }
+  }
+
   Int addPolarization()
   {