Changeset 478 for trunk/src


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/SDMath.cc

    r457 r478  
    10211021                                 Float JyPerK, Bool doAll) const
    10221022//
    1023 // etaAp = aperture efficiency
    1024 // D     = geometric diameter (m)
     1023// etaAp = aperture efficiency (-1 means find)
     1024// D     = geometric diameter (m)  (-1 means find)
    10251025// JyPerK
    10261026//
     
    10721072     if (toKelvin) factor = 1.0 / JyPerK;
    10731073//
    1074      cout << "Applying supplied conversion factor = " << factor << endl;
     1074     cout << "Jy/K = " << JyPerK << endl;
    10751075     Vector<Float> factors(in.nRow(), factor);
    10761076     correctFromVector (pTabOut, in, doAll, factors);
    10771077  } else if (etaAp>0.0) {
    1078      factor *= SDAttr::findJyPerKFac (etaAp, D);
     1078     Bool throwIt = True;
     1079     Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
     1080     SDAttr sda;
     1081     if (D < 0) D = sda.diameter(inst);
     1082     Float JyPerK = SDAttr::findJyPerK (etaAp,D);
     1083     cout << "Jy/K = " << JyPerK << endl;
     1084     factor *= JyPerK;
    10791085     if (toKelvin) {
    10801086        factor = 1.0 / factor;
    10811087     }
    10821088//
    1083      cout << "Applying supplied conversion factor = " << factor << endl;
    10841089     Vector<Float> factors(in.nRow(), factor);
    10851090     correctFromVector (pTabOut, in, doAll, factors);
     
    11311136
    11321137     Bool throwIt = True;
    1133      Instrument inst = SDMemTable::convertInstrument (sh.antennaname, throwIt);
     1138     Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
    11341139     
    11351140// Set polynomial
     
    12811286
    12821287   Bool throwIt = True;
    1283    Instrument inst = SDMemTable::convertInstrument (sh.antennaname, throwIt);
     1288   Instrument inst = SDAttr::convertInstrument (sh.antennaname, throwIt);
    12841289
    12851290// Get Diameter (m)
Note: See TracChangeset for help on using the changeset viewer.