Changeset 2974 for trunk/src

Timestamp:

07/09/14 20:22:49 (10 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes CAS-6594

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: test_sdmath

Put in Release Notes: No

Module(s): sd

Description: modified STMath::binaryOperate() so that:

(1) If one of or both spectra are row-flagged,

operation will be skipped so the 'left'
spectrum values are not modified, while
the FLAGROW of the output spectrum will
be set flagged.

(2) Otherwise, operation is executed for all

channels even if there are masked ones.
If a channel is flagged in one of or both
spectra, operation is done for that channel
but the channel is flagged.

File:

• trunk/src/STMath.cpp (modified) (2 diffs)

trunk/src/STMath.cpp

@@ -927 +927 @@
   ArrayColumn<uChar> lflagCol(tmpl,"FLAGTRA");
   ROArrayColumn<uChar> rflagCol(tmpr,"FLAGTRA");
+  ScalarColumn<uInt> lflagrowCol(tmpl,"FLAGROW");
+  ROScalarColumn<uInt> rflagrowCol(tmpr,"FLAGROW");
 
   for (uInt i=0; i<tout.nrow(); ++i) {
+    uInt lflagrow, rflagrow;
+    lflagrow = lflagrowCol(i); rflagrow = rflagrowCol(i);
+    //-------
+    if ((lflagrow > 0)||(rflagrow > 0)) {
+      lflagrowCol.put(i, uInt(1));
+      continue;
+    }
     Vector<Float> lspecvec, rspecvec;
     Vector<uChar> lflagvec, rflagvec;
     lspecvec = lspecCol(i);    rspecvec = rspecCol(i);
     lflagvec = lflagCol(i);    rflagvec = rflagCol(i);
+    Vector<uChar> outflagvec = lflagCol(i);
+    //-------
+    for (uInt j = 0; j < outflagvec.nelements(); ++j) {
+      uChar outflag = 0 << 7;
+      if ((lflagvec(j) == 1 << 7) || (rflagvec(j) == 1 << 7)) {
+        outflag = 1 << 7;
+      }
+      outflagvec(j) = outflag;
+    }
+    lflagvec = 0 << 7;
+    rflagvec = 0 << 7;
+    //-------
     MaskedArray<Float> mleft = maskedArray(lspecvec, lflagvec);
     MaskedArray<Float> mright = maskedArray(rspecvec, rflagvec);
@@ -947 +968 @@
     }
     lspecCol.put(i, mleft.getArray());
+    //-----
+    lflagCol.put(i, outflagvec);
+    //-----
   }
   return out;