Changeset 472 for trunk/src

Timestamp:

02/18/05 11:16:27 (20 years ago)

Author:

kil064

Message:

add a new getStokesSPectrum function (for the writer) which gets all
Stokes or a beam/IF slice

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (3 diffs)
• SDMemTable.h (modified) (3 diffs)

trunk/src/SDMemTable.cc

@@ -366 +366 @@
 std::vector<float> SDMemTable::getStokesSpectrum(Int whichRow, Bool doPol, 
                                                  Float paOffset) const 
-  // Gets
-  //  doPol=False  : I,Q,U,V
-  //  doPol=True   : I,P,PA,V   ; P = sqrt(Q**2+U**2), PA = 0.5*atan2(Q,U)
-  //
+//
+// Gets one STokes parameter depending on cursor polSel location
+//  doPol=False  : I,Q,U,V
+//  doPol=True   : I,P,PA,V   ; P = sqrt(Q**2+U**2), PA = 0.5*atan2(Q,U)
+//
 {
   AlwaysAssert(asap::nAxes==4,AipsError);
@@ -450 +451 @@
 
   return stlout;
+}
+
+Array<Float> SDMemTable::getStokesSpectrum(Int whichRow, Int iBeam, Int iIF) const
+{
+
+// Get data
+
+  Array<Float> arr;
+  stokesCol_.get(whichRow, arr);
+
+// Set current cursor location and overwrite polarization axis
+
+  const IPosition& shape = arr.shape();
+  IPosition start(shape.nelements(),0);  
+  IPosition end(shape-1);
+  if (iBeam!=-1) {
+     start(asap::BeamAxis) = iBeam;
+     end(asap::BeamAxis) = iBeam;
+  }
+  if (iIF!=-1) {
+     start(asap::IFAxis) = iIF;
+     end(asap::IFAxis) = iIF;
+  }
+
+// Get slice
+
+  return arr(start,end);
 }
 
@@ -1172 +1200 @@
   histCol_.put(rno, sdc.getHistory());
   fitCol_.put(rno, sdc.getFitMap());
-
   return true;
 }

trunk/src/SDMemTable.h

@@ -103 +103 @@
   // getCircularSpectrum is 'getCircular'
 
-
-  // Get Stokes at cursor location. One of either I,Q,U,V or I,P,PA,V
-  // (doPol=True) If the latter, you can add a PA offset (degrees)
+  // Get specific Stokes at cursor location. One of either I,Q,U,V or I,P,PA,V (doPol=True)
+  // (determined by the polSel cursor location 0->3)
+  // If the latter, you can add a PA offset (degrees)
   virtual std::vector<float> getStokesSpectrum(casa::Int whichRow=0, 
                                                casa::Bool doPol=casa::False,
@@ -114 +114 @@
                                                  casa::Bool rr=casa::True) const;
 
+  // Get all Stokes at the specified Beam/IF cursor location (ignoring
+  // the internal cursor).  -1 means all on that axis.  Really, this function
+  // should not be here, and the SDContainer should hold the stokes spectrum
+  // as well.  However, because the Stokes column is virtual, and its shape
+  // is not the same as nPol(), I have put it here for direct access as needed
+  virtual casa::Array<casa::Float> getStokesSpectrum(casa::Int whichRow=0,
+                                                     casa::Int iBeam=-1, 
+                                                     casa::Int iIF=-1) const;
+
+  // Get Tsys at cursor location
   virtual casa::Float getTsys(casa::Int whichRow=0) const;
+
   // get all as aips++ Vectors
   virtual void getSpectrum(casa::Vector<casa::Float>& spectrum, 
@@ -120 +131 @@
   //virtual void getMask(Vector<Bool>& mask,Int whichRow=0) const;
 
+  // Get rest frequencies
   std::vector<double> getRestFreqs() const;