Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
53f50166
Unverified
Commit
53f50166
authored
Sep 08, 2021
by
Gemma Guest
Committed by
GitHub
Sep 08, 2021
Browse files
Merge pull request #32410 from mantidproject/fix_cppcheck_threshold
Fix cppcheck threshold
parents
cb9e7cba
10b3e087
Changes
3
Hide whitespace changes
Inline
Side-by-side
Framework/Algorithms/src/GetEi2.cpp
View file @
53f50166
...
...
@@ -267,7 +267,7 @@ double GetEi2::calculateEi(const double initial_guess) {
* passed
* @param ws_index :: The workspace index of the detector
* @param spectrumInfo :: A spectrum info object for the input workspace
* @return The distance between the source and the given detector(or
* @return The distance between the source and the given detector
(or
* DetectorGroup)
* @throw runtime_error if there is a problem
*/
...
...
Framework/DataHandling/src/LoadRaw3.cpp
View file @
53f50166
...
...
@@ -394,12 +394,12 @@ void LoadRaw3::separateMonitors(FILE *file, const int64_t &period, const std::ve
if
(
!
readData
(
file
,
histToRead
))
{
throw
std
::
runtime_error
(
"Error reading raw file"
);
}
// if this a monitor
store that spectrum to monitor workspace
// if this a monitor
,
store that spectrum to monitor workspace
if
(
isMonitor
(
monitorList
,
i
))
{
setWorkspaceData
(
mws_sptr
,
m_timeChannelsVec
,
mwsIndex
,
i
,
m_noTimeRegimes
,
m_lengthIn
,
1
);
++
mwsIndex
;
}
else
{
// not a monitor,store the spectrum to normal output workspace
// not a monitor,
store the spectrum to normal output workspace
setWorkspaceData
(
ws_sptr
,
m_timeChannelsVec
,
wsIndex
,
i
,
m_noTimeRegimes
,
m_lengthIn
,
1
);
++
wsIndex
;
}
...
...
buildconfig/Jenkins/cppcheck.sh
View file @
53f50166
...
...
@@ -4,7 +4,7 @@ SCRIPT_DIR=$(dirname "$0")
# If errors slip through to master this can be used to set a non-zero
# allowed count while those errors are dealt with. This avoids breaking all
# builds for all developers
ALLOWED_ERRORS_COUNT
=
120
3
ALLOWED_ERRORS_COUNT
=
120
4
if
[[
${
JOB_NAME
}
==
*
pull_requests
*
]]
;
then
# This relies on the fact pull requests use pull/$PR-NAME
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment