Changeset 9 for trunk

Timestamp:

06/24/04 11:44:08 (20 years ago)

Author:

mmarquar

Message:

Added flags to the computation. Also added function 'quotient' with flag support.

Location:

trunk/src

Files:

• SDMath.cc (modified) (2 diffs)
• SDMath.h (modified) (1 diff)

trunk/src/SDMath.cc

@@ -78 +78 @@
   }
   // averaging using mask
-  MaskedArray<Float> nma (narr,(narr > Float(0)));
+  MaskedArray<Float> nma(narr,(narr > Float(0)));
   outarr /= nma;
-
+  Array<Bool> outflagsb = !(nma.getMask());
+  Array<uChar> outflags(outflagsb.shape());
+  convertArray(outflags,outflagsb);
   SDContainer sc(ip(0),ip(1),ip(2),ip(3));
 
@@ -90 +92 @@
   sc.sourcename = tstr;
   sc.putSpectrum(outarr);
-  //sc.putFlags(outflags);  
+  sc.putFlags(outflags);  
   SDMemTable* sdmt = new SDMemTable(*in);
   sdmt->putSDContainer(sc);
   return CountedPtr<SDMemTable>(sdmt);
 }
+
+static CountedPtr<SDMemTable> 
+SDMath::quotient(const CountedPtr<SDMemTable>& on, 
+                 const CountedPtr<SDMemTable>& off) {
+  
+  Table ton = on->table();
+  Table toff = off->table();
+  ROArrayColumn<Float> tsys(ton, "TSYS");
+  
+  ROScalarColumn<Double> mjd(ton, "TIME");
+  ROScalarColumn<String> srcn(ton, "SRCNAME");
+  MaskedArray<Float> mon(on->rowAsMaskedArray(0));
+  MaskedArray<Float> moff(off->rowAsMaskedArray(0));
+  IPosition ipon = mon.shape();
+  IPosition ipoff = moff.shape();
+  Array<Float> tsarr(tsys.shape(0));
+
+  if (ipon != ipoff && ipon != tsarr.shape()) 
+    cerr << "on/off not conformant" << endl;
+ 
+  //IPosition test = mon.shape()/2;
+  MaskedArray<Float> tmp = (mon-moff);
+  Array<Float> out(tmp.getArray()); 
+  out /= moff;
+  out *= tsarr;
+  Array<Bool> outflagsb = !(mon.getMask() && moff.getMask());
+  Array<uChar> outflags(outflagsb.shape());
+  convertArray(outflags,outflagsb);
+
+  SDContainer sc(ipon(0),ipon(1),ipon(2),ipon(3));
+  String tstr; srcn.getScalar(0,tstr);// get sourcename of "on" scan
+  sc.sourcename = tstr;
+  Double tme; mjd.getScalar(0,tme);// get time of "on" scan
+  sc.timestamp = tme;
+  sc.putSpectrum(out);
+  sc.putFlags(outflags);  
+  SDMemTable* sdmt = new SDMemTable(*on);
+  sdmt->putSDContainer(sc);
+  return CountedPtr<SDMemTable>(sdmt);
+  
+}
+
+

trunk/src/SDMath.h

@@ -41 +41 @@
 public:
   static CountedPtr<SDMemTable> average(const CountedPtr<SDMemTable>& in);
-  //SDMemTable quotient(const SDMemTable& on, const SDMemTable& off);
-  //SDMemTable multiply(SDMemTable& in, Float factor);
+  static CountedPtr<SDMemTable> quotient(const CountedPtr<SDMemTable>& on, 
+                                         const CountedPtr<SDMemTable>& off);
+  //CountedPtr<SDMemTable> multiply(CountedPtr<SDMemTable>& in, Float factor);
   
 };