Changeset 2735 for trunk

Timestamp:

01/17/13 18:54:24 (12 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-4770

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

• clean up log messages
• interface changes to be easier to call from Python layer
• added reset and completeReset method

Location:

trunk/src

Files:

• STApplyCal.cpp (modified) (24 diffs)
• STApplyCal.h (modified) (3 diffs)

trunk/src/STApplyCal.cpp

@@ -65 +65 @@
   caltype_ = STCalEnum::NoType;
   doTsys_ = False;
-  interp_.resize((int)STCalEnum::NumAxis);
-  // default is linear interpolation
-  for (unsigned int i = 0; i < interp_.size(); i++) {
-    interp_[i] = STCalEnum::LinearInterpolation;
-  }
+}
+
+void STApplyCal::reset()
+{
+}
+
+void STApplyCal::completeReset()
+{
+  reset();
+  target_ = 0;
 }
 
@@ -85 +90 @@
 void STApplyCal::push(STCalSkyTable *table)
 {
+  os_.origin(LogOrigin("STApplyCal","push",WHERE));
   skytable_.push_back(table);
   STCalEnum::CalType caltype = STApplyTable::getCalType(table);
@@ -102 +108 @@
 }
 
-void STApplyCal::setInterpolation(STCalEnum::InterpolationAxis axis, STCalEnum::InterpolationType itype, Int order)
-{
-  interp_[(int)axis] = itype;
+void STApplyCal::setTimeInterpolation(STCalEnum::InterpolationType itype, Int order)
+{
+  iTime_ = itype;
   order_ = order;
 }
 
+void STApplyCal::setFrequencyInterpolation(STCalEnum::InterpolationType itype, Int order)
+{
+  iFreq_ = itype;
+  order_ = order;
+}
+
 void STApplyCal::setTsysTransfer(uInt from, Vector<uInt> to)
 {
+  os_.origin(LogOrigin("STApplyCal","setTsysTransfer",WHERE));
   os_ << "from=" << from << ", to=" << to << LogIO::POST;
   map<uInt, Vector<uInt> >::iterator i = spwmap_.find(from);
@@ -128 +141 @@
 void STApplyCal::apply(Bool insitu)
 {
+  os_.origin(LogOrigin("STApplyCal","apply",WHERE));
   // calibrator
   if (caltype_ == STCalEnum::CalPSAlma)
@@ -143 +157 @@
   target_->setSelection(sel_);
 
-  os_ << "sel_.print()=" << sel_.print() << LogIO::POST;
+  //os_ << "sel_.print()=" << sel_.print() << LogIO::POST;
 
   // working data
@@ -151 +165 @@
     work_ = new Scantable(*target_, false);
 
-  os_ << "work_->nrow()=" << work_->nrow() << LogIO::POST;
+  //os_ << "work_->nrow()=" << work_->nrow() << LogIO::POST;
 
   // list of apply tables for sky calibration
@@ -157 +171 @@
   uInt numSkyCal = 0;
   uInt nrowSky = 0;
+
   // list of apply tables for Tsys calibration
-//   Vector<uInt> tsyscalList;
-
   for (uInt i = 0 ; i < skytable_.size(); i++) {
     STCalEnum::CalType caltype = STApplyTable::getCalType(skytable_[i]);
@@ -179 +192 @@
     Vector<uInt> ids = iter->current();
     Vector<uInt> rows = iter->getRows(SHARE);
-    os_ << "ids=" << ids << LogIO::POST;
     if (rows.nelements() > 0)
       doapply(ids[0], ids[2], ids[1], rows, skycalList);
@@ -192 +204 @@
                          Vector<uInt> &skylist)
 {
-  os_ << "skylist=" << skylist << LogIO::POST;
-  os_ << "rows=" << rows << LogIO::POST;
+  os_.origin(LogOrigin("STApplyCal","doapply",WHERE));
   Bool doTsys = doTsys_;
 
-  //STSelector sel = sel_;
   STSelector sel;
   vector<int> id(1);
@@ -205 +215 @@
   id[0] = polno;
   sel.setPolarizations(id);  
-  os_ << "sel=" << sel.print() << LogIO::POST;
 
   // apply selection to apply tables
@@ -233 +242 @@
     ftsys = tsystable_[0]->getBaseFrequency(0);
     interpolatorF_->setX(ftsys.data(), nchanTsys);
-    os_ << "nchanTsys=" << nchanTsys << LogIO::POST;
     id[0] = (int)tsysifno;
     sel.setIFs(id);
@@ -239 +247 @@
       tsystable_[i]->setSelection(sel);
       nrowTsys += tsystable_[i]->nrow();
-      os_ << "nrowTsys=" << nrowTsys << LogIO::POST;
     }
   }
 
   uInt nchanSp = skytable_[skylist[0]]->nchan(ifno);
-  os_ << "nchanSp = " << nchanSp << LogIO::POST;
   Vector<Double> timeSky(nrowSky);
   Matrix<Float> spoff(nchanSp, nrowSky);
   Vector<Float> iOff(nchanSp);
   nrowSky = 0;
-  os_ << "spoff.shape()=" << spoff.shape() << LogIO::POST;
   for (uInt i = 0 ; i < skylist.nelements(); i++) {
     STCalSkyTable *p = skytable_[skylist[i]];
-    os_ << "table " << i << ": nrow=" << p->nrow() << LogIO::POST;
     Vector<Double> t = p->getTime();
     Matrix<Float> sp = p->getSpectra();
-    os_ << "sp.shape()=" << sp.shape() << LogIO::POST;
-    os_ << "t.nelements()=" << t.nelements() << LogIO::POST;
     for (uInt j = 0; j < t.nelements(); j++) {
       timeSky[nrowSky] = t[j];
-      os_ << "timeSky[" << nrowSky << "]-timeSky[0]=" << timeSky[nrowSky] - timeSky[0] << LogIO::POST;
       spoff.column(nrowSky) = sp.column(j);
       nrowSky++;
     }
   }
-  os_ << "timeSky-timeSky[0]=" << timeSky-timeSky[0] << LogIO::POST;
 
   Vector<uInt> skyIdx = timeSort(timeSky);
-  os_ << "skyIdx = " << skyIdx << LogIO::POST;
 
   Double *xa = new Double[skyIdx.nelements()];
@@ -276 +275 @@
   for (uInt i = 0 ; i < skyIdx.nelements(); i++) {
     timeSkySorted[i] = timeSky[skyIdx[i]];
-    os_ << "timeSkySorted[" << i << "]-timeSkySorted[0]=" << timeSkySorted[i] - timeSkySorted[0] << LogIO::POST;
-  }
-  os_ << "timeSkySorted-timeSkySorted[0]=" << timeSkySorted-timeSkySorted[0] << LogIO::POST;
+  }
 
   interpolatorS_->setX(xa, skyIdx.nelements());
 
-  os_ << "doTsys = " << doTsys << LogIO::POST;
   Vector<uInt> tsysIdx;
   Vector<Double> timeTsys(nrowTsys);
@@ -295 +291 @@
     for (uInt i = 0 ; i < tsystable_.size(); i++) {
       STCalTsysTable *p = tsystable_[i];
-      os_ << "p->nrow()=" << p->nrow() << LogIO::POST;
       Vector<Double> t = p->getTime();
-      os_ << "t=" << t << LogIO::POST;
       Matrix<Float> ts = p->getTsys();
       for (uInt j = 0; j < t.nelements(); j++) {
@@ -306 +300 @@
     }
     tsysIdx = timeSort(timeTsys);
-    os_ << "tsysIdx = " << tsysIdx << LogIO::POST;
 
     Double *xb = new Double[tsysIdx.nelements()];
@@ -315 +308 @@
     for (uInt i = 0 ; i < tsysIdx.nelements(); i++) {
       timeTsysSorted[i] = timeTsys[tsysIdx[i]];
-      os_ << "timeTsysSorted[" << i << "]-timeTsysSorted[0]=" << timeTsysSorted[i] - timeTsysSorted[0] << LogIO::POST;
-    }
-    os_ << "timeTsysSorted=" << timeTsysSorted << LogIO::POST;
+    }
     interpolatorT_->setX(xb, tsysIdx.nelements());
   }
@@ -323 +314 @@
   Table tab = work_->table();
   ArrayColumn<Float> spCol(tab, "SPECTRA");
+  ArrayColumn<Float> tsysCol(tab, "TSYS");
   ScalarColumn<Double> timeCol(tab, "TIME");
   Vector<Float> on;
   for (uInt i = 0; i < rows.nelements(); i++) {
-    os_ << "start row " << i << LogIO::POST;
+    os_ << "start i = " << i << " (row = " << rows[i] << ")" << LogIO::POST;
     uInt irow = rows[i];
 
@@ -362 +354 @@
         iTsysT[ichan] = interpolatorT_->interpolate(t0);
       }
-      os_ << "iTsysT=" << iTsysT << LogIO::POST;
       if (nchanSp == 1) {
         // take average
@@ -369 +360 @@
       else {
         // interpolation on frequency axis
-        os_ << "getBaseFrequency for target" << LogIO::POST;
         Vector<Double> fsp = getBaseFrequency(rows[i]);
-        os_ << "fsp = " << fsp << LogIO::POST;
         interpolatorF_->setY(yt, nchanTsys);
         for (uInt ichan = 0; ichan < nchanSp; ichan++) {
@@ -381 +370 @@
       iTsys = 1.0;
     } 
-    os_ << "iTsys=" << iTsys << LogIO::POST;
+    //os_ << "iTsys=" << iTsys << LogIO::POST;
     calibrator_->setScaler(iTsys);
   
@@ -388 +377 @@
 
     // update table
-    os_ << "calibrated=" << calibrator_->getCalibrated() << LogIO::POST; 
+    //os_ << "calibrated=" << calibrator_->getCalibrated() << LogIO::POST; 
     spCol.put(irow, calibrator_->getCalibrated());
-    
+    tsysCol.put(irow, iTsys);
   }
   
@@ -421 +410 @@
        i != spwmap_.end(); i++) {
     Vector<uInt> tolist = i->second;
-    os_ << i->first << ": tolist=" << tolist << LogIO::POST;
+    os_ << "from=" << i->first << ": tolist=" << tolist << LogIO::POST;
     for (uInt j = 0; j < tolist.nelements(); j++) {
       if (tolist[j] == to)
@@ -458 +447 @@
 void STApplyCal::initInterpolator()
 {
-  int ta = (int)STCalEnum::TimeAxis;
-  int fa = (int)STCalEnum::FrequencyAxis;
+  os_.origin(LogOrigin("STApplyCal","initInterpolator",WHERE));
   int order = (order_ > 0) ? order_ : 1;
-  switch (interp_[ta]) {
+  switch (iTime_) {
   case STCalEnum::NearestInterpolation:
     {
@@ -507 +495 @@
   }
    
-  switch (interp_[fa]) {
+  switch (iFreq_) {
   case STCalEnum::NearestInterpolation:
     {

trunk/src/STApplyCal.h

@@ -58 +58 @@
 
   // set interpolation method
-  void setInterpolation(STCalEnum::InterpolationAxis axis, STCalEnum::InterpolationType itype, casa::Int order=-1);
+  //void setInterpolation(STCalEnum::InterpolationAxis axis, STCalEnum::InterpolationType itype, casa::Int order=-1);
+  void setTimeInterpolation(STCalEnum::InterpolationType itype, casa::Int order=-1);
+  void setFrequencyInterpolation(STCalEnum::InterpolationType itype, casa::Int order=-1);
 
   // set IF (spw) mapping for Tsys transfer
@@ -69 +71 @@
   void save(const casa::String &name);
 
+  // reset all settings except target scantable
+  void reset();
+
+  // reset all settings
+  void completeReset();
+  
 private:
   // initialization
@@ -100 +108 @@
 
   // interpolation method
-  std::vector<STCalEnum::InterpolationType> interp_;
-  casa::Bool is2d_;
+  STCalEnum::InterpolationType iTime_;
+  STCalEnum::InterpolationType iFreq_;
   casa::Int order_;
   casa::CountedPtr<Interpolator1D<casa::Double, casa::Float> > interpolatorT_;