Changeset 362

Timestamp:

02/03/05 16:44:37 (19 years ago)

Author:

kil064

Message:

move gain elevation info into here from SDMath

Location:

trunk/src

Files:

• SDAttr.cc (modified) (7 diffs)
• SDAttr.h (modified) (2 diffs)

trunk/src/SDAttr.cc

@@ -70 +70 @@
 {
    Float D = 1.0;
-   if (inst==ATPKSMB || inst==ATPKSHOH) {
-      D = 64.0;
-   } else if (inst==ATMOPRA) {
-      D = 22.0;
-   } else if (inst==TIDBINBILLA) {
-      D = 70.0;
-   } else if (inst==CEDUNA) {
-      D = 30.0;
-   } else if (inst==HOBART) {
-      D = 26.0;
-   } else {
-      throw(AipsError("Unknown instrument"));
+   switch (inst) {
+      case ATMOPRA:
+        {
+           D = 22.0;
+        }
+        break;
+      case ATPKSMB:
+      case ATPKSHOH:
+        {
+           D = 64.0;
+        }
+        break;
+      case TIDBINBILLA:
+        {
+           D = 70.0;
+        }
+        break;
+      case CEDUNA:
+        {
+           D = 30.0;
+        }
+        break;
+      case HOBART:
+        {
+           D = 26.0;
+        }
+        break;
+      default:
+        {
+            throw(AipsError("Unknown instrument"));
+        }
    }
 //
@@ -93 +112 @@
 
    Vector<Float> facs(freqs.nelements(),1.0);
-   if (inst==ATPKSMB) {
-      cerr << "No beam efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==ATPKSHOH) {
-      cerr << "No beam efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==ATMOPRA) {
-      facs = interp (freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_);
-   } else if (inst==TIDBINBILLA) {
-      cerr << "No beam efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==CEDUNA) {
-      cerr << "No beam efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==HOBART) {
-      cerr << "No beam efficiency data for this instrument - assuming unity" << endl;
-   } else {
+   switch (inst) {
+      case ATMOPRA:
+        {
+           facs = interp (freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_);
+        }
+        break;
+      default:
+        {
+           cerr << "No beam efficiency data for this instrument - assuming unity" << endl;
+        }
    }
 //
@@ -117 +133 @@
 
    Vector<Float> facs(freqs.nelements(),1.0);
-   if (inst==ATPKSMB) {
-      cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==ATPKSHOH) {
-      cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==ATMOPRA) {
-      facs = interp (freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
-   } else if (inst==TIDBINBILLA) {
-      cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==CEDUNA) {
-      cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
-   } else if (inst==HOBART) {
-      cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
-   } else {
-      cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
+   switch (inst) {
+      case ATMOPRA:
+        {
+           facs = interp (freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
+        }
+        break;
+      default:
+        {
+           cerr << "No aperture efficiency data for this instrument - assuming unity" << endl;
+        }
    }
    return facs;
@@ -166 +178 @@
 
 
+Vector<Float> SDAttr::gainElevationPoly (Instrument inst) const
+{
+
+// Look at date where appropriate
+
+   switch (inst) {
+      case TIDBINBILLA:
+        {
+           return TidGainElPoly_.copy();
+        }
+        break;
+      default:
+        {
+           Vector<Float> t;
+           return t.copy();
+        }
+   }
+}
+
+
+
 
 // Private
@@ -186 +219 @@
 
 void SDAttr::initData () 
-{
 //
 // Mopra data from online Mopra guide.
 //
+{
+
+// Beam efficiency
+
    MopEtaBeamX_.resize(3);
    MopEtaBeamX_(0) = 86.0;
@@ -204 +240 @@
    MopEtaBeam2004Y_(1) = 0.44;
    MopEtaBeam2004Y_(2) = 0.42;
-//
+
+// Aperture efficiency
+
    MopEtaApX_.resize(2);
    MopEtaApX_(0) = 86.0;
@@ -212 +250 @@
    MopEtaAp2004Y_(0) = 0.33;
    MopEtaAp2004Y_(1) = 0.24;
-}
-
+
+// Gain elevation correction polynomial coefficients (for elevation in degrees)
+
+   TidGainElPoly_.resize(3);
+   TidGainElPoly_(0) = 3.58788e-1;
+   TidGainElPoly_(1) = 2.87243e-2;
+   TidGainElPoly_(2) = -3.219093e-4;
+}

trunk/src/SDAttr.h

@@ -63 +63 @@
 
 // Beam efficiency.  Frequency in Hz.  Returns 1 if unknown.
-   casa::Vector<casa::Float> beamEfficiency (Instrument, const casa::MEpoch& dateObs, 
+   casa::Vector<casa::Float> beamEfficiency (Instrument instr, const casa::MEpoch& dateObs, 
                                              const casa::Vector<casa::Float>& freqs) const;
  
 // Aperture efficiency. Frequency in Hz.  Returns 1 if unknown.
-   casa::Vector<casa::Float> apertureEfficiency (Instrument, const casa::MEpoch& dateObs, 
+   casa::Vector<casa::Float> apertureEfficiency (Instrument instr, const casa::MEpoch& dateObs, 
                                                  const casa::Vector<casa::Float>& freqs) const;
 
 // Find factor to convert Jy -> K for this telescope, date of observation and frequency (Hz)
-   casa::Vector<casa::Float> JyPerK (Instrument, const casa::MEpoch& dateObs, 
+   casa::Vector<casa::Float> JyPerK (Instrument instr, const casa::MEpoch& dateObs, 
                                      const casa::Vector<casa::Float>& freqs) const;
 
@@ -77 +77 @@
    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;
+
  private:
 
 // Static data
 
-   casa::Vector<casa::Float> MopEtaBeamX_;
+   casa::Vector<casa::Float> MopEtaBeamX_;          // Beam efficiency
    casa::Vector<casa::Float> MopEtaBeam2003Y_;
    casa::Vector<casa::Float> MopEtaBeam2004Y_;
-   casa::Vector<casa::Float> MopEtaApX_;
+//
+   casa::Vector<casa::Float> MopEtaApX_;            // Aperture efficiency
    casa::Vector<casa::Float> MopEtaAp2004Y_;
+//
+   casa::Vector<casa::Float> TidGainElPoly_;        // Gain-el correction poly coeffs
 
 // Init private data