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
d061710a
Commit
d061710a
authored
5 years ago
by
Alice Russell
Browse files
Options
Downloads
Patches
Plain Diff
Re #28153 Change how Bk2BkExpConvPV gets the width
parent
80acf94a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
+5
-3
5 additions, 3 deletions
Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
docs/source/release/v5.0.0/mantidworkbench.rst
+1
-0
1 addition, 0 deletions
docs/source/release/v5.0.0/mantidworkbench.rst
with
6 additions
and
3 deletions
Framework/CurveFitting/src/Functions/Bk2BkExpConvPV.cpp
+
5
−
3
View file @
d061710a
...
@@ -69,11 +69,13 @@ double Bk2BkExpConvPV::fwhm() const {
...
@@ -69,11 +69,13 @@ double Bk2BkExpConvPV::fwhm() const {
}
}
/** Set FWHM
/** Set FWHM
* It is an illegal operation of this type of peak
* This cannot be set directly so we assume Gamma is 0 and set Sigma by doing
* the reverse of calHandEta
*/
*/
void
Bk2BkExpConvPV
::
setFwhm
(
const
double
w
)
{
void
Bk2BkExpConvPV
::
setFwhm
(
const
double
w
)
{
UNUSED_ARG
(
w
);
this
->
setParameter
(
"Gamma"
,
0
);
throw
std
::
invalid_argument
(
"Bk2BkExpConvPV is not allowed to set FWHM."
);
auto
sigma2
=
std
::
pow
(
w
,
2
)
/
(
8.0
*
M_LN2
);
this
->
setParameter
(
"Sigma2"
,
sigma2
);
}
}
/** Set peak center
/** Set peak center
...
...
This diff is collapsed.
Click to expand it.
docs/source/release/v5.0.0/mantidworkbench.rst
+
1
−
0
View file @
d061710a
...
@@ -105,6 +105,7 @@ Bugfixes
...
@@ -105,6 +105,7 @@ Bugfixes
- The help button in fitting now finds the relevant page.
- The help button in fitting now finds the relevant page.
- Fixed an issue with changing normalisation on single spectra plots done from a script
- Fixed an issue with changing normalisation on single spectra plots done from a script
- Fixed an issue where fitting a distribution workspace was normalised twice.
- Fixed an issue where fitting a distribution workspace was normalised twice.
- Fixed an issue where adding a Bk2BkExpConvPV function to the fit browser caused a crash
- Overplots will be normalized by bin width if they are overplotting a curve from a workspace which is a distribution.
- Overplots will be normalized by bin width if they are overplotting a curve from a workspace which is a distribution.
- Several bugs in the way Python scripts were parsed and executed, including blank lines after a colon and tabs in strings, have been fixed.
- Several bugs in the way Python scripts were parsed and executed, including blank lines after a colon and tabs in strings, have been fixed.
- Axes limits of a plot no longer automatically rescale when errorbars are on/off
- Axes limits of a plot no longer automatically rescale when errorbars are on/off
...
...
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