Changeset 475 for trunk

Timestamp:

02/18/05 11:53:17 (20 years ago)

Author:

kil064

Message:

move function convertInstrument into here from SDMemTable
fix error in apertureEfficiency function (missing break)

Location:

trunk/src

Files:

• SDAttr.cc (modified) (4 diffs)
• SDAttr.h (modified) (1 diff)

trunk/src/SDAttr.cc

@@ -165 +165 @@
             facs = interp (freqs/1.0e9f, TidEtaApX_, TidEtaApY_);
         }
+        break;
       default:
         {
@@ -185 +186 @@
    Vector<Float> facs(freqs.nelements(),1.0);
    for (uInt i=0; i<freqs.nelements(); i++) {
-      facs(i) = SDAttr::findJyPerKFac (etaAp(i), D);
+      facs(i) = SDAttr::findJyPerK (etaAp(i), D);
    }
 //
@@ -192 +193 @@
 
 
-Float SDAttr::findJyPerKFac (Float etaAp, Float D)
+Float SDAttr::findJyPerK (Float etaAp, Float D)
 //
 // Converts K -> Jy
@@ -293 +294 @@
    TidGainElPoly_(2) = -3.219093e-4;
 }
+
+
+Instrument SDAttr::convertInstrument(const String& instrument,
+                                     Bool throwIt)
+{
+   String t(instrument);
+   t.upcase();
+
+   // The strings are what SDReader returns, after cunning interrogation
+   // of station names... :-(
+   Instrument inst = asap::UNKNOWN;
+   if (t==String("DSS-43")) {
+      inst = TIDBINBILLA;
+   } else if (t==String("ATPKSMB")) {
+      inst = ATPKSMB;
+   } else if (t==String("ATPKSHOH")) {
+      inst = ATPKSHOH;
+   } else if (t==String("ATMOPRA")) {
+      inst = ATMOPRA;
+   } else if (t==String("CEDUNA")) {
+      inst = CEDUNA;
+   } else if (t==String("HOBART")) {
+      inst = HOBART;
+   } else {
+     if (throwIt) {
+       throw AipsError("Unrecognized instrument - use function scan.set_instrument to set");
+     }
+   }
+   return inst;
+}
+
+

trunk/src/SDAttr.h

@@ -74 +74 @@
                                      const casa::Vector<casa::Float>& freqs) const;
 
-// Factor to convert K -> Jy. Provide aperture efficiency and dish geometric diameter (m)
-   static casa::Float findJyPerKFac (casa::Float etaAp, casa::Float D);
-
 // Gain Elevation polynomial correction coefficients (elevation in degrees)
 // Returns length 0 if not known.
    casa::Vector<casa::Float> gainElevationPoly (Instrument instr) const;
+
+
+// Helper function to check instrument (antenna) name and give enum
+  static Instrument convertInstrument(const casa::String& instrument, 
+                                      casa::Bool throwIt);
+
+// Helper function.  Finds factor to convert K -> Jy. Provide aperture efficiency and dish geometric diameter (m)
+   static casa::Float findJyPerK (casa::Float etaAp, casa::Float D);
 
  private: