Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
b9820623
Commit
b9820623
authored
8 years ago
by
Anton Piccardo-Selg
Browse files
Options
Downloads
Patches
Plain Diff
Refs #18309 Fix typo
parent
4763ad9e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
+2
-2
2 additions, 2 deletions
...lugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
with
2 additions
and
2 deletions
Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANSFitShiftScale.py
+
2
−
2
View file @
b9820623
...
@@ -150,11 +150,10 @@ class SANSFitShiftScale(DataProcessorAlgorithm):
...
@@ -150,11 +150,10 @@ class SANSFitShiftScale(DataProcessorAlgorithm):
y_model
=
front_data_corrected
.
dataY
(
0
)
y_model
=
front_data_corrected
.
dataY
(
0
)
y_data
=
rear_data_corrected
.
dataY
(
0
)
y_data
=
rear_data_corrected
.
dataY
(
0
)
if
any
([
np
.
isnan
(
element
)
for
element
in
y_model
])
or
any
([
np
.
isnan
(
element
)
for
element
in
y_data
]):
if
any
([
np
.
isnan
(
element
)
for
element
in
y_model
])
or
any
([
np
.
isnan
(
element
)
for
element
in
y_data
]):
raise
RuntimeError
(
"
Trying to merge
two merge
the two reduced data sets for HAB and LAB failed.
"
raise
RuntimeError
(
"
Trying to merge the two reduced data sets for HAB and LAB failed.
"
"
You seem to have Nan values in your reduced HAB or LAB data set. This is most likely
"
"
You seem to have Nan values in your reduced HAB or LAB data set. This is most likely
"
"
caused by a too small Q binning. Try to increase the Q bin width.
"
)
"
caused by a too small Q binning. Try to increase the Q bin width.
"
)
fit
=
self
.
createChildAlgorithm
(
'
Fit
'
)
# We currently have to put the front_data into the ADS so that the TabulatedFunction has access to it
# We currently have to put the front_data into the ADS so that the TabulatedFunction has access to it
front_data_corrected
=
AnalysisDataService
.
addOrReplace
(
'
front_data_corrected
'
,
front_data_corrected
)
front_data_corrected
=
AnalysisDataService
.
addOrReplace
(
'
front_data_corrected
'
,
front_data_corrected
)
front_in_ads
=
AnalysisDataService
.
retrieve
(
'
front_data_corrected
'
)
front_in_ads
=
AnalysisDataService
.
retrieve
(
'
front_data_corrected
'
)
...
@@ -162,6 +161,7 @@ class SANSFitShiftScale(DataProcessorAlgorithm):
...
@@ -162,6 +161,7 @@ class SANSFitShiftScale(DataProcessorAlgorithm):
function
=
'
name=TabulatedFunction, Workspace=
"'
+
str
(
function
=
'
name=TabulatedFunction, Workspace=
"'
+
str
(
front_in_ads
.
name
())
+
'"'
+
"
;name=FlatBackground
"
front_in_ads
.
name
())
+
'"'
+
"
;name=FlatBackground
"
fit
=
self
.
createChildAlgorithm
(
'
Fit
'
)
fit
.
setProperty
(
'
Function
'
,
function
)
fit
.
setProperty
(
'
Function
'
,
function
)
fit
.
setProperty
(
'
InputWorkspace
'
,
rear_data_corrected
)
fit
.
setProperty
(
'
InputWorkspace
'
,
rear_data_corrected
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment