Changeset 18830 for trunk/Mars/mcore/nova.h

Timestamp:

04/14/17 17:28:46 (8 years ago)

Author:

tbretz

Message:

Simplified CINT workaround. Added RWTH.

File:

• trunk/Mars/mcore/nova.h (modified) (2 diffs)

trunk/Mars/mcore/nova.h

@@ -19 +19 @@
     struct RaDecPosn;
 
-    const static ln_lnlat_posn kORM
 #ifndef __CINT__
-        = { -(17.+53./60+26.525/3600), 28.+45./60+42.462/3600 } // 2200m
+#define OBS(lat,lng) ={lat,lng}
+#else
+#define OBS(lat,lng)
 #endif
-    ;
-    const static ln_lnlat_posn kHAWC
-#ifndef __CINT__
-        = { -97.3084, 18.9947 } // 4100m;
-#endif
-    ;
-    const static ln_lnlat_posn kSPM
-#ifndef __CINT__
-        = { -115.4637, 31.0439 } // 2800m;
-#endif
-    ;
+
+    const static ln_lnlat_posn kORM  OBS(-(17.+53./60+26.525/3600), 28.+45./60+42.462/3600); // 2800m
+    const static ln_lnlat_posn kHAWC OBS( -97.3084,                 18.9947               ); // 4100m;
+    const static ln_lnlat_posn kSPM  OBS(-115.4637,                 31.0439               ); // 2800m;
+    const static ln_lnlat_posn kRWTH OBS(   6.0657,                 50.7801               );
 
     struct LnLatPosn : public ln_lnlat_posn
@@ -47 +42 @@
                 { "HAWC", kHAWC },
                 { "SPM",  kSPM  },
+                { "RWTH", kRWTH },
             };