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
62c5529e
Commit
62c5529e
authored
6 years ago
by
Anthony Lim
Browse files
Options
Downloads
Patches
Plain Diff
refs #23166 Muon results table incudes log values with value of 0
parent
c27545d9
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
docs/source/release/v3.14.0/muon.rst
+23
-0
23 additions, 0 deletions
docs/source/release/v3.14.0/muon.rst
qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
+5
-6
5 additions, 6 deletions
qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
with
28 additions
and
6 deletions
docs/source/release/v3.14.0/muon.rst
+
23
−
0
View file @
62c5529e
...
...
@@ -9,4 +9,27 @@ MuSR Changes
putting new features at the top of the section, followed by
improvements, followed by bug fixes.
Interface
---------
Improvements
############
Bugfixes
########
- Results table now includes all logs that are common to all of the loaded files.
Algorithms
----------
New
###
Improvements
############
Bugfixes
########
:ref:`Release 3.14.0 <v3.14.0>`
This diff is collapsed.
Click to expand it.
qt/scientific_interfaces/Muon/MuonAnalysisResultTableTab.cpp
+
5
−
6
View file @
62c5529e
...
...
@@ -530,21 +530,20 @@ void MuonAnalysisResultTableTab::populateLogsAndValues(
// Check if is a timeseries log
if
(
TimeSeriesProperty
<
double
>
*
log
=
dynamic_cast
<
TimeSeriesProperty
<
double
>
*>
(
prop
))
{
QString
logName
=
QString
::
fromStdString
(
prop
->
name
());
std
::
string
fdsadf
=
logName
.
toStdString
();
auto
mylog
=
log
->
clone
();
if
(
foundRunning
)
{
mylog
->
filterWith
(
runningLog
);
}
QString
logFile
(
QFileInfo
(
prop
->
name
().
c_str
()).
fileName
());
auto
time_ave
=
mylog
->
timeAverageValue
();
// get the time average
if
(
time_ave
!=
0
)
{
// Return average
wsLogValues
[
logFile
]
=
time_ave
;
}
// Return average
wsLogValues
[
logFile
]
=
time_ave
;
}
else
// Should be a non-timeseries one
{
QString
logName
=
QString
::
fromStdString
(
prop
->
name
());
std
::
string
fdsadf
=
logName
.
toStdString
();
// Check if we should display it
if
(
NON_TIMESERIES_LOGS
.
contains
(
logName
))
{
...
...
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