Commit c6b649ef authored by Marius Kriegerowski's avatar Marius Kriegerowski
Browse files

Merge branch 'master' into python3

parents a6e14ca2 80196ca2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
## Installation ## Installation
First, install [Pyrocko](http://emolch.github.io/pyrocko/v0.3/install.html), First, install [Pyrocko](http://pyrocko.org/current/install.html),
then install Lassie: then install Lassie:
```bash ```bash
......
...@@ -87,7 +87,10 @@ class CakePhaseShifter(Shifter): ...@@ -87,7 +87,10 @@ class CakePhaseShifter(Shifter):
def get_vmin(self): def get_vmin(self):
vs = self.get_earthmodel().profile('vs') vs = self.get_earthmodel().profile('vs')
return num.min(vs[vs != 0.0]) vp = self.get_earthmodel().profile('vp')
v = num.concatenate((vs, vp))
vmin = num.min(v[v != 0.0])
return vmin
def ttt_path(self, ehash): def ttt_path(self, ehash):
return op.join(self._cache_path, ehash + '.spit') return op.join(self._cache_path, ehash + '.spit')
......
...@@ -291,8 +291,12 @@ def snuffle(config): ...@@ -291,8 +291,12 @@ def snuffle(config):
p = pile.make_pile(paths=paths, fileformat='detect') p = pile.make_pile(paths=paths, fileformat='detect')
meta = {'tabu': True}
for tr in p.iter_traces(trace_selector=lambda x: x.station == 'SMAX'): for tr in p.iter_traces(trace_selector=lambda x: x.station == 'SMAX'):
tr.meta = {'tabu': True} if tr.meta:
tr.meta.update(meta)
else:
tr.meta = meta
snuffler.snuffle(p, stations=stations, snuffler.snuffle(p, stations=stations,
launch_hook=load_snuffling) launch_hook=load_snuffling)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment