Merge branch 'develop' of ariadne:/data/git/pylot into develop
This commit is contained in:
commit
d77abdc1d0
@ -279,11 +279,11 @@ defaults = {'rootpath': {'type': str,
|
|||||||
|
|
||||||
'WAscaling': {'type': float,
|
'WAscaling': {'type': float,
|
||||||
'tooltip': 'Scaling relation of Wood-Anderson amplitude [nm]',
|
'tooltip': 'Scaling relation of Wood-Anderson amplitude [nm]',
|
||||||
'value': []},
|
'value': 1.0},
|
||||||
|
|
||||||
'magscaling': {'type': (float),
|
'magscaling': {'type': float,
|
||||||
'tooltip': 'Scaling relation for derived local magnitude',
|
'tooltip': 'Scaling relation for derived local magnitude [a*Ml+b]',
|
||||||
'value': []}
|
'value': 1.0}
|
||||||
}
|
}
|
||||||
|
|
||||||
settings_main={
|
settings_main={
|
||||||
|
Loading…
x
Reference in New Issue
Block a user