Changeset 1334 for trunk/src

Timestamp:

04/18/07 16:21:15 (18 years ago)

Author:

mar637

Message:

Use CountedPointer for STPol instance

File:

• trunk/src/Scantable.cpp (modified) (1 diff)

trunk/src/Scantable.cpp

@@ -684 +684 @@
     specCol_.get(whichrow, arr);
   } else {
-    STPol* stpol = 0;
-    stpol =STPol::getPolClass(Scantable::factories_, basetype);
-    try {
-      uInt row = uInt(whichrow);
-      stpol->setSpectra(getPolMatrix(row));
-      Float fang,fhand,parang;
-      fang = focusTable_.getTotalFeedAngle(mfocusidCol_(row));
-      fhand = focusTable_.getFeedHand(mfocusidCol_(row));
-      parang = paraCol_(row);
-      /// @todo re-enable this
-      // disable total feed angle to support paralactifying Caswell style
-      stpol->setPhaseCorrections(parang, -parang, fhand);
-      arr = stpol->getSpectrum(requestedpol, ptype);
-      delete stpol;
-    } catch (AipsError& e) {
-      delete stpol;
-      throw(e);
-    }
+    CountedPtr<STPol> stpol(STPol::getPolClass(Scantable::factories_, basetype));
+    uInt row = uInt(whichrow);
+    stpol->setSpectra(getPolMatrix(row));
+    Float fang,fhand,parang;
+    fang = focusTable_.getTotalFeedAngle(mfocusidCol_(row));
+    fhand = focusTable_.getFeedHand(mfocusidCol_(row));
+    parang = paraCol_(row);
+    /// @todo re-enable this
+    // disable total feed angle to support paralactifying Caswell style
+    stpol->setPhaseCorrections(parang, -parang, fhand);
+    arr = stpol->getSpectrum(requestedpol, ptype);
   }
   if ( arr.nelements() == 0 )