Changeset 934 for trunk

Timestamp:

03/27/06 19:32:14 (19 years ago)

Author:

mar637

Message:

added _empty function

Location:

trunk/src

Files:

• STMath.cpp (modified) (5 diffs)
• Templates.cpp (modified) (1 diff)
• python_STSelector.cpp (modified) (1 diff)

trunk/src/STMath.cpp

@@ -70 +70 @@
   WeightType wtype = stringToWeight(weight);
 
-  std::vector<CountedPtr<Scantable> >* in = const_cast<std::vector<CountedPtr<Scantable> >*>(&scantbls);
+  std::vector<CountedPtr<Scantable> >* in =
+    const_cast<std::vector<CountedPtr<Scantable> >*>(&scantbls);
   std::vector<CountedPtr<Scantable> > inaligned;
   if ( alignfreq ) {
@@ -940 +941 @@
     ArrayColumn<Float> speccol(t, "SPECTRA");
     Matrix<Float> pols = speccol.getColumn();
-    Matrix<Float> out;
     try {
       stpol->setSpectra(pols);
       (stpol->*fptr)(phase);
       speccol.putColumn(stpol->getSpectra());
-      delete stpol;stpol=0;
     } catch (AipsError& e) {
       delete stpol;stpol=0;
@@ -952 +951 @@
     ++iter;
   }
+  delete stpol;stpol=0;
   return out;
 }
@@ -1016 +1016 @@
   }
   MFrequency::Types system = in->frequencies().getFrame();
-  out->frequencies().setFrame(system);
+  out->frequencies().setFrame(system, true);
   // set up the iterator
   Block<String> cols(4);
@@ -1051 +1051 @@
       SpectralCoordinate sc2 = fa.alignedSpectralCoordinate(linear);
       sc2.setWorldAxisUnits(units);
-      out->frequencies().addEntry(sc2.referencePixel()[0],
-                                  sc2.referenceValue()[0],
-                                  sc2.increment()[0]);
+      uInt id = out->frequencies().addEntry(sc2.referencePixel()[0],
+                                            sc2.referenceValue()[0],
+                                            sc2.increment()[0]);
+      TableVector<uInt> tvec(ftab, "FREQ_ID");
+      tvec = id;
       // create the "global" abcissa for alignment with same FREQ_ID
       Vector<Double> abc(nchan);

trunk/src/Templates.cpp

@@ -62 +62 @@
 #include <tables/Tables/TVecScaCol.cc>
 #include <tables/Tables/TVecTemp.cc>
+//#include <tables/Tables/TVecMath.h>
 
 template class ROTableVector<uInt>;

trunk/src/python_STSelector.cpp

@@ -38 +38 @@
         .def("_settaql", &STSelector::setTaQL)
         .def("_setorder", &STSelector::setSortOrder)
+        .def("_empty", &STSelector::empty)
       ;
     };