Changeset 270 for trunk

Timestamp:

01/23/05 20:22:00 (20 years ago)

Author:

kil064

Message:

use new MaskedArray(IPosition,IPOsition) slice operator
to simplyify some code. Also reuse function 'correctFromVector'
more to consolidate code

File:

• trunk/src/SDMath.cc (modified) (7 diffs)

trunk/src/SDMath.cc

@@ -633 +633 @@
    if (doAll) {
       for (uInt i=0; i < tOut.nrow(); i++) {
-
-// Get
-
-         MaskedArray<Float> marr(pOut->rowAsMaskedArray(i));
-
-// Operate
-
+         MaskedArray<Float> dataIn(pOut->rowAsMaskedArray(i));
+//
          if (what==0) {
-            marr *= val;
+            dataIn  *= val;
          } else if (what==1) {
-            marr += val;
+            dataIn += val;
          }
-
-// Put
-
-         spec.put(i, marr.getArray());
+//
+         spec.put(i, dataIn.getArray());
       }
    } else {
@@ -658 +651 @@
 //
       for (uInt i=0; i < tOut.nrow(); i++) {
-
-// Get
-
          MaskedArray<Float> dataIn(pOut->rowAsMaskedArray(i));
-
-// Modify. More work than we would like to deal with the mask
-
-         Array<Float>& values = dataIn.getRWArray();
-         Array<Bool> mask(dataIn.getMask());
-//
-         Array<Float> values2 = values(start,end);
-         Array<Bool> mask2 = mask(start,end);
-         MaskedArray<Float> t(values2,mask2);
+         MaskedArray<Float> dataIn2 = dataIn(start,end);    // Reference
+//
          if (what==0) {
-            t *= val;
+            dataIn2 *= val;
          } else if (what==1) {
-            t += val;
+            dataIn2 += val;
          }
-         values(start, end) = t.getArray();     // Write back into 'dataIn'
-
-// Put
+//
          spec.put(i, dataIn.getArray());
       }
@@ -982 +963 @@
   cerr << "Applying conversion factor = " << factor << endl;
 
-// For operations only on specified cursor location
-
-  IPosition start, end;
-  getCursorLocation(start, end, in);
-
-// Loop over rows and apply factor to spectra
-  
-  const uInt axis = asap::ChanAxis;
-  for (uInt i=0; i < in.nRow(); ++i) {
-
-// Get data
-
-    MaskedArray<Float> dataIn(in.rowAsMaskedArray(i));
-    Array<Float>& valuesIn = dataIn.getRWArray();              // writable reference
-    const Array<Bool>& maskIn = dataIn.getMask();  
-
-// Need to apply correct conversion factor (frequency and time dependent)
-// which should be sourced from a Table. For now we just apply the given 
-// factor to everything
-
-    if (doAll) {
-       VectorIterator<Float> itValues(valuesIn, asap::ChanAxis);
-       while (!itValues.pastEnd()) {
-          itValues.vector() *= factor;                            // Writes back into dataIn
-//
-          itValues.next();
-       }
-    } else {
-       Array<Float> valuesIn2 = valuesIn(start,end);
-       valuesIn2 *= factor;
-       valuesIn(start,end) = valuesIn2;
-    }
-
-// Write out
-
-    SDContainer sc = in.getSDContainer(i);
-    putDataInSDC(sc, valuesIn, maskIn);
-//
-    pTabOut->putSDContainer(sc);
-  }
+// Generate correction vector.  Apply same factor regardless
+// of beam/pol/IF.  This will need to change somewhen.
+
+  Vector<Float> factors(in.nRow(), factor);
+
+// Correct
+
+  correctFromVector (pTabOut, in, doAll, factors);
+//
   return pTabOut;
 }
-
 
 
@@ -1579 +1528 @@
                                 Bool doAll, const Vector<Float>& factor) const
 {
+
 // For operations only on specified cursor location
 
@@ -1584 +1534 @@
   getCursorLocation(start, end, in);
 
-// Loop over rows and interpolate correction factor
+// Loop over rows and apply correction factor
   
   const uInt axis = asap::ChanAxis;
@@ -1592 +1542 @@
 
     MaskedArray<Float> dataIn(in.rowAsMaskedArray(i));
-    Array<Float>& valuesIn = dataIn.getRWArray();  
-    const Array<Bool>& maskIn = dataIn.getMask();  
 
 // Apply factor
 
     if (doAll) {
-       VectorIterator<Float> itValues(valuesIn, asap::ChanAxis);
-       while (!itValues.pastEnd()) {
-          itValues.vector() *= factor(i);
-          itValues.next();
-       }
+       dataIn *= factor[i];
     } else {
-       Array<Float> valuesIn2 = valuesIn(start,end);
-       valuesIn2 *= factor(i);
-       valuesIn(start,end) = valuesIn2;
+       MaskedArray<Float> dataIn2 = dataIn(start,end);  // reference
+       dataIn2 *= factor[i];
     }
 
@@ -1612 +1555 @@
 
     SDContainer sc = in.getSDContainer(i);
-    putDataInSDC(sc, valuesIn, maskIn);
+    putDataInSDC(sc, dataIn.getArray(), dataIn.getMask());
 //
     pTabOut->putSDContainer(sc);