Changeset 1388 for branches/alma

Timestamp:

07/27/07 02:02:13 (17 years ago)

Author:

TakTsutsumi

Message:

merged from NRAO version of ASAP2.1 with ALMA specific modifications

Location:

branches/alma/src

Files:

• STDefs.h (modified) (2 diffs)
• STFiller.h (modified) (1 diff)
• STFitter.h (modified) (1 diff)
• STMath.h (modified) (1 diff)
• STMathWrapper.h (modified) (1 diff)
• STWriter.h (modified) (1 diff)
• Scantable.h (modified) (1 diff)
• ScantableWrapper.h (modified) (1 diff)

branches/alma/src/STDefs.h

@@ -41 +41 @@
 
   enum Instrument {UNKNOWNINST=0,
+                   ALMA,
                    ATPKSMB,
                    ATPKSHOH,
@@ -46 +47 @@
                    TIDBINBILLA,
                    CEDUNA,
+                   GBT,
                    HOBART,
                    N_INSTRUMENTS};

branches/alma/src/STFiller.h

@@ -99 +99 @@
   casa::String filename_;
   casa::CountedPtr< Scantable > table_;
-  casa::Int nIF_, nBeam_, nPol_, nChan_;
+  casa::Int nIF_, nBeam_, nPol_, nChan_, nInDataRow;
   casa::uInt ifOffset_, beamOffset_;
   casa::Vector<casa::Bool> haveXPol_;

branches/alma/src/STFitter.h

@@ -64 +64 @@
   void reset();
   bool fit();
+  // Fit via linear method
+  bool lfit();
   bool computeEstimate();
 

branches/alma/src/STMath.h

@@ -132 +132 @@
                                         bool preserve = true );
 
+  /**
+    * Calibrate total power scans (translated from GBTIDL)
+    * @param calon uncalibrated Scantable with CAL noise signal
+    * @param caloff uncalibrated Scantable with no CAL signal
+    * @param tcal optional scalar Tcal, CAL temperature (K)
+    * @return casa::CountedPtr<Scantable> which holds a calibrated Scantable
+    * (spectrum - average of the two CAL on and off spectra;
+    * tsys - mean Tsys = <caloff>*Tcal/<calon-caloff> + Tcal/2)
+    */
+  casa::CountedPtr<Scantable> dototalpower( const casa::CountedPtr<Scantable>& calon,
+                                            const casa::CountedPtr<Scantable>& caloff,
+                                            casa::Float tcal=1.0 );
+
+  /**
+    * Combine signal and reference scans (translated from GBTIDL)
+    * @param sig Scantable which contains signal scans
+    * @param ref Scantable which contains reference scans
+    * @param smoothref optional Boxcar smooth width of the reference scans
+    * default: no smoothing (=1)
+    * @param tsysv optional scalar Tsys value at the zenith, required to
+    * set tau, as well
+    * @param tau optional scalar Tau value
+    * @return casa::CountedPtr<Scantable> which holds combined scans
+    * (spectrum = (sig-ref)/ref * Tsys )
+    */
+  casa::CountedPtr<Scantable> dosigref( const casa::CountedPtr<Scantable>& sig,
+                                        const casa::CountedPtr<Scantable>& ref,
+                                        int smoothref=1,
+                                        casa::Float tsysv=0.0,
+                                        casa::Float tau=0.0 );
+
+ /**
+    * Calibrate GBT Nod scan pairs (translated from GBTIDL)
+    * @param s Scantable which contains Nod scans
+    * @param scans Vector of scan numbers
+    * @param smoothref optional Boxcar smooth width of the reference scans
+    * @param tsysv optional scalar Tsys value at the zenith, required to
+    * set tau, as well
+    * @param tau optional scalar Tau value
+    * @param tcal optional scalar Tcal, CAL temperature (K)
+    * @return casa::CountedPtr<Scantable> which holds calibrated scans
+    */
+  casa::CountedPtr<Scantable> donod( const casa::CountedPtr<Scantable>& s,
+                                     const std::vector<int>& scans,
+                                     int smoothref=1,
+                                     casa::Float tsysv=0.0,
+                                     casa::Float tau=0.0,
+                                     casa::Float tcal=0.0 );
+
+  /**
+    * Calibrate frequency switched scans (translated from GBTIDL)
+    * @param s Scantable which contains frequency switched  scans
+    * @param scans Vector of scan numbers
+    * @param smoothref optional Boxcar smooth width of the reference scans
+    * @param tsysv optional scalar Tsys value at the zenith, required to
+    * set tau, as well
+    * @param tau optional scalar Tau value
+    * @param tcal optional scalar Tcal, CAL temperature (K)
+    * @return casa::CountedPtr<Scantable> which holds calibrated scans
+    */
+  casa::CountedPtr<Scantable> dofs( const casa::CountedPtr<Scantable>& s,
+                                    const std::vector<int>& scans,
+                                    int smoothref=1,
+                                    casa::Float tsysv=0.0,
+                                    casa::Float tau=0.0,
+                                    casa::Float tcal=0.0 );
+
+
   casa::CountedPtr<Scantable>
     freqSwitch( const casa::CountedPtr<Scantable>& in );

branches/alma/src/STMathWrapper.h

@@ -91 +91 @@
                                                preserve ) ); }
 
+  ScantableWrapper dototalpower( const ScantableWrapper& calon,
+                             const ScantableWrapper& caloff, casa::Float tcal= 0 )
+  { return ScantableWrapper( STMath::dototalpower( calon.getCP(), caloff.getCP(), tcal ) ); }
+
+  ScantableWrapper dosigref( const ScantableWrapper& sig,
+                             const ScantableWrapper& ref,
+                             int smoothref = 0, casa::Float tsysv=0.0, casa::Float tau=0.0)
+  { return ScantableWrapper( STMath::dosigref( sig.getCP(), ref.getCP(), smoothref, tsysv, tau ) ); }
+
+  ScantableWrapper donod( const ScantableWrapper& s,
+                          const std::vector<int>& scans,
+                          int smoothref = 0,
+                          casa::Float tsysv=0.0, casa::Float tau=0.0, casa::Float tcal=0.0 )
+  { return ScantableWrapper( STMath::donod( s.getCP(), scans, smoothref, tsysv, tau, tcal ) ); }
+
+  ScantableWrapper dofs( const ScantableWrapper& s,
+                         const std::vector<int>& scans,
+                         int smoothref = 0,
+                         casa::Float tsysv=0.0, casa::Float tau=0.0, casa::Float tcal=0.0 )
+  { return ScantableWrapper( STMath::dofs( s.getCP(), scans, smoothref, tsysv, tau, tcal ) ); }
+
   ScantableWrapper
     freqSwitch( const ScantableWrapper& in )

branches/alma/src/STWriter.h

@@ -81 +81 @@
                       casa::Vector<casa::Complex>& xpol,
                       const casa::Table& tab);
+
+  void replacePtTab(const casa::Table& tab, const std::string& fname);
+
   std::string     format_;
   PKSwriter* writer_;

branches/alma/src/Scantable.h

@@ -381 +381 @@
     { STFitEntry fe; fitTable_.getEntry(fe, mfitidCol_(row)); return fe; }
 
+  //Added by TT
+  /**
+   * Get the antenna name
+   * @return antenna name string
+   */
+  std::string getAntennaName() const;
+
+  /**
+   * For GBT MS data only. check a scan list
+   * against the information found in GBT_GO table for
+   * scan number orders to get correct pairs.
+   * @param[in] scan list
+   * @return status
+   */
+  int checkScanInfo(const std::vector<int>& scanlist) const;
+
+  /**
+   * Get the direction as a vector, for a specific row
+   * @param[in] whichrow the row numbyyer
+   * @return the direction in a vector
+   */
+  std::vector<double> getDirectionVector(int whichrow) const;
+
 private:
 

branches/alma/src/ScantableWrapper.h

@@ -199 +199 @@
     { return table_->columnNames(); }
 
+  std::string getAntennaName() const
+    { return table_->getAntennaName(); }
+
+  int checkScanInfo(const vector<int>& scanlist) const
+    { return table_->checkScanInfo(scanlist); }
+
+  std::vector<double>  getDirectionVector(int whichrow) const
+    { return table_->getDirectionVector(whichrow); }
+
 private:
   casa::CountedPtr<Scantable> table_;