Changeset 1694 for trunk/src

Timestamp:

02/11/10 09:45:47 (15 years ago)

Author:

Malte Marquarding

Message:

Ticket #172: inverse scaling factor was used in coordinate resampling. Also added no of channels to each IF in scantable.summary and made all get{IF/Beam/Pol}No functions const

Location:

trunk/src

Files:

• STFrequencies.cpp (modified) (4 diffs)
• Scantable.cpp (modified) (4 diffs)
• Scantable.h (modified) (2 diffs)

trunk/src/STFrequencies.cpp

@@ -212 +212 @@
 {
   Vector<Float> offset(1,0.0);
-  Vector<Float> factors(1,1.0/width);
+  Vector<Float> factors(1,width);
   Vector<Int> newshape;
   CoordinateSystem csys;
@@ -287 +287 @@
         << rec.asDouble("REFVAL") << setw(7)
         << rec.asDouble("REFPIX")
-        << setw(12)
+        << setw(15)
         << rec.asDouble("INCREMENT");
   }
@@ -294 +294 @@
     int f = outstr.find_first_not_of(' ');
     int l = outstr.find_last_not_of(' ', outstr.size());
-    if (f < 0) { 
-      f = 0; 
-    }
-    if ( l < f  || l < f ) { 
+    if (f < 0) {
+      f = 0;
+    }
+    if ( l < f  || l < f ) {
       l = outstr.size();
     }
@@ -409 +409 @@
 }
 
-void STFrequencies::shiftRefPix(int npix, uInt id) 
+void STFrequencies::shiftRefPix(int npix, uInt id)
 {
   Table t = table_(table_.col("ID") == Int(id) );

trunk/src/Scantable.cpp

@@ -560 +560 @@
 }
 
-std::vector<uint> Scantable::getNumbers(ScalarColumn<uInt>& col)
+std::vector<uint> Scantable::getNumbers(const ScalarColumn<uInt>& col) const
 {
   Vector<uInt> nos(col.getColumn());
@@ -770 +770 @@
       << setw(15) << "Polarisations:" << setw(4) << npol()
       << "(" << getPolType() << ")" << endl
-      << setw(15) << "Channels:"  << setw(4) << nchan() << endl;
-  oss << endl;
+      << setw(15) << "Channels:" << nchan() << endl;
   String tmp;
   oss << setw(15) << "Observer:"
@@ -802 +801 @@
       << setw(10) << "Time" << setw(18) << "Integration" << endl;
   oss << setw(5) << "" << setw(5) << "Beam" << setw(3) << "" << dirtype << endl;
-  oss << setw(10) << "" << setw(3) << "IF" << setw(6) << ""
+  oss << setw(10) << "" << setw(3) << "IF" << setw(3) << ""
       << setw(8) << "Frame" << setw(16)
-      << "RefVal" << setw(10) << "RefPix" << setw(12) << "Increment" <<endl;
+      << "RefVal" << setw(10) << "RefPix" << setw(12) << "Increment"
+      << setw(7) << "Channels"
+      << endl;
   oss << asap::SEPERATOR << endl;
   TableIterator iter(table_, "SCANNO");
@@ -839 +840 @@
         ROTableRow irow(isubt);
         const TableRecord& irec = irow.get(0);
-        oss << setw(10) << "";
+        oss << setw(9) << "";
         oss << setw(3) << std::right << irec.asuInt("IFNO") << std::left
-            << setw(2) << "" << frequencies().print(irec.asuInt("FREQ_ID"))
+            << setw(1) << "" << frequencies().print(irec.asuInt("FREQ_ID"))
+            << setw(3) << "" << nchan(irec.asuInt("IFNO"))
             << endl;
 

trunk/src/Scantable.h

@@ -266 +266 @@
 
   int getBeam(int whichrow) const;
-  std::vector<uint> getBeamNos() { return getNumbers(beamCol_); }
+  std::vector<uint> getBeamNos() const { return getNumbers(beamCol_); }
 
   int getIF(int whichrow) const;
-  std::vector<uint> getIFNos() { return getNumbers(ifCol_); }
+  std::vector<uint> getIFNos() const { return getNumbers(ifCol_); }
 
   int getPol(int whichrow) const;
-  std::vector<uint> getPolNos() { return getNumbers(polCol_); }
-
-  std::vector<uint> getScanNos() { return getNumbers(scanCol_); }
+  std::vector<uint> getPolNos() const { return getNumbers(polCol_); }
+
+  std::vector<uint> getScanNos() const { return getNumbers(scanCol_); }
   int getScan(int whichrow) const { return scanCol_(whichrow); }
 
@@ -459 +459 @@
   int rowToScanIndex(int therow);
 
-  std::vector<uint> getNumbers(casa::ScalarColumn<casa::uInt>& col);
+  std::vector<uint> getNumbers(const casa::ScalarColumn<casa::uInt>& col) const;
 
   static const casa::uInt version_ = 3;