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

Timestamp:

06/12/12 18:45:52 (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 cwcal based on update of almacal.

File:

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

branches/hpc33/src/STMath.h

@@ -403 +403 @@
 
   vector<float> getSpectrumFromTime( string reftime, casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
-  casa::Vector<casa::Float> getSpectrumFromTime( double reftime, casa::Vector<casa::Double> &v, const casa::CountedPtr<Scantable>& s, string mode = "before" ) ;
-  casa::Vector<casa::Float> getSpectrumFromTime( double reftime, const casa::Vector<casa::Double> &v, const casa::Matrix<casa::Float>& sp, string mode = "before" ) ;
-  void getSpectrumFromTime2( casa::Vector<casa::Float> &sp, double reftime, casa::Vector<casa::Double> &v, const 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 ) ;
 
   // Chopper-Wheel type calibration
+  void calibrateCW( casa::CountedPtr<Scantable> &out,
+                    const casa::CountedPtr<Scantable> &on,
+                    const casa::CountedPtr<Scantable> &off,
+                    const casa::CountedPtr<Scantable> &sky,
+                    const casa::CountedPtr<Scantable> &hot,
+                    const casa::CountedPtr<Scantable> &cold,
+                    const casa::Vector<casa::uInt> &rows,
+                    const casa::String &antname ) ;
   vector<float> getCalibratedSpectra( casa::CountedPtr<Scantable>& on,
                                       casa::CountedPtr<Scantable>& off,
@@ -420 +428 @@
                                       string antname ) ;
   // Tsys * (ON-OFF)/OFF
-  vector<float> getCalibratedSpectra( casa::CountedPtr<Scantable>& on,
-                                      casa::CountedPtr<Scantable>& off,
-                                      int index ) ;
   void calibrateALMA( casa::CountedPtr<Scantable>& out,
                       const casa::CountedPtr<Scantable>& on,
                       const casa::CountedPtr<Scantable>& off,
-                      casa::Vector<casa::uInt>& rows ) ;
+                      const casa::Vector<casa::uInt>& rows ) ;
   vector<float> getFSCalibratedSpectra( casa::CountedPtr<Scantable>& sig,
                                         casa::CountedPtr<Scantable>& ref,