coppied files from Ludgers Laptop

pylot/core/util/defaults.py

@@ -8,7 +8,9 @@ Created on Wed Feb 26 12:31:25 2014
 
 import os
 from pylot.core.loc import nll
-from pylot.core.loc import hsat
+from pylot.core.loc import hyposat
+from pylot.core.loc import hypo71
+from pylot.core.loc import hypodd
 from pylot.core.loc import velest
 
 
@@ -43,10 +45,6 @@ FILTERDEFAULTS = readFilterInformation(os.path.join(os.path.expanduser('~'),
                                                     '.pylot',
                                                     'filter.in'))
 
-AUTOMATIC_DEFAULTS = os.path.join(os.path.expanduser('~'),
-                                  '.pylot',
-                                  'autoPyLoT.in')
-
 TIMEERROR_DEFAULTS = os.path.join(os.path.expanduser('~'),
                                   '.pylot',
                                   'PILOT_TimeErrors.in')
@@ -55,7 +53,7 @@ OUTPUTFORMATS = {'.xml': 'QUAKEML',
                  '.cnv': 'CNV',
                  '.obs': 'NLLOC_OBS'}
 
-LOCTOOLS = dict(nll=nll, hsat=hsat, velest=velest)
+LOCTOOLS = dict(nll=nll, hyposat=hyposat, velest=velest, hypo71=hypo71, hypodd=hypodd)
 
 COMPPOSITION_MAP = dict(Z=2, N=1, E=0)
 COMPPOSITION_MAP['1'] = 1