Changeset 15

Timestamp:

06/30/04 10:59:20 (20 years ago)

Author:

mmarquar

Message:

Added multiply function.

Location:

trunk/src

Files:

• SDMath.cc (modified) (6 diffs)
• SDMath.h (modified) (1 diff)
• python_SDMath.cc (modified) (1 diff)

trunk/src/SDMath.cc

@@ -55 +55 @@
   ROScalarColumn<Double> mjd(t, "TIME");
   ROScalarColumn<String> srcn(t, "SRCNAME");
+  ROScalarColumn<Double> integr(t, "INTERVAL");
   IPosition ip = in->rowAsMaskedArray(0).shape();
   Array<Float> outarr(ip); outarr =0.0;
@@ -63 +64 @@
   Array<Float> outtsarr(tsys.shape(0));
   Double tme = 0.0;
+  Double inttime = 0.0;
 
   for (uInt i=0; i < t.nrow(); i++) {
@@ -76 +78 @@
     mjd.get(i,tmp);
     tme += tmp;// average time
+    integr.get(i,tmp);
+    inttime += tmp;
   }
   // averaging using mask
@@ -88 +92 @@
   outtsarr /= Float(n/2);
   sc.timestamp = tme/Double(n/2);
-
-  String tstr; srcn.getScalar(n,tstr);// get sourcename of "mid" point
+  sc.interval =inttime;
+  String tstr; srcn.getScalar(0,tstr);// get sourcename of "mid" point
   sc.sourcename = tstr;
   sc.putSpectrum(outarr);
   sc.putFlags(outflags);  
-  SDMemTable* sdmt = new SDMemTable(*in);
+  SDMemTable* sdmt = new SDMemTable(*in,True);
   sdmt->putSDContainer(sc);
   return CountedPtr<SDMemTable>(sdmt);
@@ -104 +108 @@
   Table ton = on->table();
   Table toff = off->table();
-  ROArrayColumn<Float> tsys(toff, "TSYS");
-  
+  ROArrayColumn<Float> tsys(toff, "TSYS");  
   ROScalarColumn<Double> mjd(ton, "TIME");
+  ROScalarColumn<Double> integr(ton, "INTERVAL");
   ROScalarColumn<String> srcn(ton, "SRCNAME");
   MaskedArray<Float> mon(on->rowAsMaskedArray(0));
@@ -131 +135 @@
   Double tme; mjd.getScalar(0,tme);// get time of "on" scan
   sc.timestamp = tme;
+  integr.getScalar(0,tme);
+  sc.interval = tme;
   sc.putSpectrum(out);
   sc.putFlags(outflags);  
-  SDMemTable* sdmt = new SDMemTable(*on);
+  SDMemTable* sdmt = new SDMemTable(*on, True);
   sdmt->putSDContainer(sc);
   return CountedPtr<SDMemTable>(sdmt);
   
 }
+static CountedPtr<SDMemTable> 
+SDMath::multiply(const CountedPtr<SDMemTable>& in, Float factor) {
+  SDMemTable* sdmt = new SDMemTable(*in);
+  Table t = sdmt->table();
+  ArrayColumn<Float> spec(t,"SPECTRA");
 
-
+  for (uInt i=0; i < t.nrow(); i++) {
+    // data stuff
+    MaskedArray<Float> marr(sdmt->rowAsMaskedArray(i));
+    marr *= factor;
+    spec.put(i, marr.getArray());
+  }
+  return CountedPtr<SDMemTable>(sdmt);
+}
+/*
+static Float SDMath::rms(const SDMemTable& in, uInt whichRow) {
+  Table t = in.table();  
+  MaskedArray<Float> marr(in.rowAsMaskedArray(whichRow,True));
+  
+}
+*/

trunk/src/SDMath.h

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

trunk/src/python_SDMath.cc

@@ -42 +42 @@
     .def("average", &SDMathWrapper::average)
     .def("quotient", &SDMathWrapper::quotient)
+    .def("multiply", &SDMathWrapper::multiply)
     ;
 };