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
eafa2eab
Commit
eafa2eab
authored
9 years ago
by
Elliot Oram
Browse files
Options
Downloads
Patches
Plain Diff
Reduce the Scope of subIndex in createFunction
Refs #12669
parent
5ab2489e
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+2
-2
2 additions, 2 deletions
...Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
with
2 additions
and
2 deletions
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+
2
−
2
View file @
eafa2eab
...
@@ -514,8 +514,6 @@ CompositeFunction_sptr ConvFit::createFunction(bool tieCentres) {
...
@@ -514,8 +514,6 @@ CompositeFunction_sptr ConvFit::createFunction(bool tieCentres) {
bool
useDeltaFunc
=
m_blnManager
->
value
(
m_properties
[
"UseDeltaFunc"
]);
bool
useDeltaFunc
=
m_blnManager
->
value
(
m_properties
[
"UseDeltaFunc"
]);
size_t
subIndex
=
0
;
if
(
useDeltaFunc
)
{
if
(
useDeltaFunc
)
{
func
=
FunctionFactory
::
Instance
().
createFunction
(
"DeltaFunction"
);
func
=
FunctionFactory
::
Instance
().
createFunction
(
"DeltaFunction"
);
index
=
model
->
addFunction
(
func
);
index
=
model
->
addFunction
(
func
);
...
@@ -542,12 +540,14 @@ CompositeFunction_sptr ConvFit::createFunction(bool tieCentres) {
...
@@ -542,12 +540,14 @@ CompositeFunction_sptr ConvFit::createFunction(bool tieCentres) {
int
fitTypeIndex
=
m_uiForm
.
cbFitType
->
currentIndex
();
int
fitTypeIndex
=
m_uiForm
.
cbFitType
->
currentIndex
();
if
(
fitTypeIndex
>
0
)
{
if
(
fitTypeIndex
>
0
)
{
size_t
subIndex
=
0
;
auto
product
=
boost
::
dynamic_pointer_cast
<
CompositeFunction
>
(
auto
product
=
boost
::
dynamic_pointer_cast
<
CompositeFunction
>
(
FunctionFactory
::
Instance
().
createFunction
(
"ProductFunction"
));
FunctionFactory
::
Instance
().
createFunction
(
"ProductFunction"
));
if
(
useTempCorrection
)
{
if
(
useTempCorrection
)
{
createTemperatureCorrection
(
product
);
createTemperatureCorrection
(
product
);
}
}
// Add 1st Lorentzian
// Add 1st Lorentzian
// if temperature not included then product is lorentzian * 1
// if temperature not included then product is lorentzian * 1
...
...
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