Changeset 1525

Timestamp:

03/13/09 11:55:57 (16 years ago)

Author:

Malte Marquarding

Message:

Tagged 2.3.0 release

Location:

tags/asap2.3.0

Files:

• . (copied) (copied from trunk )
• apps/test.cpp (modified) (1 diff)
• doc/CHANGELOG (copied) (copied from trunk/doc/CHANGELOG )
• python/__init__.py (copied) (copied from trunk/python/__init__.py )
• src/Scantable.cpp (modified) (2 diffs)
• src/ScantableWrapper.h (modified) (1 diff)
• src/python_Scantable.cpp (modified) (1 diff)

tags/asap2.3.0/apps/test.cpp

@@ -10 +10 @@
 
 int main() {
-  const string fname = "/Users/mar637/data/test.asap";
-  //const string fname = "test/data/tid-t002.rpf";
-  //STFillerWrapper stf(fname);
-  //cout << "reading ..." << endl;
-  //stf.read();
-  
-  casa::CountedPtr<Scantable>  st(new Scantable(fname, casa::Table::Plain));
+  const string fname0 = "/tmp/ASAP_problem/c082812231.rpf";
+  ScantableWrapper stw0(0);
+  STFillerWrapper stf0(stw0);
+  cout << "reading ..." << endl;
+  stf0.open(fname0);
+  stf0.read();
+  stf0.close();
+
   STMath stm;
+  vector<bool> msk;
+  vector<casa::CountedPtr<Scantable> > l0;
+  l0.push_back(stw0.getCP());
+  casa::CountedPtr<Scantable> av0 = stm.average(l0,msk, "NONE", "SCAN");
+
+  const string fname1 = "/tmp/ASAP_problem/c082880100.rpf";
+  ScantableWrapper stw1(0);
+  STFillerWrapper stf1(stw1);
+  cout << "reading ..." << endl;
+  stf1.open(fname1);
+  stf1.read();
+  stf1.close();
+  vector<casa::CountedPtr<Scantable> > l1;
+  l1.push_back(stw1.getCP());
+  casa::CountedPtr<Scantable> av1 = stm.average(l1,msk, "NONE", "SCAN");
+
   vector<casa::CountedPtr<Scantable> > on;
-  on.push_back(st);
-  cout << "averaging..." << endl;
-  casa::CountedPtr<Scantable> avst = stm.average(on);
-  /*
-  cout << "quotient" << endl;
-  casa::CountedPtr<Scantable> quot = stm.autoQuotient(avst);
-  cout << quot->summary() << endl;
-  */
+  on.push_back(av0);
+  on.push_back(av1);
+ 
+  casa::CountedPtr<Scantable> avst = stm.merge(on);
+  //avst->makePersistent("t.asap");
   return 0;
 

tags/asap2.3.0/src/Scantable.cpp

@@ -49 +49 @@
 #include <measures/Measures/MCDirection.h>
 //
+#include <measures/Measures/MCRadialVelocity.h>
+#include <measures/Measures/MCDoppler.h>
 #include <measures/Measures/MDirection.h>
 #include <measures/Measures/MFrequency.h>
@@ -912 +914 @@
   if ( Unit(us) == Unit("Hz") ) {
     for ( int i=0; i < nchan; ++i) {
-      Double world;
-      spc.toWorld(world, pixel[i]);
-      stlout.push_back(double(world));
+      Double worldi;
+      spc.toWorld(worldi, pixel[i]);
+      stlout.push_back(double(worldi));
     }
   } else if ( Unit(us) == Unit("km/s") ) {
-    Vector<Double> world;
-    spc.pixelToVelocity(world, pixel);
-    world.tovector(stlout);
+    
+    MeasFrame frame(mp,md,me);
+    MRadialVelocity::Types refin, refout;
+    MFrequency::Types refinfreq = freqTable_.getFrame(true);
+    MRadialVelocity::getType(refin, freqTable_.getFrameString(true));
+    MRadialVelocity::getType(refout, freqTable_.getFrameString(false));
+    SpectralCoordinate spc1 =
+      freqTable_.getSpectralCoordinate(mfreqidCol_(whichrow));
+    
+    MRadialVelocity::Ref rin(refin, frame);
+    MRadialVelocity::Ref rout(refout, frame);
+    MRadialVelocity::Convert cnv(rin, rout);
+    Vector<Double> worlds(2);  
+    Double deltav;
+    for ( int i=0; i < nchan; ++i) {      
+      
+      Double worldi;
+      if (i == 0) {
+        for (uInt k = 0; k<2;++k) {
+          spc1.toWorld(worlds[i+k], pixel[i+k]);
+          MDoppler mdop =                               \
+            MFrequency(Quantity(worlds[i+k], "Hz"), 
+                       refinfreq).toDoppler(Quantity(rf, "Hz"));
+          MRadialVelocity mrv = MRadialVelocity::fromDoppler(mdop, refin);
+          MRadialVelocity mrvo =  cnv(mrv);
+          //worlds[i+k] = cnv(mrv).get(us).getValue();
+          
+            MDoppler mdopo = MDoppler::Convert(mrvo.toDoppler(),
+            MDoppler::RADIO)();
+            MFrequency mf = MFrequency::fromDoppler(mdopo, 
+            MVFrequency(Quantity(rf, "Hz")));
+            worlds[i+k] = mf.get("GHz").getValue();
+        
+        }
+      }      
+      deltav = worlds[1]-worlds[0];
+      worldi = worlds[0] + Double(i)*deltav;
+      stlout.push_back(double(worldi));
+    }
+    cout << worlds[0] << " + " << deltav <<  "+" << spc1.increment() << endl;
   }
   return stlout;

tags/asap2.3.0/src/ScantableWrapper.h

@@ -120 +120 @@
     { return table_->getParAngle(whichrow); }
 
+  std::vector<double> getAntennaPosition() const
+    {   
+      std::vector<double> stlout;
+      casa::Vector<casa::Double> vec =  
+        table_->getAntennaPosition().getAngle().getValue();
+      vec.tovector(stlout);
+      return stlout;
+    }
 
   void setSpectrum(std::vector<float> spectrum, int whichrow=0)

tags/asap2.3.0/src/python_Scantable.cpp

@@ -124 +124 @@
     .def("_setsourcetype", &ScantableWrapper::setSourceType)
     .def("_getdirectionvec", &ScantableWrapper::getDirectionVector)
+    .def("_getantennapos",  &ScantableWrapper::getAntennaPosition)
   ;
 };