Fix BERV computations

drslib/berv/astroTimeLegacy.py

@@ -4,8 +4,8 @@ import datetime
 import numpy
 from numpy import sin, cos, tan, sqrt, arcsin
 #from PyAstronomy.pyaC import pyaErrors as PE
-import pyaErrors as PE
-import six.moves as smo
+#import pyaErrors as PE
+#import six.moves as smo
 
 
 def daycnv(xjd, mode="idl"):
@@ -76,10 +76,10 @@ def daycnv(xjd, mode="idl"):
           Converted to IDL V5.0   W. Landsman   September 1997
   """
   
-  if not mode in ('idl', 'dtlist', 'dt'):
-    raise(PE.PyAValError("Unknown mode: " + str(mode), \
-                         where="daycnv", \
-                         solution="Use any of 'idl', 'dtlist', or 'dt'."))
+  #if not mode in ('idl', 'dtlist', 'dt'):
+  #  raise(PE.PyAValError("Unknown mode: " + str(mode), \
+  #                       where="daycnv", \
+  #                       solution="Use any of 'idl', 'dtlist', or 'dt'."))
 
   # Adjustment needed because Julian day starts at noon, calendar day at midnight
   
@@ -115,15 +115,15 @@ def daycnv(xjd, mode="idl"):
     if mode == 'dtlist':
       if not iterable:
         return [yr[0], mn[0], day[0], hour[0], minute[0], sec[0], msec[0]]      
-      return [[yr[i], mn[i], day[i], hour[i], minute[i], sec[i], msec[i]] for i in smo.range(len(yr))]
+      return [[yr[i], mn[i], day[i], hour[i], minute[i], sec[i], msec[i]] for i in xrange(len(yr))]
     # Return datetime object
-    dts = [datetime.datetime(*(yr[i], mn[i], day[i], hour[i], minute[i], sec[i], msec[i])) for i in smo.range(len(yr))]
+    dts = [datetime.datetime(*(yr[i], mn[i], day[i], hour[i], minute[i], sec[i], msec[i])) for i in xrange(len(yr))]
     if not iterable: 
       return dts[0]
     return dts
   if not iterable:
     return [yr[0], mn[0], day[0], hr[0]]
-  return [[yr[i], mn[i], day[i], hr[i]] for i in smo.range(len(yr))]
+  return [[yr[i], mn[i], day[i], hr[i]] for i in xrange(len(yr))]
 
 
 
@@ -284,7 +284,7 @@ def bprecess(ra, dec, mu_radec = None,  \
   s1 = r1/rmag    ; s1_dot = r1_dot/rmag
 
   s = s1
-  for j in smo.range(2):
+  for j in xrange(2):
     r = s1 + A - ((s * A).sum())*s
     s = r/rmag
  
@@ -901,10 +901,10 @@ def helio_jd(date, ra, dec, B1950 = False, TIME_DIFF = False):
 
   # Because XYZ uses default B1950 coordinates, we'll convert everything to B1950
 
-  if date > 2.4e6:
-    PE.warn(PE.PyAValError("The given Julian Date ( " + str(date) + ") is exceedingly large far a reduced JD.",
-                           solution="Did you forget to subtract 2.4e6?",
-                           where="helio_jd"))
+  #if date > 2.4e6:
+  #  PE.warn(PE.PyAValError("The given Julian Date ( " + str(date) + ") is exceedingly large far a reduced JD.",
+  #                         solution="Did you forget to subtract 2.4e6?",
+  #                         where="helio_jd"))
 
   if not B1950:
     bpresult = bprecess(ra,dec)

drslib/berv/baryvel.py

 from __future__ import print_function, division
 import numpy as np
 from astroTimeLegacy import premat, daycnv, precess, helio_jd
-from idlMod import idlMod
-#from PyAstronomy.pyaC import pyaErrors as PE
-import pyaErrors as PE
-import six
-import six.moves as smo
+
+def idlMod(a, b):
+  """
+    Emulate 'modulo' behavior of IDL.
+    
+    Parameters
+    ----------
+    a : float or array
+        Numerator
+    b : float
+        Denominator
+    
+    Returns
+    -------
+    IDL modulo : float or array
+        The result of IDL modulo operation.
+  """
+  if isinstance(a, np.ndarray):
+    s = np.sign(a)
+    m = np.mod(a, b)
+    m[(s < 0)] -= b
+  else:
+    m = a % b
+    if a < 0: m -= b
+  return m
+
 
 def baryvel(dje, deq):
   """
@@ -234,7 +255,7 @@ def baryvel(dje, deq):
   pertld = 0.0
   pertr = 0.0
   pertrd = 0.0
-  for k in smo.range(15):
+  for k in xrange(15):
     a = idlMod((dcargs[k,0] + dt*dcargs[k,1]), dc2pi)
     cosa = np.cos(a)
     sina = np.sin(a)
@@ -269,7 +290,7 @@ def baryvel(dje, deq):
   pertld = 0.0
   pertp = 0.0
   pertpd = 0.0
-  for k in smo.range(3):
+  for k in xrange(3):
     a = idlMod((dcargm[k,0] + dt*dcargm[k,1]), dc2pi)
     sina = np.sin(a)
     cosa = np.cos(a)
@@ -293,7 +314,7 @@ def baryvel(dje, deq):
   dxbd = dxhd*dc1mme
   dybd = dyhd*dc1mme
   dzbd = dzhd*dc1mme
-  for k in smo.range(4):
+  for k in xrange(4):
     plon = forbel[k+3]
     pomg = sorbel[k+1]
     pecc = sorbel[k+9]
@@ -453,8 +474,8 @@ def helcorr(obs_long, obs_lat, obs_alt, ra2000, dec2000, jd, equinox=2000.0, pma
   # East longitudes are positive
   obs_long = -obs_long
 
-  if jd < 2.4e6:
-    PE.warn(PE.PyAValError("The given Julian Date (" + str(jd) + ") is exceedingly small. Did you subtract 2.4e6?"))
+#  if jd < 2.4e6:
+#    PE.warn(PE.PyAValError("The given Julian Date (" + str(jd) + ") is exceedingly small. Did you subtract 2.4e6?"))
 
   # Covert JD to Gregorian calendar date
   xjd = jd

drslib/varie.py

@@ -875,15 +875,18 @@ def berv_corr(hdr):
         hjd = hdr[CONFIG['DRS_MJD'][0]]
         return barycorr, hjd
 
+    # target coordinates
     radec = coord.SkyCoord(ra,dec, unit=(u.hourangle, u.deg))
     ra = radec.ra.value
     dec = radec.dec.value
     equinox = float(hdr[CONFIG['KEYS']['EQUINOX']])
 
+    # proper motions
     try:
         pma = float(hdr[CONFIG['KEYS']['PMA']])
         pmd = float(hdr[CONFIG['KEYS']['PMD']])
     except:
+        print CONFIG['KEYS']['PMA']
         pma = 0.0
         pmd = 0.0
 
@@ -892,10 +895,21 @@ def berv_corr(hdr):
     if abs(pmd) > 100:
         pmd = 0.0
 
+    # JD (if MJD then convert to JD) + half exposure time
     try:
-        mjd = hdr[CONFIG['DRS_MJD'][0]]
+        mjd = float(hdr[CONFIG['DRS_MJD'][0]])
     except:
-        mjd = hdr[CONFIG['KEYS']['MJD']]
+        mjd = float(hdr[CONFIG['KEYS']['MJD']])
+    if mjd < 100000:
+        mjd = mjd + 2400000.5
+
+    try:
+        expt = float(hdr[CONFIG['KEYS']['EXPTIME']])/2.0
+    except:
+        expt = 0.0
+
+    mjd = mjd + (expt/(86400.0))
+
     barycorr, hjd, vbar, vdiurnal = baryvel.helcorr(longitude,latitude,elevation,ra,dec,mjd,equinox,pma,pmd)
 
     return barycorr, hjd