Commit d8733d71 authored by Remi Perenon's avatar Remi Perenon

Merge branch 'bugfix-normalization_error_on_weighting' into 'develop'

Bugfix normalization error on weighting

See merge request !45
parents d246a636 ffb9f341
Pipeline #4784 passed with stages
in 24 minutes and 25 seconds
* ADDED Neutron Dynamic Total Structure Factor analysis
* ADDED User can now launch a script with qvector parameters instead of saved qvector definition
* FIXED issue #43 The weights are no more normalized with absolute sum /!\ Modifies at least CCF, DCSF and SSF job behavior
* FIXED issue #42 Plotter units could be inconsistent
* FIXED issue #41 Instrument resolution window froze GUI on macOS
* FIXED issue #40 MDANSE could not be used on Ubuntu Bionic systems (due to vtk dependency name)
......
......@@ -72,9 +72,9 @@ def get_weights(props, contents, dim):
weights[elements] = numpy.float64(numpy.copy(fact))
if normFactor is None:
normFactor = numpy.abs(fact)
normFactor = fact
else:
normFactor += numpy.abs(fact)
normFactor += fact
for k in weights.keys():
weights[k] /= numpy.float64(normFactor)
......
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