Changeset 2346 for trunk

Timestamp:

11/08/11 19:17:23 (13 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): SD

Description: bugfix

File:

• trunk/src/Scantable.cpp (modified) (9 diffs)

trunk/src/Scantable.cpp

@@ -91 +91 @@
   initFactories();
   setupMainTable();
-  freqTable_ = new STFrequencies(*this);
-  table_.rwKeywordSet().defineTable("FREQUENCIES", freqTable_->table());
+  freqTable_ = STFrequencies(*this);
+  table_.rwKeywordSet().defineTable("FREQUENCIES", freqTable_.table());
   weatherTable_ = STWeather(*this);
   table_.rwKeywordSet().defineTable("WEATHER", weatherTable_.table());
@@ -195 +195 @@
 void Scantable::copySubtables(const Scantable& other) {
   Table t = table_.rwKeywordSet().asTable("FREQUENCIES");
-  TableCopy::copyRows(t, other.freqTable_->table());
+  TableCopy::copyRows(t, other.freqTable_.table());
   t = table_.rwKeywordSet().asTable("FOCUS");
   TableCopy::copyRows(t, other.focusTable_.table());
@@ -212 +212 @@
 void Scantable::attachSubtables()
 {
-  freqTable_ = new STFrequencies(table_);
+  freqTable_ = STFrequencies(table_);
   focusTable_ = STFocus(table_);
   weatherTable_ = STWeather(table_);
@@ -223 +223 @@
 Scantable::~Scantable()
 {
-  delete freqTable_;
 }
 
@@ -1510 +1509 @@
   //Double rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
   Vector<Double> rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
-  return freqTable_->getSpectralCoordinate(md, mp, me, rf,
+  return freqTable_.getSpectralCoordinate(md, mp, me, rf,
                                           mfreqidCol_(whichrow));
 }
@@ -1519 +1518 @@
   std::vector<double> stlout;
   int nchan = specCol_(whichrow).nelements();
-  String us = freqTable_->getUnitString();
+  String us = freqTable_.getUnitString();
   if ( us == "" || us == "pixel" || us == "channel" ) {
     for (int i=0; i<nchan; ++i) {
@@ -1586 +1585 @@
   const Vector<Double> rf = moleculeTable_.getRestFrequency(mmolidCol_(whichrow));
   SpectralCoordinate spc =
-    freqTable_->getSpectralCoordinate(md, mp, me, rf, mfreqidCol_(whichrow));
+    freqTable_.getSpectralCoordinate(md, mp, me, rf, mfreqidCol_(whichrow));
 
   String s = "Channel";
-  Unit u = Unit(freqTable_->getUnitString());
+  Unit u = Unit(freqTable_.getUnitString());
   if (u == Unit("km/s")) {
     s = CoordinateUtil::axisLabel(spc, 0, True,True,  True);
@@ -1850 +1849 @@
   Double refval ;
   Double increment ;
-  int freqnrow = freqTable_->table().nrow() ;
+  int freqnrow = freqTable_.table().nrow() ;
   Vector<uInt> oldId( freqnrow ) ;
   Vector<uInt> newId( freqnrow ) ;
   for ( int irow = 0 ; irow < freqnrow ; irow++ ) {
-    freqTable_->getEntry( refpix, refval, increment, irow ) ;
+    freqTable_.getEntry( refpix, refval, increment, irow ) ;
     /***
      * need to shift refpix to nmin
@@ -1861 +1860 @@
     refval = refval - ( refpix - nmin ) * increment ;
     refpix = 0 ;
-    freqTable_->setEntry( refpix, refval, increment, irow ) ;
+    freqTable_.setEntry( refpix, refval, increment, irow ) ;
   }