Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sebastian Heimann
grond
Commits
bb89f2bf
Commit
bb89f2bf
authored
Jun 14, 2017
by
Sebastian Heimann
Browse files
fix something messed up during merge
parent
2e7588af
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/targets.py
View file @
bb89f2bf
...
...
@@ -412,8 +412,7 @@ tautoshift**2 / tautoshift_max**2``
b_cut
=
b
[
ishift
:]
mns
.
append
(
trace
.
Lx_norm
(
a_cut
,
b_cut
,
norm
=
exponent
))
ns
=
(
num
.
sum
(
num
.
sum
(
tr_obs
))
-
num
.
sum
(
num
.
sum
(
tr_syn
)))
\
/
num
.
sum
(
num
.
sum
(
tr_obs
))
ms
,
ns
=
num
.
array
(
mns
).
T
iarg
=
num
.
argmin
(
ms
)
...
...
@@ -461,6 +460,7 @@ tautoshift**2 / tautoshift_max**2``
misfit_norm
=
n
)
else
:
assert
False
return
result
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment