Changeset 295 for trunk

Timestamp:

01/25/05 14:57:23 (20 years ago)

Author:

kil064

Message:

track some small changes to SDMath interface (addition of
doTSys arg here and there)

Location:

trunk/src

Files:

• SDMathWrapper.cc (modified) (6 diffs)
• SDMathWrapper.h (modified) (1 diff)

trunk/src/SDMathWrapper.cc

@@ -43 +43 @@
 {
     SDMath sdm;
+    Bool doTSys = True;
     return SDMemTableWrapper(sdm.binaryOperate(on.getCP(), off.getCP(), 
-                             String("QUOTIENT"), preserveContinuum));
+                             String("QUOTIENT"), preserveContinuum, doTSys));
 }
 
@@ -50 +51 @@
 SDMemTableWrapper SDMathWrapper::binaryOperate(const SDMemTableWrapper& left,
                                                const SDMemTableWrapper& right,
-                                               const std::string& op)
+                                               const std::string& op, bool doTSys)
 {
     SDMath sdm;
     return SDMemTableWrapper(sdm.binaryOperate(left.getCP(), right.getCP(), 
-                                               String(op), False));
-}
-
-
-void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll)
+                                               String(op), False, Bool(doTSys)));
+}
+
+
+void SDMathWrapper::scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll, bool doTSys)
 {
   SDMemTable* pIn = in.getPtr();
@@ -65 +66 @@
   SDMath sdm;
   SDMemTable* pOut = sdm.unaryOperate (*pIn, Float(factor), 
-                                        Bool(doAll), what);
+                                        Bool(doAll), what, Bool(doTSys));
   *pIn = *pOut;
    delete pOut;
@@ -71 +72 @@
 
 SDMemTableWrapper SDMathWrapper::scale(const SDMemTableWrapper& in,
-                          float factor, bool doAll)
+                                       float factor, bool doAll, bool doTSys)
 {
   const CountedPtr<SDMemTable>& pIn = in.getCP();
   const uInt what = 0;
   SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn,
-                                                  Float(factor), 
-                                                  Bool(doAll), what));
+  return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn, Float(factor), Bool(doAll), 
+                                                 what, Bool (doTSys)));
 }
 
@@ -89 +89 @@
 //
   SDMath sdm;
+  Bool doTSys = False;
   SDMemTable* pOut = sdm.unaryOperate (*pIn, Float(offset), 
-                                        Bool(doAll), what);
+                                        Bool(doAll), what, doTSys);
   *pIn = *pOut;
    delete pOut;
@@ -101 +102 @@
   const uInt what = 1;
   SDMath sdm;
+  Bool doTSys = False;
   return CountedPtr<SDMemTable>(sdm.unaryOperate(*pIn, Float(offset),
-                                                  Bool(doAll), what));
+                                                  Bool(doAll), what, doTSys));
 }
 

trunk/src/SDMathWrapper.h

@@ -51 +51 @@
   SDMemTableWrapper binaryOperate (const SDMemTableWrapper& left,
                                    const SDMemTableWrapper& right,
-                                   const std::string& op);
+                                   const std::string& op, bool doTSys);
 
 // Multiply
-  void scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll);
-  SDMemTableWrapper scale(const SDMemTableWrapper& in,
-                          float factor, bool all);
+  void scaleInSitu(SDMemTableWrapper& in, float factor, bool doAll, bool doTSys);
+  SDMemTableWrapper scale(const SDMemTableWrapper& in, float factor, bool all, bool doTSys);
 
 // Add