Changeset 2720 for trunk/src/STCalSkyTable.cpp

Timestamp:

01/09/13 19:27:23 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: Yes

JIRA Issue: Yes CAS-4770 and its sub-tickets

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...

First version of applycal for single dish calibration.
Added new classes for the operation (STApplyCal, Calibrator, PSAlmaCalibrator,
Locator, BisectionLocator?, Interpolator1D, NearestInterpolator1D).
Also, modified existing classes to fit with implementation of applycal.

File:

• trunk/src/STCalSkyTable.cpp (modified) (4 diffs)

trunk/src/STCalSkyTable.cpp

@@ -38 +38 @@
 }
 
+STCalSkyTable::STCalSkyTable(const String &name)
+  : STApplyTable(name)
+{
+  attachOptionalColumns();
+}
+
 STCalSkyTable::~STCalSkyTable()
 {
@@ -63 +69 @@
 
 void STCalSkyTable::setdata(uInt irow, uInt scanno, uInt cycleno, 
-                       uInt beamno, uInt ifno, uInt polno, 
-                       Double time, Float elevation, Vector<Float> spectra)
+                            uInt beamno, uInt ifno, uInt polno, uInt freqid,  
+                            Double time, Float elevation, Vector<Float> spectra)
 {
   if (irow >= (uInt)nrow()) {
@@ -75 +81 @@
   }  
 
-  setbasedata(irow, scanno, cycleno, beamno, ifno, polno, time);
+  setbasedata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time);
   elCol_.put(irow, elevation);
   spectraCol_.put(irow, spectra);
@@ -81 +87 @@
 
 void STCalSkyTable::appenddata(uInt scanno, uInt cycleno, 
-                          uInt beamno, uInt ifno, uInt polno, 
-                          Double time, Float elevation, Vector<Float> spectra)
+                               uInt beamno, uInt ifno, uInt polno, uInt freqid,
+                               Double time, Float elevation, Vector<Float> spectra)
 {
   uInt irow = nrow();
   table_.addRow(1, True);
-  setdata(irow, scanno, cycleno, beamno, ifno, polno, time, elevation, spectra);
+  setdata(irow, scanno, cycleno, beamno, ifno, polno, freqid, time, elevation, spectra);
 }
+
+uInt STCalSkyTable::nchan(uInt ifno)
+{
+  STSelector org = sel_;
+  STSelector sel;
+  sel.setIFs(vector<int>(1,(int)ifno));
+  setSelection(sel);
+  uInt n = spectraCol_(0).nelements();
+  unsetSelection();
+  if (!org.empty())
+    setSelection(org);
+  return n;
 }
+
+// Vector<Double> STCalSkyTable::getBaseFrequency(uInt whichrow)
+// {
+//   assert(whichrow < nrow());
+//   uInt freqid = freqidCol_(whichrow);
+//   uInt nc = spectraCol_(whichrow).nelements();
+//   Block<Double> f = getFrequenciesRow(freqid);
+//   Vector<Double> freqs(nc);
+//   indgen(freqs, f[1]-f[0]*f[2], f[2]);
+//   return freqs;
+// }
+}