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
b990e576
Commit
b990e576
authored
9 years ago
by
Alex Buts
Browse files
Options
Downloads
Patches
Plain Diff
Re #13566 Pedantic GCC warning and typo in doctest
parent
675ad478
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/Algorithms/src/GetAllEi.cpp
+7
-7
7 additions, 7 deletions
Framework/Algorithms/src/GetAllEi.cpp
docs/source/algorithms/GetAllEi-v1.rst
+2
-2
2 additions, 2 deletions
docs/source/algorithms/GetAllEi-v1.rst
with
9 additions
and
9 deletions
Framework/Algorithms/src/GetAllEi.cpp
+
7
−
7
View file @
b990e576
...
...
@@ -147,7 +147,7 @@ void removeInvalidValues(const std::vector<bool> &guessValid,
}
}
new_guess
.
swap
(
guess
);
}
;
}
/**Internal class to contain peak information */
struct
peakKeeper
{
double
position
;
...
...
@@ -569,7 +569,7 @@ bool GetAllEi::peakGuess(const API::MatrixWorkspace_sptr &inputWS, size_t index,
peakPos
=
realPeakPos
;
return
true
;
}
;
}
/**Get energy of monitor peak if one is present
*@param inputWS -- the workspace to process
...
...
@@ -653,7 +653,7 @@ bool signChanged(double val, int &prevSign) {
bool
changed
=
curSign
!=
prevSign
;
prevSign
=
curSign
;
return
changed
;
}
;
}
}
/**Bare-bone function to calculate numerical derivative, and estimate number of
...
...
@@ -728,7 +728,7 @@ void getBinRange(const MantidVec &eBins, double eMin, double eMax,
if
(
index_max
>=
nBins
)
index_max
=
nBins
-
1
;
// last bin range anyway. Should not happen
}
}
;
}
// refine bin range. May need better procedure for this.
bool
refineEGuess
(
const
MantidVec
&
eBins
,
const
MantidVec
&
signal
,
...
...
@@ -749,7 +749,7 @@ bool refineEGuess(const MantidVec &eBins, const MantidVec &signal,
}
eGuess
=
0.5
*
(
eBins
[
ind_Emax
]
+
eBins
[
ind_Emax
+
1
]);
return
true
;
}
;
}
struct
peakKeeper2
{
double
left_rng
;
...
...
@@ -1035,7 +1035,7 @@ bool SelectInterval(const Kernel::DateAndTime &t_beg,
}
endTime
=
t_end
;
return
false
;
}
;
}
}
/**Analyze chopper logs and identify chopper speed and delay
@param inputWS -- sp to workspace with attached logs.
...
...
@@ -1184,7 +1184,7 @@ bool check_time_series_property(
return
true
;
}
return
false
;
}
;
}
}
/**Validates if input workspace contains all necessary logs and if all
...
...
This diff is collapsed.
Click to expand it.
docs/source/algorithms/GetAllEi-v1.rst
+
2
−
2
View file @
b990e576
...
...
@@ -79,7 +79,7 @@ to convert units from TOF to energy.
print "! {0: >6.1f} ! {1: >6.2f} ! {2: >6.2f} ! {3: >6.2f} !".format(allEi[ind],val[1],peakHeight[ind],peakWidth[ind])
#
# NOTE: incident energy of GetEi is calculated from distance between monitor 1 and 2, and this distance is not correct in
# the test workspace. The
important
pint is that getEi can find energies from guess values and TOF for peaks is correct.
# the test workspace. The
tested
p
o
int is that getEi can find energies from guess values and TOF for peaks is correct.
Output:
...
...
@@ -88,7 +88,7 @@ Output:
! Guess Ei ! peak TOF ! peak height ! peak width !
! 67.0 ! 4188.03 ! 34.68 ! 2.35 !
! 124.
0
! 3079.09 ! 14.01 ! 4.35 !
! 124.
1
! 3079.09 ! 14.01 ! 4.35 !
.. categories::
...
...
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