Changeset 355 for trunk

Timestamp:

02/03/05 15:44:10 (20 years ago)

Author:

kil064

Message:

track change in SDMath::convertFLux interface

Location:

trunk/src

Files:

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

trunk/src/SDMathWrapper.cc

@@ -202 +202 @@
 
 
-void SDMathWrapper::convertFluxInSitu(SDMemTableWrapper& in, 
-                                      float area, float eta, bool doAll)
-{
-  SDMemTable* pIn = in.getPtr();
-  SDMath sdm;
-  SDMemTable* pOut = sdm.convertFlux (*pIn, Float(area), Float(eta), Bool(doAll));
-  *pIn = *pOut;
-  delete pOut;
-}
-
-
-SDMemTableWrapper SDMathWrapper::convertFlux(const SDMemTableWrapper& in, 
-                                             float area, float eta, bool doAll)
-{
-  const CountedPtr<SDMemTable>& pIn = in.getCP();
-  SDMath sdm;
-  return CountedPtr<SDMemTable>(sdm.convertFlux(*pIn, Float(area), Float(eta), Bool(doAll)));
+void SDMathWrapper::convertFluxInSitu(SDMemTableWrapper& in, float D,
+                                      float eta, float JyPerK, bool doAll)
+{
+  SDMemTable* pIn = in.getPtr();
+  SDMath sdm;
+  SDMemTable* pOut = sdm.convertFlux (*pIn, Float(D), Float(eta), Float(JyPerK), Bool(doAll));
+  *pIn = *pOut;
+  delete pOut;
+}
+
+
+SDMemTableWrapper SDMathWrapper::convertFlux(const SDMemTableWrapper& in, float D, float eta, 
+                                             float JyPerK, bool doAll)
+{
+  const CountedPtr<SDMemTable>& pIn = in.getCP();
+  SDMath sdm;
+  return CountedPtr<SDMemTable>(sdm.convertFlux(*pIn, Float(D), Float(eta), Float(JyPerK), Bool(doAll)));
 }
 

trunk/src/SDMathWrapper.h

@@ -77 +77 @@
 
 // Convert brightness between Jy and K
-  void convertFluxInSitu(SDMemTableWrapper& in, float area, float eta, bool doAll);
-  SDMemTableWrapper convertFlux(const SDMemTableWrapper& in, float area, float eta, bool doAll);
+  void convertFluxInSitu(SDMemTableWrapper& in, float D, float eta, float JyPerK, bool doAll);
+  SDMemTableWrapper convertFlux(const SDMemTableWrapper& in, float D, float eta, float JyPerK, bool doAll);
 
 // Apply gain elevation correction