Changeset 394

Timestamp:

02/08/05 16:30:29 (19 years ago)

Author:

kil064

Message:

Detect Year now in selecting beam/aperture efficiency data

File:

• trunk/src/SDAttr.cc (modified) (3 diffs)

trunk/src/SDAttr.cc

@@ -37 +37 @@
 #include <casa/Quanta/QC.h>
 #include <casa/Quanta/Quantum.h>
+#include <casa/Quanta/MVTime.h>
 
 #include <measures/Measures/MEpoch.h>
@@ -111 +112 @@
 // Look at date where appropriate
 
+   MVTime t(dateObs.getValue());
+   uInt year = t.year();
+//
    Vector<Float> facs(freqs.nelements(),1.0);
    switch (inst) {
       case ATMOPRA:
         {
-           facs = interp (freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_);
+           if (year<2003) {
+              cerr << "There is no beam efficiency data from before 2003 - using 2003 data" << endl;
+              facs = interp (freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_); 
+           } else if (year==2003) {
+              cerr << "Using beam efficiency data from 2003" << endl;
+              facs = interp (freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2003Y_); 
+           } else {
+              cerr << "Using beam efficiency data from 2004" << endl;
+              facs = interp (freqs/1.0e9f, MopEtaBeamX_, MopEtaBeam2004Y_); 
+           }
         }
         break;
@@ -132 +145 @@
 // Look at date where appropriate
 
+   MVTime t(dateObs.getValue());
+   uInt year = t.year();
+//
    Vector<Float> facs(freqs.nelements(),1.0);
    switch (inst) {
       case ATMOPRA:
         {
-           facs = interp (freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
+           if (year<2004) {
+              cerr << "There is no aperture efficiency data from before 2004 - using 2004 data" << endl;
+              facs = interp (freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
+           } else {
+              cerr << "Using aperture efficiency data from 2004" << endl;
+              facs = interp (freqs/1.0e9f, MopEtaApX_, MopEtaAp2004Y_);
+           }
         }
         break;