Changeset 527 for trunk

Timestamp:

03/01/05 15:02:15 (20 years ago)

Author:

mar637

Message:

ficed bug in getSDFitTable

Location:

trunk/src

Files:

• SDMemTable.cc (modified) (6 diffs)
• SDMemTable.h (modified) (1 diff)
• SDMemTableWrapper.h (modified) (1 diff)

trunk/src/SDMemTable.cc

@@ -93 +93 @@
   }
   table_ = tab.copyToMemoryTable("dummy");
-  //cerr << "hello from C SDMemTable @ " << this << endl;
   attach();
 }
@@ -116 +115 @@
 
   attach();
-  //cerr << "hello from CC SDMemTable @ " << this << endl;
 }
 
@@ -378 +376 @@
 
 
-std::vector<float> SDMemTable::getStokesSpectrum(Int whichRow, Bool doPol) const
-//
-// 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)
-//
+std::vector<float> SDMemTable::getStokesSpectrum(Int whichRow, 
+                                                 Bool doPol) const
+  //
+  // 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);
   if (nPol()!=1 && nPol()!=2 && nPol()!=4) {
-     throw (AipsError("You must have 1,2 or 4 polarizations to get the Stokes parameters"));
-  }
-
-// For full conversion we are only supporting linears at the moment
-
+    throw (AipsError("You must have 1,2 or 4 polarizations to get the Stokes parameters"));
+  }
+  
+  // For full conversion we are only supporting linears at the moment
+  
   if (nPol() > 2) {
-     String antName;
-     table_.keywordSet().get("AntennaName", antName);
-     Instrument inst = SDAttr::convertInstrument (antName, True);
-     SDAttr sdAtt;
-     if (sdAtt.feedPolType(inst) != LINEAR) {
-       throw(AipsError("Only linear polarizations are supported"));
-     }
-  }
-//
+    String antName;
+    table_.keywordSet().get("AntennaName", antName);
+    Instrument inst = SDAttr::convertInstrument (antName, True);
+    SDAttr sdAtt;
+    if (sdAtt.feedPolType(inst) != LINEAR) {
+      throw(AipsError("Only linear polarizations are supported"));
+    }
+  }
+
   Array<Float> arr;
   stokesCol_.get(whichRow, arr);
-//
+  
   if (doPol && (polSel_==1 || polSel_==2)) {       //   Q,U --> P, P.A.
-
-// Set current cursor location
-
-     const IPosition& shape = arr.shape();
-     IPosition start, end;
-     getCursorSlice(start, end, shape);
-
-// Get Q and U slices
-
-     Array<Float> Q = SDPolUtil::getStokesSlice(arr,start,end,"Q");
-     Array<Float> U = SDPolUtil::getStokesSlice(arr,start,end,"U");
-
-// Compute output 
-
-     Array<Float> out;
-     if (polSel_==1) {                                        // P
-        out = SDPolUtil::polarizedIntensity(Q,U);
-     } else if (polSel_==2) {                                 // P.A.
-        out = SDPolUtil::positionAngle(Q,U);
-     }
-
-     // Copy to output
-
-     IPosition vecShape(1,shape(asap::ChanAxis));
-     Vector<Float> outV = out.reform(vecShape);
-     std::vector<float> stlout;
-     outV.tovector(stlout);
-     return stlout;
-
-  } else {
-
+    
+    // Set current cursor location
+    
+    const IPosition& shape = arr.shape();
+    IPosition start, end;
+    getCursorSlice(start, end, shape);
+    
+    // Get Q and U slices
+    
+    Array<Float> Q = SDPolUtil::getStokesSlice(arr,start,end,"Q");
+    Array<Float> U = SDPolUtil::getStokesSlice(arr,start,end,"U");
+    
+    // Compute output 
+    
+    Array<Float> out;
+    if (polSel_==1) {                                        // P
+      out = SDPolUtil::polarizedIntensity(Q,U);
+    } else if (polSel_==2) {                                 // P.A.
+      out = SDPolUtil::positionAngle(Q,U);
+    }
+    
+    // Copy to output
+    
+    IPosition vecShape(1,shape(asap::ChanAxis));
+    Vector<Float> outV = out.reform(vecShape);
+    std::vector<float> stlout;
+    outV.tovector(stlout);
+    return stlout;
+    
+  } else {    
     // Selects at the cursor location
     return getFloatSpectrum(arr);
@@ -1085 +1083 @@
 
 SDFitTable SDMemTable::getSDFitTable(uInt whichRow) const {
+  const Table& t = table_.keywordSet().asTable("FITS");
+  if (t.nrow() == 0 || whichRow >= t.nrow()) return SDFitTable();
   Array<Int> fitid;
   fitCol_.get(whichRow, fitid);
@@ -1096 +1096 @@
   Vector<Int> tmp = (fitid(start, end)).reform(IPosition(1,shp[3]));
 
-  const Table& t = table_.keywordSet().asTable("FITS");
   Vector<Double> parms;
   Vector<Bool> parmask;
@@ -1107 +1106 @@
   ROArrayColumn<String> funcsCol(t, "FUNCTIONS");
   ROArrayColumn<String> finfoCol(t, "FRAMEINFO");
-  if (t.nrow() == 0) return SDFitTable();
   SDFitTable sdft;
   Int k=-1;

trunk/src/SDMemTable.h

@@ -98 +98 @@
   int nStokes() const;
 
-  // 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)
+  // 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) const;
 
-  // Returns Label for polarization selected by polSel_ (or over-ridden
-  // with arg. polIdx).  If doStokes is False,
-  // returns label for raw correlations (linear or circular). If True returns label for
-  // Stokes.  If doPol=False, I,Q,U,V else I,P,PA,V
-  std::string getPolarizationLabel (casa::Bool linear, casa::Bool stokes, 
-                                    casa::Bool linPol, casa::Int polIdx=-1) const;
-
-  // Convert Stokes to linear or circular polarizations (specified by polIdx=0:3).
-  // Presently, only conversion to RR or LL is supported.
-  virtual std::vector<float> stokesToPolSpectrum (casa::Int whichRow, casa::Bool toLinear,
-                                                  casa::uInt polIdx) const;
+  // Returns Label for polarization selected by polSel_ (or
+  // over-ridden with arg. polIdx).  If doStokes is False, returns
+  // label for raw correlations (linear or circular). If True returns
+  // label for Stokes.  If doPol=False, I,Q,U,V else I,P,PA,V
+  std::string getPolarizationLabel(casa::Bool linear, casa::Bool stokes, 
+                                   casa::Bool linPol, 
+                                   casa::Int polIdx=-1) const;
+
+  // Convert Stokes to linear or circular polarizations (specified by
+  // polIdx=0:3).  Presently, only conversion to RR or LL is
+  // supported.
+  virtual std::vector<float> stokesToPolSpectrum(casa::Int whichRow,
+                                                 casa::Bool toLinear,
+                                                 casa::uInt polIdx) const;
 
   // Get all Stokes at the specified Beam/IF cursor location (ignoring

trunk/src/SDMemTableWrapper.h

@@ -85 +85 @@
     return table_->getSpectrum(whichRow);
   }
-//
-  std::vector<float> getStokesSpectrum(int whichRow=0, bool linPol=false) const {
+
+  std::vector<float> getStokesSpectrum(int whichRow=0, 
+                                       bool linPol=false) const {
     return table_->getStokesSpectrum(whichRow, linPol);
   }
 
-  std::vector<float> stokesToPolSpectrum (int whichRow, bool linear,
-                                          int polIdx) const {
+  std::vector<float> stokesToPolSpectrum(int whichRow, bool linear,
+                                         int polIdx) const {
     return table_->stokesToPolSpectrum(whichRow, linear, polIdx);
   }
 
-//  std::string getPolarizationLabel (bool linear, bool stokes, bool linPol, int polIdx) const {
-// Boost fails with 4 arguments.
-  std::string getPolarizationLabel (bool linear, bool stokes, bool linPol) const {
-     int polIdx = -1;
-     return table_->getPolarizationLabel (linear, stokes, linPol, polIdx);
-  }
-//
+  //  std::string getPolarizationLabel(bool linear, bool stokes, bool linPol, int polIdx) const {
+  // Boost fails with 4 arguments.
+  std::string getPolarizationLabel(bool linear, bool stokes, 
+                                   bool linPol) const {
+    int polIdx = -1;
+    return table_->getPolarizationLabel(linear, stokes, linPol, polIdx);
+  }
+
   std::vector<double> getAbcissa(int whichRow=0) const {
     return table_->getAbcissa(whichRow);