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
0291175a
Commit
0291175a
authored
Feb 03, 2016
by
Hahn, Steven
Browse files
clang-format.
parent
7d98ff91
Changes
6
Hide whitespace changes
Inline
Side-by-side
Framework/Algorithms/src/FitPeak.cpp
View file @
0291175a
...
...
@@ -1130,8 +1130,7 @@ void FitPeak::init() {
new
ArrayProperty
<
double
>
(
"FittedPeakParameterValues"
,
Direction
::
Output
),
"Fitted peak parameter values. "
);
vector
<
string
>
bkgdtypes
{
"Flat"
,
"Flat (A0)"
,
"Linear"
,
"Linear (A0, A1)"
,
vector
<
string
>
bkgdtypes
{
"Flat"
,
"Flat (A0)"
,
"Linear"
,
"Linear (A0, A1)"
,
"Quadratic"
,
"Quadratic (A0, A1, A2)"
};
declareProperty
(
"BackgroundType"
,
"Linear"
,
boost
::
make_shared
<
StringListValidator
>
(
bkgdtypes
),
...
...
Framework/Algorithms/test/SpatialGroupingTest.h
View file @
0291175a
...
...
@@ -78,18 +78,17 @@ public:
TS_ASSERT
(
input
.
is_open
());
// Testing file
std
::
vector
<
std
::
string
>
expected
{
"<?xml version=
\"
1.0
\"
encoding=
\"
UTF-8
\"
"
"?>"
,
"<!-- XML Grouping File created by "
"SpatialGrouping Algorithm -->"
,
"<detector-grouping>"
,
"<group name=
\"
group1
\"
><detids "
"val=
\"
1,2,3,4,5,6,7,8,9
\"
/></group>"
,
"<group name=
\"
group2
\"
><detids "
"val=
\"
10,11,12,13,14,15,16,17,18
\"
/></"
"group>"
,
"</detector-grouping>"
};
std
::
vector
<
std
::
string
>
expected
{
"<?xml version=
\"
1.0
\"
encoding=
\"
UTF-8
\"
"
"?>"
,
"<!-- XML Grouping File created by "
"SpatialGrouping Algorithm -->"
,
"<detector-grouping>"
,
"<group name=
\"
group1
\"
><detids "
"val=
\"
1,2,3,4,5,6,7,8,9
\"
/></group>"
,
"<group name=
\"
group2
\"
><detids "
"val=
\"
10,11,12,13,14,15,16,17,18
\"
/></"
"group>"
,
"</detector-grouping>"
};
std
::
vector
<
std
::
string
>::
iterator
iter
=
expected
.
begin
();
...
...
Framework/DataHandling/src/SaveCanSAS1D.cpp
View file @
0291175a
...
...
@@ -43,17 +43,11 @@ void SaveCanSAS1D::init() {
new
API
::
FileProperty
(
"Filename"
,
""
,
API
::
FileProperty
::
Save
,
".xml"
),
"The name of the xml file to save"
);
std
::
vector
<
std
::
string
>
radiation_source
{
"Spallation Neutron Source"
,
"Pulsed Reactor Neutron Source"
,
"Reactor Neutron Source"
,
"Synchrotron X-ray Source"
,
"Pulsed Muon Source"
,
"Rotating Anode X-ray"
,
"Fixed Tube X-ray"
,
"neutron"
,
"x-ray"
,
"muon"
,
"electron"
};
std
::
vector
<
std
::
string
>
radiation_source
{
"Spallation Neutron Source"
,
"Pulsed Reactor Neutron Source"
,
"Reactor Neutron Source"
,
"Synchrotron X-ray Source"
,
"Pulsed Muon Source"
,
"Rotating Anode X-ray"
,
"Fixed Tube X-ray"
,
"neutron"
,
"x-ray"
,
"muon"
,
"electron"
};
declareProperty
(
"RadiationSource"
,
"Spallation Neutron Source"
,
boost
::
make_shared
<
Kernel
::
StringListValidator
>
(
radiation_source
),
...
...
Framework/Geometry/test/CompositeBraggScattererTest.h
View file @
0291175a
...
...
@@ -176,24 +176,60 @@ private:
}
std
::
map
<
V3D
,
double
>
getCalculatedStructureFactors
()
{
return
{{{
2
,
0
,
0
},
167.84
},
{{
3
,
0
,
0
},
153.50
},
{{
4
,
0
,
0
},
19.76
},
{{
5
,
0
,
0
},
176.21
},
{{
1
,
1
,
0
},
2.44
},
{{
2
,
1
,
0
},
15.83
},
{{
3
,
1
,
0
},
14.48
},
{{
4
,
1
,
0
},
1.86
},
{{
5
,
1
,
0
},
16.62
},
{{
2
,
2
,
0
},
104.66
},
{{
3
,
2
,
0
},
95.72
},
{{
4
,
2
,
0
},
12.32
},
{{
5
,
2
,
0
},
109.88
},
{{
3
,
3
,
0
},
90.10
},
{{
4
,
3
,
0
},
11.60
},
{{
5
,
3
,
0
},
103.43
},
{{
4
,
4
,
0
},
1.55
},
{{
5
,
4
,
0
},
13.86
},
{{
5
,
5
,
0
},
130.22
},
{{
1
,
1
,
1
},
16.45
},
{{
2
,
1
,
1
},
2.26
},
{{
3
,
1
,
1
},
21.53
},
{{
4
,
1
,
1
},
1.80
},
{{
5
,
1
,
1
},
10.47
},
{{
2
,
2
,
1
},
14.95
},
{{
3
,
2
,
1
},
142.33
},
{{
4
,
2
,
1
},
11.92
},
{{
5
,
2
,
1
},
69.17
},
{{
3
,
3
,
1
},
133.97
},
{{
4
,
3
,
1
},
11.22
},
{{
5
,
3
,
1
},
65.11
},
{{
4
,
4
,
1
},
1.50
},
{{
5
,
4
,
1
},
8.73
},
{{
5
,
5
,
1
},
81.98
},
{{
2
,
2
,
2
},
14.36
},
{{
3
,
2
,
2
},
88.94
},
{{
4
,
2
,
2
},
77.57
},
{{
5
,
2
,
2
},
9.52
},
{{
3
,
3
,
2
},
83.72
},
{{
4
,
3
,
2
},
73.02
},
{{
5
,
3
,
2
},
8.96
},
{{
4
,
4
,
2
},
9.79
},
{{
5
,
4
,
2
},
1.20
},
{{
5
,
5
,
2
},
11.29
},
{{
3
,
3
,
3
},
11.44
},
{{
4
,
3
,
3
},
103.89
},
{{
5
,
3
,
3
},
8.30
},
{{
4
,
4
,
3
},
13.93
},
{{
5
,
4
,
3
},
1.11
},
{{
5
,
5
,
3
},
10.45
},
{{
4
,
4
,
4
},
8.33
},
{{
5
,
4
,
4
},
6.93
},
{{
5
,
5
,
4
},
65.05
},
{{
5
,
5
,
5
},
88.57
}};
return
{{{
2
,
0
,
0
},
167.84
},
{{
3
,
0
,
0
},
153.50
},
{{
4
,
0
,
0
},
19.76
},
{{
5
,
0
,
0
},
176.21
},
{{
1
,
1
,
0
},
2.44
},
{{
2
,
1
,
0
},
15.83
},
{{
3
,
1
,
0
},
14.48
},
{{
4
,
1
,
0
},
1.86
},
{{
5
,
1
,
0
},
16.62
},
{{
2
,
2
,
0
},
104.66
},
{{
3
,
2
,
0
},
95.72
},
{{
4
,
2
,
0
},
12.32
},
{{
5
,
2
,
0
},
109.88
},
{{
3
,
3
,
0
},
90.10
},
{{
4
,
3
,
0
},
11.60
},
{{
5
,
3
,
0
},
103.43
},
{{
4
,
4
,
0
},
1.55
},
{{
5
,
4
,
0
},
13.86
},
{{
5
,
5
,
0
},
130.22
},
{{
1
,
1
,
1
},
16.45
},
{{
2
,
1
,
1
},
2.26
},
{{
3
,
1
,
1
},
21.53
},
{{
4
,
1
,
1
},
1.80
},
{{
5
,
1
,
1
},
10.47
},
{{
2
,
2
,
1
},
14.95
},
{{
3
,
2
,
1
},
142.33
},
{{
4
,
2
,
1
},
11.92
},
{{
5
,
2
,
1
},
69.17
},
{{
3
,
3
,
1
},
133.97
},
{{
4
,
3
,
1
},
11.22
},
{{
5
,
3
,
1
},
65.11
},
{{
4
,
4
,
1
},
1.50
},
{{
5
,
4
,
1
},
8.73
},
{{
5
,
5
,
1
},
81.98
},
{{
2
,
2
,
2
},
14.36
},
{{
3
,
2
,
2
},
88.94
},
{{
4
,
2
,
2
},
77.57
},
{{
5
,
2
,
2
},
9.52
},
{{
3
,
3
,
2
},
83.72
},
{{
4
,
3
,
2
},
73.02
},
{{
5
,
3
,
2
},
8.96
},
{{
4
,
4
,
2
},
9.79
},
{{
5
,
4
,
2
},
1.20
},
{{
5
,
5
,
2
},
11.29
},
{{
3
,
3
,
3
},
11.44
},
{{
4
,
3
,
3
},
103.89
},
{{
5
,
3
,
3
},
8.30
},
{{
4
,
4
,
3
},
13.93
},
{{
5
,
4
,
3
},
1.11
},
{{
5
,
5
,
3
},
10.45
},
{{
4
,
4
,
4
},
8.33
},
{{
5
,
4
,
4
},
6.93
},
{{
5
,
5
,
4
},
65.05
},
{{
5
,
5
,
5
},
88.57
}};
}
};
...
...
Framework/Geometry/test/IndexingUtilsTest.h
View file @
0291175a
...
...
@@ -16,13 +16,18 @@ using Mantid::Kernel::Matrix;
class
IndexingUtilsTest
:
public
CxxTest
::
TestSuite
{
public:
static
std
::
vector
<
V3D
>
getNatroliteQs
()
{
std
::
vector
<
V3D
>
q_vectors
{
{
-
0.57582
,
-
0.35322
,
-
0.19974
},
{
-
1.41754
,
-
0.78704
,
-
0.75974
},
{
-
1.12030
,
-
0.53578
,
-
0.27559
},
{
-
0.68911
,
-
0.59397
,
-
0.12716
},
{
-
1.06863
,
-
0.43255
,
0.01688
},
{
-
1.82007
,
-
0.49671
,
-
0.06266
},
{
-
1.10465
,
-
0.73708
,
-
0.01939
},
{
-
0.12747
,
-
0.32380
,
0.00821
},
{
-
0.84210
,
-
0.37038
,
0.15403
},
{
-
0.54099
,
-
0.46900
,
0.11535
},
{
-
0.90478
,
-
0.50667
,
0.51072
},
{
-
0.50387
,
-
0.58561
,
0.43502
}};
std
::
vector
<
V3D
>
q_vectors
{{
-
0.57582
,
-
0.35322
,
-
0.19974
},
{
-
1.41754
,
-
0.78704
,
-
0.75974
},
{
-
1.12030
,
-
0.53578
,
-
0.27559
},
{
-
0.68911
,
-
0.59397
,
-
0.12716
},
{
-
1.06863
,
-
0.43255
,
0.01688
},
{
-
1.82007
,
-
0.49671
,
-
0.06266
},
{
-
1.10465
,
-
0.73708
,
-
0.01939
},
{
-
0.12747
,
-
0.32380
,
0.00821
},
{
-
0.84210
,
-
0.37038
,
0.15403
},
{
-
0.54099
,
-
0.46900
,
0.11535
},
{
-
0.90478
,
-
0.50667
,
0.51072
},
{
-
0.50387
,
-
0.58561
,
0.43502
}};
// Dec 2011: Change convention for Q = 2 pi / wavelength
for
(
size_t
i
=
0
;
i
<
q_vectors
.
size
();
i
++
)
q_vectors
[
i
]
*=
(
2.0
*
M_PI
);
...
...
@@ -30,10 +35,18 @@ public:
}
static
std
::
vector
<
V3D
>
getNatroliteIndices
()
{
std
::
vector
<
V3D
>
correct_indices
{{
1
,
9
,
-
9
},
{
4
,
20
,
-
24
},
{
2
,
18
,
-
14
},
{
0
,
12
,
-
12
},
{
1
,
19
,
-
9
},
{
3
,
31
,
-
13
},
{
0
,
20
,
-
14
},
{
-
1
,
3
,
-
5
},
{
0
,
16
,
-
6
},
{
-
1
,
11
,
-
7
},
{
-
2
,
20
,
-
4
},
{
-
3
,
13
,
-
5
}};
std
::
vector
<
V3D
>
correct_indices
{{
1
,
9
,
-
9
},
{
4
,
20
,
-
24
},
{
2
,
18
,
-
14
},
{
0
,
12
,
-
12
},
{
1
,
19
,
-
9
},
{
3
,
31
,
-
13
},
{
0
,
20
,
-
14
},
{
-
1
,
3
,
-
5
},
{
0
,
16
,
-
6
},
{
-
1
,
11
,
-
7
},
{
-
2
,
20
,
-
4
},
{
-
3
,
13
,
-
5
}};
return
correct_indices
;
}
...
...
Framework/Geometry/test/ObjectTest.h
View file @
0291175a
...
...
@@ -586,8 +586,7 @@ public:
// for defining non-AA objects. However, BoundingBox is poor for non-AA and
// needs improvement if these are
// common
planes
=
{
"p 1 0 0 -0.5"
,
"p 1 0 0 0.5"
,
planes
=
{
"p 1 0 0 -0.5"
,
"p 1 0 0 0.5"
,
"p 0 .70710678118 .70710678118 -1.1"
,
"p 0 .70710678118 .70710678118 -0.1"
,
"p 0 -.70710678118 .70710678118 -0.5"
,
...
...
@@ -602,8 +601,7 @@ public:
// case. Framework has now been updated to support this automatically.
// Object is unit cube located at +-0.5 in x but centred on z=y=-1.606.. and
// rotated 45deg to these two axes
planes
=
{
"p 1 0 0 -0.5"
,
"p 1 0 0 0.5"
,
planes
=
{
"p 1 0 0 -0.5"
,
"p 1 0 0 0.5"
,
"p 0 .70710678118 .70710678118 -2"
,
"p 0 .70710678118 .70710678118 -1"
,
"p 0 -.70710678118 .70710678118 -0.5"
,
...
...
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