Changeset 2818 for trunk/src

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

Location:

trunk/src

Files:

• STMath.cpp (modified) (4 diffs)
• Scantable.cpp (modified) (2 diffs)
• Scantable.h (modified) (3 diffs)
• ScantableWrapper.h (modified) (1 diff)
• python_Scantable.cpp (modified) (1 diff)

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

trunk/src/Scantable.cpp

@@ -180 +180 @@
         table_ = TableCopy::makeEmptyMemoryTable(newname,
                                                  other.table_, True);
-      } else
+      } else {
         table_ = other.table_.copyToMemoryTable(newname);
+      }
   } else {
       other.table_.deepCopy(newname, Table::New, False,
@@ -450 +451 @@
   TableVector<Int> tabvec(table_, "SRCTYPE");
   tabvec = Int(stype);
+}
+
+void Scantable::setSourceName( const std::string& name )
+{
+  TableVector<String> tabvec(table_, "SRCNAME");
+  tabvec = name;
 }
 

trunk/src/Scantable.h

@@ -155 +155 @@
   void setSourceType(int stype);
 
+  /**
+   *
+   * @param stype The name of the source
+   */
+  void setSourceName(const std::string& name);
+
 
   /**
@@ -387 +393 @@
 
   //std::string getTime(int whichrow=-1, bool showdate=true) const;
-  std::string getTime(int whichrow=-1, bool showdate=true, casa::uInt prec=0) const;
+  std::string getTime(int whichrow=-1, bool showdate=true, 
+                      casa::uInt prec=0) const;
   double getIntTime(int whichrow) const { return integrCol_(whichrow); }
 
@@ -668 +675 @@
 
   std::string formatTime(const casa::MEpoch& me, bool showdate)const;
-  std::string formatTime(const casa::MEpoch& me, bool showdate, casa::uInt prec)const;
+  std::string formatTime(const casa::MEpoch& me, bool showdate, 
+                         casa::uInt prec)const;
 
   /**

trunk/src/ScantableWrapper.h

@@ -188 +188 @@
     { table_->setSourceType(stype); }
 
+  void setSourceName(const std::string& name)
+    { table_->setSourceName(name); }
+
   void shift(int npix)
   { table_->shift(npix); }

trunk/src/python_Scantable.cpp

@@ -137 +137 @@
     .def("_recalcazel", &ScantableWrapper::calculateAZEL)
     .def("_setsourcetype", &ScantableWrapper::setSourceType)
+    .def("_setsourcename", &ScantableWrapper::setSourceName)
     .def("_getdirectionvec", &ScantableWrapper::getDirectionVector)
     .def("_parallactify", &ScantableWrapper::parallactify)