Changeset 330 for trunk/src/SDMath.h

Timestamp:

01/31/05 12:11:36 (20 years ago)

Author:

kil064

Message:

reqork frequency alignment to

• only make the required numnber of aligners
• write out a correct frequency table with new FreqIDs

File:

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

trunk/src/SDMath.h

@@ -44 +44 @@
 class casa::MPosition;
 template<class T> class casa::PtrBlock;
+template<class T> class casa::Matrix;
+template<class T> class casa::ROScalarColumn;
+template<class T> class casa::ROArrayColumn;
+
 
 
@@ -49 +53 @@
 
 class SDMemTable;
+class SDDataDesc;
 
 class SDMath {
@@ -191 +196 @@
    casa::Table readAsciiFile (const casa::String& fileName) const;
 
-// Generate source table
-   void generateSourceTable (casa::Vector<casa::String>& srcTab,
-                             casa::Vector<casa::uInt>& srcIdx,
-                             casa::Vector<casa::uInt>& firstRow,
-                             const casa::Vector<casa::String>& srcNames) const;
-
 // Generate frequency aligners
    void generateFrequencyAligners (casa::PtrBlock<casa::FrequencyAligner<casa::Float>* >& a,
+                                   const SDDataDesc& dDesc,
                                    const SDMemTable& in, casa::uInt nChan,
-                                   casa::uInt nFreqIDs, casa::uInt nSrcTab,
-                                   const casa::Vector<casa::uInt>& firstRow,
                                    casa::MFrequency::Types system,
                                    const casa::MPosition& refPos,
                                    const casa::MEpoch& refEpoch) const;
+
+// Generate data description table (combines source and freqID)
+   void generateDataDescTable (casa::Matrix<casa::uInt>& ddIdx,
+                               SDDataDesc& dDesc,
+                               casa::uInt nIF,
+                               const SDMemTable& in,
+                               const casa::Table& tabIn,
+                               const casa::ROScalarColumn<casa::String>& srcCol,
+                               const casa::ROArrayColumn<casa::uInt>& fqIDCol) const;
 
 // Align in Frequency
@@ -219 +226 @@
 };
 
+
+
+
 } // namespace