Changeset 385

Timestamp:

02/08/05 13:21:28 (19 years ago)

Author:

kil064

Message:

have another go at summary function. this time
rework with list of scan boundaries

File:

• trunk/src/SDMemTable.cc (modified) (5 diffs)

trunk/src/SDMemTable.cc

@@ -444 +444 @@
 
   SpectralCoordinate spc = getSpectralCoordinate(freqID, whichRow);
-//
   Vector<Double> pixel(nChan());
   indgen(pixel);
@@ -709 +708 @@
                                                      uInt whichRow) const
 {
+
 // Create basic SC
 
@@ -1085 +1085 @@
 std::string SDMemTable::summary(bool verbose) const  {
 
+// Format header info
+
   ostringstream oss;
   oss << endl;
@@ -1122 +1124 @@
   oss << endl;
 //
-  String dirtype ="Position ("+
-    MDirection::showType(getDirectionReference())+
-    ")";
+  String dirtype ="Position ("+ MDirection::showType(getDirectionReference()) + ")";
   oss << setw(5) << "Scan"
       << setw(15) << "Source"
@@ -1133 +1133 @@
   oss << "--------------------------------------------------------------------------------" << endl;
   
-//
-  uInt scanNo = 0;
+// Generate list of scan start and end integrations
+
+  Vector<Int> scanIDs = scanCol_.getColumn();
+  Vector<uInt> startInt, endInt;
+  mathutil::scanBoundaries(startInt, endInt, scanIDs);
+//
+  const uInt nScans = startInt.nelements();
   String name;
-  Int lastScanID = 0;
-  Int scanID;
-  uInt firstRow = 0;
   Vector<uInt> freqIDs, listFQ;
-//
-  uInt nRow = scanCol_.nrow();
-  for (uInt i=0; i<nRow; i++) {
-    scanCol_.getScalar(i,scanID);
-    freqidCol_.get(i, freqIDs);
-//
-    if (i>0 && (i==nRow-1 || scanID!=lastScanID)) {
-      srcnCol_.getScalar(firstRow,name);
-      String t = formatSec(Double(getInterval(firstRow)));
-      String posit = formatDirection(getDirection(firstRow,True));
-      uInt nInt = (i-firstRow);
-
-// Special case adjustments
-
-      if (i==nRow-1 &&scanID==lastScanID)  nInt++;   
-      if (nInt==1 && i>1) {
-         for (uInt j=0; j<freqIDs.nelements(); j++) 
-           mathutil::addEntry(listFQ, freqIDs(j));
+  uInt nInt;
+//
+  for (uInt i=0; i<nScans; i++) {
+
+// Get things from first integration of scan
+
+      String time = getTime(startInt(i),False);
+      String tInt = formatSec(Double(getInterval(startInt(i))));
+      String posit = formatDirection(getDirection(startInt(i),True));
+      srcnCol_.getScalar(startInt(i),name);
+
+// Find all the FreqIDs in this scan
+
+      listFQ.resize(0);      
+      for (uInt j=startInt(i); j<endInt(i)+1; j++) {
+         freqidCol_.get(j, freqIDs);
+         for (uInt k=0; k<freqIDs.nelements(); k++) {
+            mathutil::addEntry(listFQ, freqIDs(k));
+         }
       }
-      oss << setw(3) << std::right << scanNo << std::left << setw(2) << "  "
+//
+      nInt = endInt(i) - startInt(i) + 1;
+      oss << setw(3) << std::right << i << std::left << setw(2) << "  "
           << setw(15) << name
           << setw(24) << posit
-          << setw(10) << getTime(firstRow,False)
+          << setw(10) << time 
           << setw(3) << std::right << nInt  << setw(3) << " x " << std::left
-          << setw(6) <<  t 
+          << setw(6) <<  tInt
           << " " << listFQ << endl;
-//
-      lastScanID = scanID;
-      firstRow = i;
-      scanNo++;
-      listFQ.resize(0);
-    } else {
-       for (uInt j=0; j<freqIDs.nelements(); j++) mathutil::addEntry(listFQ, freqIDs(j));
-    }
   }
   oss << endl;
-  oss << "Table contains " << table_.nrow() << " integration(s) in " << scanNo << " scan(s)." << endl;
+  oss << "Table contains " << table_.nrow() << " integration(s) in " << nScans << " scan(s)." << endl;
 
 // Frequency Table
+
   if (verbose) {
     std::vector<string> info = getCoordInfo();