Merge branch 'develop' of ariadne:/data/git/pylot into develop

2017-06-21 14:10:24 +02:00 · 2017-06-21 14:10:24 +02:00 · d77abdc1d0
commit d77abdc1d0
parent 5214d31908 b96af41324
1 changed files with 4 additions and 4 deletions
--- a/pylot/core/io/default_parameters.py
+++ b/pylot/core/io/default_parameters.py
@ -279,11 +279,11 @@ defaults = {'rootpath': {'type': str,
            
            'WAscaling': {'type': float,
                         'tooltip': 'Scaling relation of Wood-Anderson amplitude [nm]',
-                         'value': []},
+                         'value': 1.0},

-            'magscaling': {'type': (float),
-                         'tooltip': 'Scaling relation for derived local magnitude',
-                         'value': []}
+            'magscaling': {'type': float,
+                         'tooltip': 'Scaling relation for derived local magnitude [a*Ml+b]',
+                         'value': 1.0}
 }

 settings_main={