Changeset 354 for trunk/src/SDMath.h

Timestamp:

02/03/05 15:43:18 (19 years ago)

Author:

kil064

Message:

rework convertFLux stuff using new SDAttr and looking up values
where possible

File:

• trunk/src/SDMath.h (modified) (4 diffs)

trunk/src/SDMath.h

@@ -102 +102 @@
 
 // Flux conversion between Jansky and Kelvin
-   SDMemTable* convertFlux (const SDMemTable& in, casa::Float area, 
-                            casa::Float eta, casa::Bool doAll) const;
+   SDMemTable* convertFlux (const SDMemTable& in, casa::Float D, casa::Float etaAp, 
+                            casa::Float JyPerK, casa::Bool doAll) const;
 
 // Gain-elevation correction
@@ -142 +142 @@
                    casa::Bool useMask, WeightType wtType) const;
 
+// Work out conversion factor for converting Jy<->K per IF per row and apply
+   void convertBrightnessUnits (SDMemTable* pTabOut, const SDMemTable& in, 
+                                casa::Bool toKelvin, casa::Float sFac, casa::Bool doAll) const;
+
+// Convert weight string to enum value
+
+   void convertWeightString (WeightType& wt, const casa::String& weightStr) const;
+
+// Convert interpolation type string
+//   void convertInterpString(casa::Int& type, const casa::String& interp) const;
+   void convertInterpString(casa::InterpolateArray1D<casa::Double,casa::Float>::InterpolationMethod& method,  
+                             const casa::String& interp) const;
+
+// Correct data from an ascii Table
+   void correctFromAsciiTable(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::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;
+
+// Convert time String to Epoch
+   casa::MEpoch epochFromString (const casa::String& str, casa::MEpoch::Types timeRef) const;
+
 // Function to fill Scan Container when averaging in time
 
@@ -151 +184 @@
                 const casa::Vector<casa::uInt>& freqID) const;
 
-// Put the data and mask into the SDContainer
-   void putDataInSDC (SDContainer& sc, const casa::Array<casa::Float>& data,
-                      const casa::Array<casa::Bool>& mask) const;
-
-// Function to normalize data when averaging in time
-
-  void normalize (casa::MaskedArray<casa::Float>& data,
-                  const casa::Array<casa::Float>& sumSq,
-                  const casa::Array<casa::Float>& nPts,
-                  WeightType wtType, casa::Int axis, casa::Int nAxes) const;
-
-// Function to get the current cursor location
-   void getCursorLocation (casa::IPosition& start, casa::IPosition& end,
-                           const SDMemTable& in) const;
-
-// Convert weight string to enum value
-
-   void convertWeightString (WeightType& wt, const casa::String& weightStr) const;
-
-// Convert interpolation type string
-//   void convertInterpString(casa::Int& type, const casa::String& interp) const;
-   void convertInterpString(casa::InterpolateArray1D<casa::Double,casa::Float>::InterpolationMethod& method,  
-                             const casa::String& interp) const;
-
-// Correct data from an ascii Table
-   void correctFromAsciiTable(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::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;
-
-// Read ascii file into a Table
-
-   casa::Table readAsciiFile (const casa::String& fileName) const;
+// Format EPoch
+   casa::String formatEpoch(const casa::MEpoch& epoch)  const;
+
+// Align in Frequency
+   SDMemTable* frequencyAlign (const SDMemTable& in,
+                              casa::MFrequency::Types system,
+                              const casa::String& timeRef,
+                              const casa::String& method) const;
 
 // Generate frequency aligners
@@ -213 +210 @@
                                const casa::ROArrayColumn<casa::uInt>& fqIDCol) const;
 
-// Align in Frequency
-   SDMemTable* frequencyAlign (const SDMemTable& in,
-                              casa::MFrequency::Types system,
-                              const casa::String& timeRef,
-                              const casa::String& method) const;
-
-// Convert time String to Epoch
-   casa::MEpoch epochFromString (const casa::String& str, casa::MEpoch::Types timeRef) const;
-
-// Format EPoch
-   casa::String formatEpoch(const casa::MEpoch& epoch)  const;
+// Function to get the current cursor location
+   void getCursorLocation (casa::IPosition& start, casa::IPosition& end,
+                           const SDMemTable& in) const;
+
+// Function to normalize data when averaging in time
+
+  void normalize (casa::MaskedArray<casa::Float>& data,
+                  const casa::Array<casa::Float>& sumSq,
+                  const casa::Array<casa::Float>& nPts,
+                  WeightType wtType, casa::Int axis, casa::Int nAxes) const;
+
+// Put the data and mask into the SDContainer
+   void putDataInSDC (SDContainer& sc, const casa::Array<casa::Float>& data,
+                      const casa::Array<casa::Bool>& mask) const;
+
+// Read ascii file into a Table
+
+   casa::Table readAsciiFile (const casa::String& fileName) const;
 };