Changeset 1360 for trunk

Timestamp:

04/27/07 11:00:43 (18 years ago)

Author:

mar637

Message:

enhancement #107; added scantable.shift_refpix

Location:

trunk

Files:

• python/__init__.py (modified) (1 diff)
• python/scantable.py (modified) (1 diff)
• src/STFrequencies.cpp (modified) (15 diffs)
• src/STFrequencies.h (modified) (1 diff)
• src/Scantable.cpp (modified) (13 diffs)
• src/Scantable.h (modified) (1 diff)
• src/ScantableWrapper.h (modified) (1 diff)
• src/python_Scantable.cpp (modified) (1 diff)

trunk/python/__init__.py

@@ -417 +417 @@
             get_restfreqs   - get the current list of rest frequencies
             set_restfreqs   - set a list of rest frequencies
+            shift_refpix    - shift the reference pixel of the IFs
             flag            - flag selected channels in the data
             lag_flag        - flag specified frequency in the data

trunk/python/scantable.py

@@ -852 +852 @@
         self._add_history("set_restfreqs", varlist)
 
-
+    def shift_refpix(self, delta):
+        """
+        Shift the reference pixel of the Spectra Coordinate by an 
+        integer amount.
+        Parameters:
+            delta:   the amount to shift by
+        Note:
+            Be careful using this with broadband data.
+        """
+        Scantable.shift(self, delta)
 
     def history(self, filename=None):

trunk/src/STFrequencies.cpp

@@ -41 +41 @@
 }
 
-asap::STFrequencies::STFrequencies( casa::Table tab ) :
+STFrequencies::STFrequencies( casa::Table tab ) :
   STSubTable(tab, name_)
 {
@@ -54 +54 @@
 }
 
-STFrequencies & asap::STFrequencies::operator =( const STFrequencies & other )
+STFrequencies & STFrequencies::operator=( const STFrequencies & other )
 {
   if ( this != &other ) {
@@ -140 +140 @@
   // get first row - there should only be one matching id
   const TableRecord& rec = row.get(0);
-
   return SpectralCoordinate( getFrame(true), rec.asDouble("REFVAL"),
                              rec.asDouble("INCREMENT"),
@@ -147 +146 @@
 
 SpectralCoordinate
-  asap::STFrequencies::getSpectralCoordinate( const MDirection& md,
-                                              const MPosition& mp,
-                                              const MEpoch& me,
-                                              Double restfreq, uInt id ) const
+  STFrequencies::getSpectralCoordinate( const MDirection& md,
+                                        const MPosition& mp,
+                                        const MEpoch& me,
+                                        Double restfreq, uInt id ) const
 {
   SpectralCoordinate spc = getSpectralCoordinate(id);
@@ -242 +241 @@
 }
 
-std::string asap::STFrequencies::getFrameString( bool base ) const
+std::string STFrequencies::getFrameString( bool base ) const
 {
   if ( base ) return table_.keywordSet().asString("BASEFRAME");
@@ -248 +247 @@
 }
 
-std::string asap::STFrequencies::getUnitString( ) const
+std::string STFrequencies::getUnitString( ) const
 {
   return table_.keywordSet().asString("UNIT");
 }
 
-Unit asap::STFrequencies::getUnit( ) const
+Unit STFrequencies::getUnit( ) const
 {
   return Unit(table_.keywordSet().asString("UNIT"));
 }
 
-std::string asap::STFrequencies::getDopplerString( ) const
+std::string STFrequencies::getDopplerString( ) const
 {
   return table_.keywordSet().asString("DOPPLER");
 }
 
-MDoppler::Types asap::STFrequencies::getDoppler( ) const
+MDoppler::Types STFrequencies::getDoppler( ) const
 {
   String dpl = table_.keywordSet().asString("DOPPLER");
@@ -275 +274 @@
 }
 
-std::string asap::STFrequencies::print( int id )
+std::string STFrequencies::print( int id )
 {
   Table t;
@@ -303 +302 @@
 }
 
-bool asap::STFrequencies::conformant( const STFrequencies& other ) const
+bool STFrequencies::conformant( const STFrequencies& other ) const
 {
   const Record& r = table_.keywordSet();
@@ -314 +313 @@
 }
 
-std::vector< std::string > asap::STFrequencies::getInfo( ) const
+std::vector< std::string > STFrequencies::getInfo( ) const
 {
   const Record& r = table_.keywordSet();
@@ -324 +323 @@
 }
 
-void asap::STFrequencies::setInfo( const std::vector< std::string >& theinfo )
+void STFrequencies::setInfo( const std::vector< std::string >& theinfo )
 {
   if ( theinfo.size() != 3 ) throw(AipsError("setInfo needs three parameters"));
@@ -336 +335 @@
 }
 
-void asap::STFrequencies::setUnit( const std::string & unit )
+void STFrequencies::setUnit( const std::string & unit )
 {
   if (unit == "" || unit == "pixel" || unit == "channel" ) {
@@ -350 +349 @@
 }
 
-void asap::STFrequencies::setFrame(MFrequency::Types frame, bool base )
+void STFrequencies::setFrame(MFrequency::Types frame, bool base )
 {
   String f = MFrequency::showType(frame);
@@ -360 +359 @@
 }
 
-void asap::STFrequencies::setFrame( const std::string & frame, bool base )
+void STFrequencies::setFrame( const std::string & frame, bool base )
 {
   MFrequency::Types mdr;
@@ -380 +379 @@
 }
 
-void asap::STFrequencies::setDoppler( const std::string & doppler )
+void STFrequencies::setDoppler( const std::string & doppler )
 {
   MDoppler::Types mdt;
@@ -397 +396 @@
 }
 
+void STFrequencies::shiftRefPix(int npix, uInt id) 
+{
+  Table t = table_(table_.col("ID") == Int(id) );
+  if ( t.nrow() == 0 ) throw(AipsError("Selected Illegal frequency id"));
+  ScalarColumn<Double> tcol(t, "REFPIX");
+  tcol.put(0, tcol(0)+Double(npix));
+}
 
 } // namespace

trunk/src/STFrequencies.h

@@ -134 +134 @@
   float getRefFreq(casa::uInt id, casa::uInt channel);
 
-
   /**
-   * Rteun this table or s specific row as a string representation
+    * shift the reference pixel by an integer amount
+    * @param npix the shift in pixels
+    * @param id the coordinate id
+    */
+  void shiftRefPix(int npix, casa::uInt id);
+  /**
+   * Return this table or s specific row as a string representation
    * @param id the identifier. If id<0 all rows are returned
    * @return a string

trunk/src/Scantable.cpp

@@ -330 +330 @@
 }
 
-void asap::Scantable::setSourceType( int stype )
+void Scantable::setSourceType( int stype )
 {
   if ( stype < 0 || stype > 1 )
@@ -533 +533 @@
     return int(n);
   } else {
-    // take the first SCANNO,POLNO,BEAMNO,CYCLENO as nbeam shouldn't vary with these
+    // take the first SCANNO,POLNO,BEAMNO,CYCLENO as nbeam shouldn't
+    // vary with these
     Table t = table_(table_.col("IFNO") == ifno);
     if ( t.nrow() == 0 ) return 0;
@@ -702 +703 @@
 }
 
-void asap::Scantable::setSpectrum( const std::vector<float>& spec,
+void Scantable::setSpectrum( const std::vector<float>& spec,
                                    int whichrow )
 {
@@ -867 +868 @@
 }
 
-std::vector< double > asap::Scantable::getAbcissa( int whichrow ) const
+std::vector< double > Scantable::getAbcissa( int whichrow ) const
 {
   if ( whichrow > int(table_.nrow()) ) throw(AipsError("Illegal ro number"));
@@ -902 +903 @@
   return stlout;
 }
-void asap::Scantable::setDirectionRefString( const std::string & refstr )
+void Scantable::setDirectionRefString( const std::string & refstr )
 {
   MDirection::Types mdt;
@@ -916 +917 @@
 }
 
-std::string asap::Scantable::getDirectionRefString( ) const
+std::string Scantable::getDirectionRefString( ) const
 {
   return table_.keywordSet().asString("DIRECTIONREF");
@@ -959 +960 @@
 }
 
-void asap::Scantable::setRestFrequencies( double rf, const std::string& name,
+void Scantable::setRestFrequencies( double rf, const std::string& name,
                                           const std::string& unit )
 {
@@ -970 +971 @@
 }
 
-void asap::Scantable::setRestFrequencies( const std::string& name )
+void Scantable::setRestFrequencies( const std::string& name )
 {
   throw(AipsError("setRestFrequencies( const std::string& name ) NYI"));
@@ -976 +977 @@
 }
 
-std::vector< unsigned int > asap::Scantable::rownumbers( ) const
+std::vector< unsigned int > Scantable::rownumbers( ) const
 {
   std::vector<unsigned int> stlout;
@@ -985 +986 @@
 
 
-Matrix<Float> asap::Scantable::getPolMatrix( uInt whichrow ) const
+Matrix<Float> Scantable::getPolMatrix( uInt whichrow ) const
 {
   ROTableRow row(table_);
@@ -998 +999 @@
 }
 
-std::vector< std::string > asap::Scantable::columnNames( ) const
+std::vector< std::string > Scantable::columnNames( ) const
 {
   Vector<String> vec = table_.tableDesc().columnNames();
@@ -1004 +1005 @@
 }
 
-casa::MEpoch::Types asap::Scantable::getTimeReference( ) const
+MEpoch::Types Scantable::getTimeReference( ) const
 {
   return MEpoch::castType(timeCol_.getMeasRef().getType());
 }
 
-void Scantable::addFit( const STFitEntry & fit, int row )
+void Scantable::addFit( const STFitEntry& fit, int row )
 {
   cout << mfitidCol_(uInt(row)) << endl;
@@ -1016 +1017 @@
 }
 
+void Scantable::shift(int npix)
+{
+  Vector<uInt> fids(mfreqidCol_.getColumn());
+  genSort( fids, Sort::Ascending,
+           Sort::QuickSort|Sort::NoDuplicates );
+  for (uInt i=0; i<fids.nelements(); ++i) {
+    frequencies().shiftRefPix(npix, i);
+  }
+}
 
 }

trunk/src/Scantable.h

@@ -356 +356 @@
   void setRestFrequencies(const std::string& name);
 
+  void shift(int npix);
+
   void convertDirection(const std::string& newframe);
 

trunk/src/ScantableWrapper.h

@@ -150 +150 @@
     { table_->setSourceType(stype); }
 
+  void shift(int npix)
+  { table_->shift(npix); }
+
   void setRestFrequencies(double rf, const std::string& name,
                           const std::string& unit)

trunk/src/python_Scantable.cpp

@@ -108 +108 @@
     .def("_getrestfreqs",  &ScantableWrapper::getRestFrequencies)
     .def("_setrestfreqs",  &ScantableWrapper::setRestFrequencies)
+    .def("shift_refpix", &ScantableWrapper::shift)
     .def("_setcoordinfo", &ScantableWrapper::setCoordInfo)
     .def("_getcoordinfo", &ScantableWrapper::getCoordInfo)