Changeset 2566 for branches/hpc33/src/STMath.h

Timestamp:

06/13/12 18:08:22 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Rewrote calibration for frequency switch observation based on almacal code.

File:

• branches/hpc33/src/STMath.h (modified) (3 diffs)

branches/hpc33/src/STMath.h

@@ -402 +402 @@
     flagsFromMA(const casa::MaskedArray<casa::Float>& ma);
 
-  vector<float> getSpectrumFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
   casa::Vector<casa::Float> getSpectrumFromTime( double reftime, const casa::Vector<casa::Double> &v, const vector<int> &idx, const casa::Matrix<casa::Float>& sp, string mode = "before" ) ;
-  vector<float> getTcalFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode="before" ) ;
   casa::Vector<casa::Float> getTcalFromTime( double reftime, const casa::Vector<casa::Double> &v, const vector<int> &idx, const casa::CountedPtr<Scantable>& s, string mode="before" ) ;
-  vector<float> getTsysFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode="before" ) ;
   casa::Vector<casa::Float> getTsysFromTime( double reftime, const casa::Vector<casa::Double> &v, const vector<int> &idx, const casa::CountedPtr<Scantable>& s, string mode="before" ) ;
-  vector<int> getRowIdFromTime( string reftime, casa::CountedPtr<Scantable>& s ) ;
   vector<int> getRowIdFromTime( double reftime, const casa::Vector<casa::Double>& t ) ;
 
@@ -420 +416 @@
                     const casa::Vector<casa::uInt> &rows,
                     const casa::String &antname ) ;
-  vector<float> getCalibratedSpectra( casa::CountedPtr<Scantable>& on,
-                                      casa::CountedPtr<Scantable>& off,
-                                      casa::CountedPtr<Scantable>& sky,
-                                      casa::CountedPtr<Scantable>& hot,
-                                      casa::CountedPtr<Scantable>& cold,
-                                      int index,
-                                      string antname ) ;
+
   // Tsys * (ON-OFF)/OFF
   void calibrateALMA( casa::CountedPtr<Scantable>& out,
@@ -432 +422 @@
                       const casa::CountedPtr<Scantable>& off,
                       const casa::Vector<casa::uInt>& rows ) ;
-  vector<float> getFSCalibratedSpectra( casa::CountedPtr<Scantable>& sig,
-                                        casa::CountedPtr<Scantable>& ref,
-                                        casa::CountedPtr<Scantable>& sky,
-                                        casa::CountedPtr<Scantable>& hot,
-                                        casa::CountedPtr<Scantable>& cold,
-                                        int index ) ;
-  vector<float> getFSCalibratedSpectra( casa::CountedPtr<Scantable>& sig,
-                                        casa::CountedPtr<Scantable>& ref,
-                                        vector< casa::CountedPtr<Scantable> >& sky,
-                                        vector< casa::CountedPtr<Scantable> >& hot,
-                                        vector< casa::CountedPtr<Scantable> >& cold,
-                                        int index ) ;
-  double getMJD( string strtime ) ;
+
+  // Frequency switching
+  void calibrateFS( casa::CountedPtr<Scantable> &sig,
+                    casa::CountedPtr<Scantable> &ref,
+                    const casa::CountedPtr<Scantable> &rsig,
+                    const casa::CountedPtr<Scantable> &rref,
+                    const casa::CountedPtr<Scantable> &sky,
+                    const casa::CountedPtr<Scantable> &hot,
+                    const casa::CountedPtr<Scantable> &cold,
+                    const casa::Vector<casa::uInt> &rows ) ;
+  void calibrateAPEXFS( casa::CountedPtr<Scantable> &sig,
+                        casa::CountedPtr<Scantable> &ref,
+                        const vector< casa::CountedPtr<Scantable> > &on,
+                        const vector< casa::CountedPtr<Scantable> > &sky,
+                        const vector< casa::CountedPtr<Scantable> > &hot,
+                        const vector< casa::CountedPtr<Scantable> > &cold,
+                        const casa::Vector<casa::uInt> &rows ) ;
   void copyRows( casa::Table &out, 
                  const casa::Table &in,