Changeset 480 for trunk/src

Timestamp:

02/18/05 17:13:45 (20 years ago)

Author:

kil064

Message:

add functions getRowRange and rowInRange
make gain/el correction the inverse of what it was
have gain/el and opacity also correct TSys

Location:

trunk/src

Files:

• SDMath.cc (modified) (11 diffs)
• SDMath.h (modified) (2 diffs)

trunk/src/SDMath.cc

@@ -1074 +1074 @@
      cout << "Jy/K = " << JyPerK << endl;
      Vector<Float> factors(in.nRow(), factor);
-     correctFromVector (pTabOut, in, doAll, factors);
+     scaleByVector(pTabOut, in, doAll, factors, False);
   } else if (etaAp>0.0) {
      Bool throwIt = True;
@@ -1088 +1088 @@
 //
      Vector<Float> factors(in.nRow(), factor);
-     correctFromVector (pTabOut, in, doAll, factors);
+     scaleByVector(pTabOut, in, doAll, factors, False);
   } else {
 
@@ -1164 +1164 @@
      Vector<Float> factor(nRow);
      for (uInt i=0; i<nRow; i++) {
-        factor[i] = (*pPoly)(x[i]);
+        factor[i] = 1.0 / (*pPoly)(x[i]);
      }
      delete pPoly;
 //
-     correctFromVector (pTabOut, in, doAll, factor);
+     scaleByVector (pTabOut, in, doAll, factor, True);
   } else {
 
@@ -1179 +1179 @@
 
      cout << "Making correction from ascii Table" << endl;
-     correctFromAsciiTable (pTabOut, in, fileName, col0, col1, 
-                            methodStr, doAll, x);
+     scaleFromAsciiTable (pTabOut, in, fileName, col0, col1, 
+                          methodStr, doAll, x, True);
    }
 //
@@ -1214 +1214 @@
 // Correct
 
-  correctFromVector (pTabOut, in, doAll, factor);
+  scaleByVector (pTabOut, in, doAll, factor, True);
 //
   return pTabOut;
@@ -1799 +1799 @@
 
 
-void SDMath::correctFromAsciiTable(SDMemTable* pTabOut,
-                                   const SDMemTable& in, const String& fileName,
-                                   const String& col0, const String& col1,
-                                   const String& methodStr, Bool doAll,
-                                   const Vector<Float>& xOut) const
+void SDMath::scaleFromAsciiTable(SDMemTable* pTabOut,
+                                 const SDMemTable& in, const String& fileName,
+                                 const String& col0, const String& col1,
+                                 const String& methodStr, Bool doAll,
+                                 const Vector<Float>& xOut, Bool doTSys) const
 {
 
@@ -1810 +1810 @@
   Table geTable = readAsciiFile (fileName);
 //
-  correctFromTable (pTabOut, in, geTable, col0, col1, methodStr, doAll, xOut);
-}
-
-void SDMath::correctFromTable(SDMemTable* pTabOut, const SDMemTable& in, 
-                              const Table& tTable, const String& col0, 
-                              const String& col1,
-                              const String& methodStr, Bool doAll,
-                              const Vector<Float>& xOut) const
+  scaleFromTable (pTabOut, in, geTable, col0, col1, methodStr, doAll, xOut, doTSys);
+}
+
+void SDMath::scaleFromTable(SDMemTable* pTabOut, const SDMemTable& in, 
+                            const Table& tTable, const String& col0, 
+                            const String& col1,
+                            const String& methodStr, Bool doAll,
+                            const Vector<Float>& xOut, Bool doTsys) const
 {
 
@@ -1841 +1841 @@
 // Apply 
 
-   correctFromVector (pTabOut, in, doAll, yOut);
-}
-
-
-void SDMath::correctFromVector (SDMemTable* pTabOut, const SDMemTable& in, 
-                                Bool doAll, const Vector<Float>& factor) const
+   scaleByVector(pTabOut, in, doAll, Float(1.0)/yOut, doTsys);
+}
+
+
+void SDMath::scaleByVector(SDMemTable* pTabOut, const SDMemTable& in, 
+                           Bool doAll, const Vector<Float>& factor,
+                           Bool doTSys) const
 {
 
@@ -1853 +1854 @@
   IPosition start, end;
   setCursorSlice (start, end, doAll, in);
+
+// Get Tsys column
+
+  const Table& tIn = in.table();
+  ArrayColumn<Float> tSysCol(tIn, "TSYS");
+  Array<Float> tSys;
 
 // Loop over rows and apply correction factor
@@ -1863 +1870 @@
      MaskedArray<Float> dataIn(in.rowAsMaskedArray(i));
      MaskedArray<Float> dataIn2 = dataIn(start,end);  // reference to dataIn
+//
+     if (doTSys) {
+        tSysCol.get(i, tSys);
+        Array<Float> tSys2 = tSys(start,end) * factor[i];
+        tSysCol.put(i, tSys);
+     }
 
 // Apply factor
@@ -1971 +1984 @@
    }
 }
+
+Vector<uInt> SDMath::getRowRange (const SDMemTable& in) const
+{
+   Vector<uInt> range(2);
+   range[0] = 0;
+   range[1] = in.nRow()-1;
+   return range;
+}
+   
+
+Bool SDMath::rowInRange (uInt i, const Vector<uInt>& range) const
+{
+   return (i>=range[0] && i<=range[1]);
+}

trunk/src/SDMath.h

@@ -159 +159 @@
                              const casa::String& interp) const;
 
-// Correct data from an ascii Table
-   void correctFromAsciiTable(SDMemTable* pTabOut, const SDMemTable& in, 
+// Scale data with values from an ascii Table
+   void scaleFromAsciiTable(SDMemTable* pTabOut, const SDMemTable& in, 
                               const casa::String& fileName,
                               const casa::String& col0, const casa::String& col1,
                               const casa::String& methodStr, casa::Bool doAll,
-                              const casa::Vector<casa::Float>& xOut) const;
-
-// Correct data from a Table
-   void correctFromTable(SDMemTable* pTabOut, const SDMemTable& in, const casa::Table& tTable,
+                              const casa::Vector<casa::Float>& xOut, casa::Bool doTSys) const;
+
+// Scale data with values from a Table
+   void scaleFromTable(SDMemTable* pTabOut, const SDMemTable& in, const casa::Table& tTable,
                          const casa::String& col0, const casa::String& col1,
                          const casa::String& methodStr, casa::Bool doAll,
-                         const casa::Vector<casa::Float>& xOut) const;
-
-// Correct data from a Vector
-   void correctFromVector (SDMemTable* pTabOut, const SDMemTable& in,
-                           casa::Bool doAll, const casa::Vector<casa::Float>& factor) const;
+                         const casa::Vector<casa::Float>& xOut, casa::Bool doTSys) const;
+
+// Scale data and optionally TSys by values in a Vector
+   void scaleByVector (SDMemTable* pTabOut, const SDMemTable& in,
+                       casa::Bool doAll, const casa::Vector<casa::Float>& factor,
+                       casa::Bool doTSys) const;
 
 // Convert time String to Epoch
@@ -215 +216 @@
                                casa::Bool perFreqID) const;
 
+// Get row range from SDMemTable state
+   casa::Vector<casa::uInt> getRowRange (const SDMemTable& in) const;
+
+// Is row in the row range ?
+   casa::Bool rowInRange (casa::uInt i, const casa::Vector<casa::uInt>& range) const;
+
 // Set slice to cursor or all axes
     void setCursorSlice (casa::IPosition& start, casa::IPosition& end,