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
3a2b69ab
Commit
3a2b69ab
authored
6 years ago
by
Matthew Andrew
Browse files
Options
Downloads
Patches
Plain Diff
Clang format Re #23642
parent
4aa10c8e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Muon/src/MuonPairingAsymmetry.cpp
+5
-4
5 additions, 4 deletions
Framework/Muon/src/MuonPairingAsymmetry.cpp
with
5 additions
and
4 deletions
Framework/Muon/src/MuonPairingAsymmetry.cpp
+
5
−
4
View file @
3a2b69ab
...
@@ -35,7 +35,8 @@ int countPeriods(Workspace_const_sptr ws) {
...
@@ -35,7 +35,8 @@ int countPeriods(Workspace_const_sptr ws) {
}
}
}
}
bool
checkConsistentPeriods
(
Workspace_const_sptr
ws1
,
Workspace_const_sptr
ws2
)
{
bool
checkConsistentPeriods
(
Workspace_const_sptr
ws1
,
Workspace_const_sptr
ws2
)
{
if
(
ws1
->
isGroup
())
{
if
(
ws1
->
isGroup
())
{
if
(
!
ws2
->
isGroup
())
{
if
(
!
ws2
->
isGroup
())
{
return
false
;
return
false
;
...
@@ -258,9 +259,9 @@ void MuonPairingAsymmetry::validateGroupsWorkspaces(
...
@@ -258,9 +259,9 @@ void MuonPairingAsymmetry::validateGroupsWorkspaces(
Workspace_sptr
ws1
=
this
->
getProperty
(
"InputWorkspace1"
);
Workspace_sptr
ws1
=
this
->
getProperty
(
"InputWorkspace1"
);
Workspace_sptr
ws2
=
this
->
getProperty
(
"InputWorkspace2"
);
Workspace_sptr
ws2
=
this
->
getProperty
(
"InputWorkspace2"
);
if
(
ws1
->
isGroup
()
&&
!
ws2
->
isGroup
())
{
if
(
ws1
->
isGroup
()
&&
!
ws2
->
isGroup
())
{
errors
[
"InputWorkspace1"
]
=
errors
[
"InputWorkspace1"
]
=
"InputWorkspace2 should be multi period to match InputWorkspace1"
;
"InputWorkspace2 should be multi period to match InputWorkspace1"
;
}
}
if
(
ws2
->
isGroup
()
&&
!
ws1
->
isGroup
())
{
if
(
ws2
->
isGroup
()
&&
!
ws1
->
isGroup
())
{
errors
[
"InputWorkspace2"
]
=
errors
[
"InputWorkspace2"
]
=
"InputWorkspace1 should be multi period to match InputWorkspace2"
;
"InputWorkspace1 should be multi period to match InputWorkspace2"
;
...
...
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