Changeset 1232 for trunk/src

Timestamp:

09/01/06 13:14:11 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

Location:

trunk/src

Files:

• STFitter.cpp (modified) (7 diffs)
• STMath.cpp (modified) (5 diffs)

trunk/src/STFitter.cpp

@@ -64 +64 @@
   funcs_.resize(0,True);
   parameters_.resize();
+  fixedpar_.resize();
   error_.resize();
   thefit_.resize();
@@ -205 +206 @@
     if (parameters_.nelements() > 0 && tmppar.nelements() != parameters_.nelements())
         throw (AipsError("Number of parameters inconsistent with function."));
-    if (parameters_.nelements() == 0)
+    if (parameters_.nelements() == 0) {
         parameters_.resize(tmppar.nelements());
-        fixedpar_.resize(tmppar.nelements());
-        fixedpar_ = False;
+        if (tmppar.nelements() != fixedpar_.nelements()) {
+            fixedpar_.resize(tmppar.nelements());
+            fixedpar_ = False;
+        }
+    }
     if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) != 0) {
         uInt count = 0;
@@ -224 +228 @@
         }
     }
+    // reset
+    if (params.size() == 0) {
+        parameters_.resize();
+        fixedpar_.resize();
+    }
     return true;
 }
@@ -229 +238 @@
 bool Fitter::setFixedParameters(std::vector<bool> fixed)
 {
-    Vector<Bool> tmp(fixed);
     if (funcs_.nelements() == 0)
         throw (AipsError("Function not yet set."));
-    if (fixedpar_.nelements() > 0 && tmp.nelements() != fixedpar_.nelements())
+    if (fixedpar_.nelements() > 0 && fixed.size() != fixedpar_.nelements())
         throw (AipsError("Number of mask elements inconsistent with function."));
+    if (fixedpar_.nelements() == 0) {
+        fixedpar_.resize(parameters_.nelements());
+        fixedpar_ = False;
+    }
     if (dynamic_cast<Gaussian1D<Float>* >(funcs_[0]) != 0) {
         uInt count = 0;
         for (uInt j=0; j < funcs_.nelements(); ++j) {
             for (uInt i=0; i < funcs_[j]->nparameters(); ++i) {
-                funcs_[j]->mask(i) = !tmp[count];
-                fixedpar_[count] = !tmp[count];
+                funcs_[j]->mask(i) = !fixed[count];
+                fixedpar_[count] = fixed[count];
                 ++count;
             }
@@ -245 +257 @@
     } else if (dynamic_cast<Polynomial<Float>* >(funcs_[0]) != 0) {
         for (uInt i=0; i < funcs_[0]->nparameters(); ++i) {
-            fixedpar_[i] = tmp[i];
-            funcs_[0]->mask(i) =  tmp[i];
-        }
-    }
-    //fixedpar_ = !tmpmsk;
+            fixedpar_[i] = fixed[i];
+            funcs_[0]->mask(i) =  !fixed[i];
+        }
+    }
     return true;
 }
@@ -263 +274 @@
   Vector<Bool> out(parameters_.nelements());
   if (fixedpar_.nelements() == 0) {
-    out = False;
+    return std::vector<bool>();
     //throw (AipsError("No parameter mask set."));
   } else {
@@ -312 +323 @@
   residual_ =  y_;
   fitter.residual(residual_,x_);
-
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());

trunk/src/STMath.cpp

@@ -211 +211 @@
   ArrayColumn<Float> tsysColOut(tout,"TSYS");
   ScalarColumn<uInt> scanColOut(tout,"SCANNO");
+  ScalarColumn<Double> intColOut(tout, "INTERVAL");
   Table tmp = in->table().sort("BEAMNO");
   Block<String> cols(3);
@@ -227 +228 @@
     ROArrayColumn<Float> specCol, tsysCol;
     ROArrayColumn<uChar> flagCol;
+    ROScalarColumn<Double> intCol(subt, "INTERVAL");
     specCol.attach(subt,"SPECTRA");
     flagCol.attach(subt,"FLAGTRA");
@@ -255 +257 @@
     flagColOut.put(outrowCount, outflag);
     tsysColOut.put(outrowCount, outtsys);
-
+    Double intsum = sum(intCol.getColumn());
+    intColOut.put(outrowCount, intsum);
     ++outrowCount;
     ++iter;
@@ -1126 +1129 @@
                                 const std::string& weight )
 {
-  if (in->getPolType() != "linear"  || in->npol() != 2 )
-    throw(AipsError("averagePolarisations can only be applied to two linear polarisations."));
+  if (in->npol() < 2 )
+    throw(AipsError("averagePolarisations can only be applied to two or more"
+                    "polarisations"));
   bool insitu = insitu_;
   setInsitu(false);
-  CountedPtr< Scantable > pols = getScantable(in, false);
+  CountedPtr< Scantable > pols = getScantable(in, true);
   setInsitu(insitu);
   Table& tout = pols->table();
-  // give all rows the same POLNO
+  std::string taql = "SELECT FROM $1 WHERE POLNO IN [0,1]";
+  Table tab = tableCommand(taql, in->table());
+  if (tab.nrow() == 0 )
+    throw(AipsError("Could not find  any rows with POLNO==0 and POLNO==1"));
+  TableCopy::copyRows(tout, tab);
   TableVector<uInt> vec(tout, "POLNO");
   vec = 0;
   pols->table_.rwKeywordSet().define("nPol", Int(1));
+  pols->table_.rwKeywordSet().define("POLTYPE", String("stokes"));
   std::vector<CountedPtr<Scantable> > vpols;
   vpols.push_back(pols);
-  CountedPtr< Scantable > out = average(vpols, mask, weight, "NONE");
+  CountedPtr< Scantable > out = average(vpols, mask, weight, "SCAN");
   return out;
 }
@@ -1159 +1168 @@
   std::vector<CountedPtr<Scantable> > vbeams;
   vbeams.push_back(beams);
-  CountedPtr< Scantable > out = average(vbeams, mask, weight, "NONE");
+  CountedPtr< Scantable > out = average(vbeams, mask, weight, "SCAN");
   return out;
 }