Changeset 2925 for trunk/src

Timestamp:

04/09/14 12:51:32 (11 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: test_tsdcal2

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Improve performance by reconsidering array element order.

File:

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

trunk/src/STApplyCal.cpp

@@ -227 +227 @@
   cols[2] = "IFNO" ;
   CountedPtr<STIdxIter2> iter = new STIdxIter2(work_, cols) ;
+  double start = mathutil::gettimeofday_sec();
+  os_ << LogIO::DEBUGGING << "start iterative doapply: " << start << LogIO::POST;
   while (!iter->pastEnd()) {
     Record ids = iter->currentValue();
@@ -234 +236 @@
     iter->next();
   }
+  double end = mathutil::gettimeofday_sec();
+  os_ << LogIO::DEBUGGING << "end iterative doapply: " << end << LogIO::POST;
+  os_ << LogIO::DEBUGGING << "elapsed time for doapply: " << end - start << " sec" << LogIO::POST;
 
   target_->unsetSelection();
@@ -299 +304 @@
   uInt nchanSp = skytable_[skylist[0]]->nchan(ifno);
   Vector<Double> timeSky(nrowSky);
-  Matrix<Float> spoff(nchanSp, nrowSky);
+  Matrix<Float> spoff(nrowSky, nchanSp);
   Vector<Float> iOff(nchanSp);
   nrowSky = 0;
@@ -308 +313 @@
     for (uInt j = 0; j < t.nelements(); j++) {
       timeSky[nrowSky] = t[j];
-      spoff.column(nrowSky) = sp.column(j);
+      spoff.row(nrowSky) = sp.column(j);
       nrowSky++;
     }
@@ -334 +339 @@
     //os_ << "doTsys" << LogIO::POST;
     timeTsys.resize(nrowTsys);
-    tsys.resize(nchanTsys, nrowTsys);
+    tsys.resize(nrowTsys, nchanTsys);
     nrowTsys = 0;
     for (uInt i = 0 ; i < tsystable_.size(); i++) {
@@ -342 +347 @@
       for (uInt j = 0; j < t.nelements(); j++) {
         timeTsys[nrowTsys] = t[j];
-        tsys.column(nrowTsys) = ts.column(j);
+        tsys.row(nrowTsys) = ts.column(j);
         nrowTsys++;
       }
@@ -364 +369 @@
   ScalarColumn<Double> timeCol(tab, "TIME");
   Vector<Float> on;
+
+  // Array for scaling factor (aka Tsys)
+  Vector<Float> iTsys(IPosition(1,nchanSp), new Float[nchanSp], TAKE_OVER);
+  
   for (uInt i = 0; i < rows.nelements(); i++) {
     //os_ << "start i = " << i << " (row = " << rows[i] << ")" << LogIO::POST;
@@ -376 +385 @@
     Double t0 = timeCol(irow);
     for (uInt ichan = 0; ichan < nchanSp; ichan++) {
-      Vector<Float> spOffSlice = spoff.row(ichan);
-      //os_ << "spOffSlice = " << spOffSlice << LogIO::POST;
       for (uInt j = 0; j < skyIdx.nelements(); j++) {
-        tmpOff[j] = spOffSlice[skyIdx[j]];
+        tmpOff[j] = spoff(skyIdx[j], ichan);
       }
       interpolatorS_->setY(ya, skyIdx.nelements());
@@ -387 +394 @@
     calibrator_->setReference(iOff);
     
-    Float *Y = new Float[nchanSp];
-    Vector<Float> iTsys(IPosition(1,nchanSp), Y, TAKE_OVER);
     if (doTsys) {
       // Tsys correction
@@ -395 +400 @@
       Float *yb = tmpTsys.data();
       for (uInt ichan = 0; ichan < nchanTsys; ichan++) {
-        Vector<Float> tsysSlice = tsys.row(ichan);
         for (uInt j = 0; j < tsysIdx.nelements(); j++) {
-          tmpTsys[j] = tsysSlice[tsysIdx[j]];
+          tmpTsys[j] = tsys(tsysIdx[j], ichan);
         }
         interpolatorT_->setY(yb, tsysIdx.nelements());