Changeset 2818 for trunk/src/STMath.cpp

Timestamp:

07/02/13 10:38:18 (11 years ago)

Author:

Malte Marquarding

Message:

Issue #291: added scantable.set_sourcename to overwrite sourcename to allow freq_align to work. Exposed 'SOURCE' averaging to python api. Added some logging to freq_align refering to the sources it aligns to

File:

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

trunk/src/STMath.cpp

@@ -2781 +2781 @@
   MVTime mvt(refEpoch.getValue());
   String epochout = mvt.string(MVTime::YMD) + String(" (") + refEpoch.getRefString() + String(")");
-  os << "Aligned at reference Epoch " << epochout
+  os << "Aligning at reference Epoch " << epochout
      << " in frame " << MFrequency::showType(system) << LogIO::POST;
   // set up the iterator
@@ -2795 +2795 @@
   while ( !iter.pastEnd() ) {
     Table t = iter.table();
+    ROScalarColumn<String> snCol(t, "SRCNAME");
+    os << "Aligning to position of source '" << snCol(0) << "'" << LogIO::POST;
     MDirection::ROScalarColumn dirCol(t, "DIRECTION");
     TableIterator fiter(t, "FREQ_ID");
     // determine nchan from the first row. This should work as
-    // we are iterating over BEAMNO and IFNO    // we should have constant direction
+    // we are iterating over BEAMNO and IFNO    
+    // we should have constant direction
 
     ROArrayColumn<Float> sCol(t, "SPECTRA");
@@ -2813 +2816 @@
     ScalarColumn<uInt> freqidCol(ftab, "FREQ_ID");
     // get the SpectralCoordinate for the freqid, which we are iterating over
-    SpectralCoordinate sC = in->frequencies().getSpectralCoordinate(freqidCol(0));
+    SpectralCoordinate sC = \
+      in->frequencies().getSpectralCoordinate(freqidCol(0));
     FrequencyAligner<Float> fa( sC, nchan, refEpoch,
                                 direction, refPos, system );
@@ -2826 +2830 @@
                                                 sc2.increment()[0]);
     while ( !fiter.pastEnd() ) {
+      
       ftab = fiter.table();
       // spectral coordinate for the current FREQ_ID