Changeset 478 for trunk/src

Timestamp:

02/18/05 11:56:04 (20 years ago)

Author:

kil064

Message:

convertInstrument moved to SDAttr
fix bug in convertFLux where diameter was not set

File:

• trunk/src/SDMath.cc (modified) (4 diffs)

trunk/src/SDMath.cc

@@ -1021 +1021 @@
                                  Float JyPerK, Bool doAll) const
 // 
-// etaAp = aperture efficiency
-// D     = geometric diameter (m)
+// etaAp = aperture efficiency (-1 means find)
+// D     = geometric diameter (m)  (-1 means find)
 // JyPerK 
 //
@@ -1072 +1072 @@
      if (toKelvin) factor = 1.0 / JyPerK;
 //
-     cout << "Applying supplied conversion factor = " << factor << endl;
+     cout << "Jy/K = " << JyPerK << endl;
      Vector<Float> factors(in.nRow(), factor);
      correctFromVector (pTabOut, in, doAll, factors);
   } else if (etaAp>0.0) {
-     factor *= SDAttr::findJyPerKFac (etaAp, D);
+     Bool throwIt = True;
+     Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
+     SDAttr sda;
+     if (D < 0) D = sda.diameter(inst);
+     Float JyPerK = SDAttr::findJyPerK (etaAp,D);
+     cout << "Jy/K = " << JyPerK << endl;
+     factor *= JyPerK;
      if (toKelvin) {
         factor = 1.0 / factor;
      }
 //
-     cout << "Applying supplied conversion factor = " << factor << endl;
      Vector<Float> factors(in.nRow(), factor);
      correctFromVector (pTabOut, in, doAll, factors);
@@ -1131 +1136 @@
 
      Bool throwIt = True;
-     Instrument inst = SDMemTable::convertInstrument (sh.antennaname, throwIt);
+     Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
      
 // Set polynomial
@@ -1281 +1286 @@
 
    Bool throwIt = True;
-   Instrument inst = SDMemTable::convertInstrument (sh.antennaname, throwIt);
+   Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
 
 // Get Diameter (m)