Changeset 2965 for trunk

Timestamp:

07/01/14 11:27:58 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-6585, CAS-6571

Ready for Test: Yes

Interface Changes: Yes/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...

Refactoring STApplyCal::doapply.

File:

• trunk/src/STApplyCal.cpp (modified) (6 diffs)

trunk/src/STApplyCal.cpp

@@ -143 +143 @@
   static Matrix<uChar> GetFlag(const TableType *t) {return t->getFlagtra();}
 };
+
+inline uInt setupWorkingData(const uInt n, const Double *xin, const Float *yin,
+                      const uChar *f, Double *xout, Float *yout)
+{
+  uInt nValid = 0;
+  for (uInt i = 0; i < n; ++i) {
+    if (f[i] == 0) {
+      xout[nValid] = xin[i];
+      yout[nValid] = yin[i];
+      nValid++;
+    }
+  }
+  return nValid;
+}
+
+template<class InterpolationHelperImpl>
+class InterpolationHelperInterface
+{
+public:
+  static void Interpolate(const Double xref, const uInt nx, const uInt ny,
+                          Double *xin, Float *yin, uChar *fin,
+                          asap::Interpolator1D<Double, Float> *interpolator,
+                          Double *xwork, Float *ywork,
+                          Float *yout, uChar *fout)
+  {
+    for (uInt i = 0; i < ny; i++) {
+      Float *tmpY = &(yin[i * nx]);
+      uInt wnrow = setupWorkingData(nx, xin, tmpY, &(fin[i * nx]), xwork, ywork);
+      if (wnrow > 0) {
+        // any valid reference data
+        InterpolationHelperImpl::ProcessValid(xref, i, interpolator,
+                                              xwork, ywork, wnrow,
+                                              yout, fout);
+      }
+      else {
+        // no valid reference data
+        InterpolationHelperImpl::ProcessInvalid(xref, i, interpolator,
+                                                xin, tmpY, nx,
+                                                yout, fout);
+      }
+    }
+  }
+};
+
+class SkyInterpolationHelper : public InterpolationHelperInterface<SkyInterpolationHelper>
+{
+public:
+  static void ProcessValid(const Double xref, const uInt index,
+                           asap::Interpolator1D<Double, Float> *interpolator,
+                           Double *xwork, Float *ywork,
+                           const uInt wnrow, Float *yout, uChar *fout)
+  {
+    interpolator->setData(xwork, ywork, wnrow);
+    yout[index] = interpolator->interpolate(xref);
+  }
+  static void ProcessInvalid(const Double xref, const uInt index,
+                             asap::Interpolator1D<Double, Float> *interpolator,
+                             Double *xwork, Float *ywork,
+                             const uInt wnrow, Float *yout, uChar *fout)
+  {
+    // interpolate data regardless of flag
+    ProcessValid(xref, index, interpolator, xwork, ywork, wnrow, yout, fout);
+    // flag this channel for calibrated data
+    fout[index] = 1 << 7; // user flag
+  }
+};
+
+class TsysInterpolationHelper : public InterpolationHelperInterface<TsysInterpolationHelper>
+{
+public:
+  static void ProcessValid(const Double xref, const uInt index,
+                           asap::Interpolator1D<Double, Float> *interpolator,
+                           Double *xwork, Float *ywork,
+                           const uInt wnrow, Float *yout, uChar *fout)
+  {
+    interpolator->setData(xwork, ywork, wnrow);
+    yout[index] = interpolator->interpolate(xref);
+    fout[index] = 0;
+  }
+  static void ProcessInvalid(const Double xref, const uInt index,
+                             asap::Interpolator1D<Double, Float> *interpolator,
+                             Double *xwork, Float *ywork,
+                             const uInt wnrow, Float *yout, uChar *fout)
+  {
+    fout[index] = 1 << 7; // user flag
+  }
+};
 }
 
@@ -443 +530 @@
   Vector<Float> ywork(IPosition(1, arraySize), new Float[arraySize], TAKE_OVER);
   Vector<uChar> fwork(IPosition(1, nchanTsys), new uChar[nchanTsys], TAKE_OVER);
+
+  // data array 
+  Vector<Float> on(IPosition(1, nchanSp), new Float[nchanSp], TAKE_OVER);
+  Vector<uChar> flag(on.shape(), new uChar[on.shape().product()], TAKE_OVER);
   
   for (uInt i = 0; i < rows.nelements(); i++) {
@@ -449 +540 @@
 
     // target spectral data
-    Vector<Float> on = spCol(irow);
-    Vector<uChar> flag = flCol(irow);
+    spCol.get(irow, on);
+    flCol.get(irow, flag);
     //os_ << "on=" << on[0] << LogIO::POST;
     calibrator_->setSource(on);
@@ -458 +549 @@
     Double *xwork_p = xwork.data();
     Float *ywork_p = ywork.data();
-    for (uInt ichan = 0; ichan < nchanSp; ichan++) {
-      Float *tmpY = &(spoff.data()[ichan * nrowSky]);
-      uChar *tmpF = &(flagoff.data()[ichan * nrowSky]);
-      uInt wnrow = 0;
-      for (uInt ir = 0; ir < nrowSky; ++ir) {
-        if (tmpF[ir] == 0) {
-          xwork_p[wnrow] = timeSky.data()[ir];
-          ywork_p[wnrow] = tmpY[ir];
-          wnrow++;
-        }
-      }
-      if (wnrow > 0) {
-        // any valid reference data
-        interpolatorS_->setData(xwork_p, ywork_p, wnrow);
-      }
-      else {
-        // no valid reference data
-        // interpolate data regardless of flag
-        interpolatorS_->setData(timeSky.data(), tmpY, nrowSky);
-        // flag this channel for calibrated data
-        flag[ichan] = 1 << 7; // user flag
-      }
-      iOff[ichan] = interpolatorS_->interpolate(t0);
-    }
-    //os_ << "iOff=" << iOff[0] << LogIO::POST;
+    SkyInterpolationHelper::Interpolate(t0, nrowSky, nchanSp,
+                                        timeSky.data(), spoff.data(),
+                                        flagoff.data(), &(*interpolatorS_),
+                                        xwork_p, ywork_p, 
+                                        iOff.data(), flag.data());
     calibrator_->setReference(iOff);
     
@@ -488 +559 @@
       // Tsys correction
       // interpolation on time axis
-      Float *yt = iTsysT.data();
+      TsysInterpolationHelper::Interpolate(t0, nrowTsys, nchanTsys,
+                                           timeTsys.data(), tsys.data(),
+                                           flagtsys.data(), &(*interpolatorT_),
+                                           xwork_p, ywork_p,
+                                           iTsysT.data(), fwork.data());
       uChar *fwork_p = fwork.data();
-      for (uInt ichan = 0; ichan < nchanTsys; ichan++) {
-        Float *tmpY = &(tsys.data()[ichan * nrowTsys]);
-        uChar *tmpF = &(flagtsys.data()[ichan * nrowTsys]);
-        uInt wnrow = 0;
-        for (uInt ir = 0; ir < nrowTsys; ++ir) {
-          if (tmpF[ir] == 0) {
-            xwork_p[wnrow] = timeTsys.data()[ir];
-            ywork_p[wnrow] = tmpY[ir];
-            wnrow++;
-          }
-        }
-        if (wnrow > 0) {
-          // any valid value exists
-          interpolatorT_->setData(xwork_p, ywork_p, wnrow);
-          iTsysT[ichan] = interpolatorT_->interpolate(t0);
-          fwork_p[ichan] = 0;
-        }
-        else {
-          // no valid data
-          fwork_p[ichan] = 1 << 7; // user flag
-        }
-      }
       if (nchanSp == 1) {
         // take average
@@ -519 +572 @@
         // interpolation on frequency axis
         Vector<Double> fsp = getBaseFrequency(rows[i]);
-        uInt wnchan = 0;
-        for (uInt ichan = 0; ichan < nchanTsys; ++ichan) {
-          if (fwork_p[ichan] == 0) {
-            xwork_p[wnchan] = ftsys.data()[ichan];
-            ywork_p[wnchan] = yt[ichan];
-            ++wnchan;
-          }
-        }
-        //interpolatorF_->setY(yt, nchanTsys);
+        uInt wnchan = setupWorkingData(nchanTsys, ftsys.data(), iTsysT.data(),
+                                       fwork_p, xwork_p, ywork_p);
         interpolatorF_->setData(xwork_p, ywork_p, wnchan);
         for (uInt ichan = 0; ichan < nchanSp; ichan++) {