Changeset 292 for trunk/src

Timestamp:

01/24/05 18:23:45 (20 years ago)

Author:

kil064

Message:

track changes to enum SDDefs::Instrument

Location:

trunk/src

Files:

• SDMath.cc (modified) (2 diffs)
• SDMemTable.cc (modified) (1 diff)

trunk/src/SDMath.cc

@@ -1016 +1016 @@
         msg = String("user");
      } else {
-        if (inst==PKSMULTIBEAM) {
-        } else if (inst==PKSSINGLEBEAM) {
+        if (inst==ATPKSMB) {
+        } else if (inst==ATPKSHOH) {
         } else if (inst==TIDBINBILLA) {
            pPoly = new Polynomial<Float>(3);
@@ -1024 +1024 @@
            coeff(1) = 2.87243e-2;
            coeff(2) = -3.219093e-4;
-        } else if (inst==MOPRA) {
+        } else if (inst==ATMOPRA) {
+        } else {
         }
         msg = String("built in");

trunk/src/SDMemTable.cc

@@ -1257 +1257 @@
 //
    Instrument inst = asap::UNKNOWN;
-   if (t==String("TID")) {
+   if (t==String("DSS-43")) {
       inst = TIDBINBILLA;
    } else if (t==String("ATPKSMB")) {
-      inst = PKSMULTIBEAM;
-   } else if (t==String("ATPKSSB")) {
-      inst = PKSSINGLEBEAM;
-   } else if (t==String("MOPRA")) {
-      inst = MOPRA;
+      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) {