Changeset 79 for trunk

Timestamp:

08/10/04 16:26:33 (20 years ago)

Author:

mar637

Message:

Added support of source direction.

Location:

trunk/src

Files:

• SDContainer.cc (modified) (5 diffs)
• SDContainer.h (modified) (3 diffs)
• SDMemTableWrapper.h (modified) (1 diff)
• SDReader.cc (modified) (1 diff)
• SDWriter.cc (modified) (3 diffs)
• python_SDMemTable.cc (modified) (1 diff)

trunk/src/SDContainer.cc

@@ -66 +66 @@
     flags_(IPosition(4,nBeam,nIF,nPol,nChan)),
     tsys_(IPosition(4,nBeam,nIF,nPol,nChan)),
-    freqidx_(nIF) {
+    freqidx_(nIF),
+    direction_(IPosition(2,nBeam,2)) {
   uChar x = 0;
   flags_ = ~x;
@@ -79 +80 @@
     flags_(shp),
     tsys_(shp),
-    freqidx_(shp(1)){
+    freqidx_(shp(1)) {
+  IPosition ip(2,shp(0),2);
+  direction_.resize(ip);
   uChar x = 0;
   flags_ = ~x;
@@ -96 +99 @@
   tsys_.resize(shp);
   freqidx_.resize(shp(1));
+  IPosition ip(2,shp(0),2);
+  direction_.resize(ip);
 }
 
@@ -284 +289 @@
 }
 
+Array<Double> SDContainer::getDirection(uInt whichBeam) const {
+  Vector<Double> direct(2);
+  ArrayAccessor<Double, Axis<0> > i0(direction_);
+  i0.reset(i0.begin(whichBeam));
+  ArrayAccessor<Double, Axis<0> > o0(direct);
+  ArrayAccessor<Double, Axis<1> > i1(i0);
+  while (i1 != i1.end()) {
+    *o0 = *i1;
+    i1++;
+    o0++;
+  }  
+  return direct.copy();
+}
+
+
 Bool SDContainer::setFrequencyMap(uInt freqslot, uInt whichIF) {
   freqidx_[whichIF] = freqslot;
@@ -292 +312 @@
   freqidx_.resize();
   freqidx_ = freqs;
+  return True;
+}
+
+Bool SDContainer::setDirection(const Vector<Double>& point, uInt whichBeam) {
+  if (point.nelements() != 2) return False;
+  ArrayAccessor<Double, Axis<0> > aa0(direction_);
+  aa0.reset(aa0.begin(whichBeam));
+  ArrayAccessor<Double, Axis<0> > jj(point);
+  for (ArrayAccessor<Double, Axis<1> > i(aa0);i != i.end(); ++i) {
+    
+    (*i) = (*jj);
+    jj++;
+  }
+  return True;
+}
+
+Bool SDContainer::putDirection(const Array<Double>& dir) {
+  direction_.resize();
+  direction_ = dir;
   return True;
 }

trunk/src/SDContainer.h

@@ -115 +115 @@
   Bool putTsys(const Array<Float>& spec);
 
-  Bool setPointing(const Vector<Double>& point, uInt whichBeam) {;}
+  Bool setDirection(const Vector<Double>& point, uInt whichBeam);
+  Bool putDirection(const Array<Double>& dir);
 
   Bool setFrequencyMap(uInt freqslot, uInt whichIF);
@@ -123 +124 @@
   Array<uChar> getFlags(uInt whichBeam, uInt whichIF) const;
   Array<Float> getTsys(uInt whichBeam, uInt whichIF) const;
+  Array<Double> getDirection(uInt whichBeam) const;
 
   const Array<Float>& getSpectrum() const { return spectrum_; }
   const Array<uChar>& getFlags() const { return flags_; }
   const Array<Float>& getTsys() const { return tsys_; }
+  const Array<Double>& getDirection() const { return direction_; }
 
   const Vector<uInt>& getFreqMap() const { return freqidx_; }
-
+  
   Double timestamp;
   String sourcename;
@@ -147 +150 @@
   Array<Float>    tcal_;
 
-  //(nBeam) maybe use Measures here...
-  //*** Vector<Vector<Double>>  pointing_;
   //(nIF) indx into "global" frequency table
   Vector<uInt>            freqidx_;
+  //(nBeam,2) maybe use Measures here...
+  Array<Double>  direction_;
 
 };

trunk/src/SDMemTableWrapper.h

@@ -62 +62 @@
   std::vector<double> getAbscissa(int whichRow, 
                                   const std::string& unit = "GHz",
+                                  const std::string& frame = "TOPO",
                                   double restfreq=0.0) const {
-    return table_->getAbscissa(whichRow,unit,restfreq);
+    return table_->getAbscissa(whichRow,unit,frame,restfreq);
   }
 

trunk/src/SDReader.cc

@@ -193 +193 @@
         sc.setFlags(flagtra,  beamNo-1, IFno-1);
         sc.setTsys(tsys, beamNo-1, IFno-1);
-        //sc.addPointing(direction, beamNo-1);
+        sc.setDirection(direction, beamNo-1);
       }
     }

trunk/src/SDWriter.cc

@@ -139 +139 @@
         // None of these are stored in SDMemTable by SDReader.
         String          fieldName = "";
-        Vector<Double>  srcDir(2, 0.0);
+        //Vector<Double>  srcDir(2, 0.0);
         Vector<Double>  srcPM(2, 0.0);
         Double          srcVel = 0.0;
@@ -158 +158 @@
         Float           windAz = 0.0f;
         Int             refBeam = 0;
-        Vector<Double>  direction(2, 0.0);
+        //Vector<Double>  direction(2, 0.0);
         Vector<Double>  scanRate(2, 0.0);
         Vector<Float>   sigma(nPol, 0.0f);
@@ -166 +166 @@
         Complex         xCalFctr;
         Vector<Complex> xPol;
-
         if (status = cWriter->write(sd.scanid, cycleNo, sd.timestamp,
                                     sd.interval, fieldName, sd.sourcename,
-                                    srcDir, srcPM, srcVel, iIF+1, hdr.reffreq,
+                                    sd.getDirection(iBeam), 
+                                    srcPM, srcVel, iIF+1, hdr.reffreq,
                                     hdr.bandwidth, freqInc, restFreq, tcal,
                                     tcalTime, azimuth, elevation, parAngle,
                                     focusAxi, focusTan, focusRot, temperature,
                                     pressure, humidity, windSpeed, windAz,
-                                    refBeam, iBeam+1, direction, scanRate,
+                                    refBeam, iBeam+1, 
+                                    sd.getDirection(iBeam), 
+                                    scanRate,
                                     sd.getTsys(iBeam, iIF), sigma, calFctr,
                                     baseLin, baseSub,

trunk/src/python_SDMemTable.cc

@@ -51 +51 @@
          (boost::python::arg("whichRow")=0,
           boost::python::arg("unit")=std::string("GHz"),
+          boost::python::arg("frame")=std::string("TOPO"),
           boost::python::arg("restFrequency")=0.0) )
     .def("getmask", &SDMemTableWrapper::getMask,