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
939401a7
Commit
939401a7
authored
9 years ago
by
Lynch, Vickie
Browse files
Options
Downloads
Patches
Plain Diff
Refs #14072 apply clang-format patch
parent
c8c9e2b8
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/Crystal/src/OptimizeLatticeForCellType.cpp
+6
-8
6 additions, 8 deletions
Framework/Crystal/src/OptimizeLatticeForCellType.cpp
Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h
+2
-2
2 additions, 2 deletions
Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h
with
8 additions
and
10 deletions
Framework/Crystal/src/OptimizeLatticeForCellType.cpp
+
6
−
8
View file @
939401a7
...
...
@@ -92,7 +92,7 @@ void OptimizeLatticeForCellType::exec() {
runWS
.
push_back
(
ws
);
if
(
perRun
)
{
std
::
vector
<
std
::
pair
<
std
::
string
,
bool
>
>
criteria
;
std
::
vector
<
std
::
pair
<
std
::
string
,
bool
>>
criteria
;
// Sort by run number
criteria
.
push_back
(
std
::
pair
<
std
::
string
,
bool
>
(
"runnumber"
,
true
));
ws
->
sort
(
criteria
);
...
...
@@ -129,8 +129,7 @@ void OptimizeLatticeForCellType::exec() {
IAlgorithm_sptr
fit_alg
;
try
{
fit_alg
=
createChildAlgorithm
(
"Fit"
,
-
1
,
-
1
,
false
);
}
catch
(
Exception
::
NotFoundError
&
)
{
}
catch
(
Exception
::
NotFoundError
&
)
{
g_log
.
error
(
"Can't locate Fit algorithm"
);
throw
;
}
...
...
@@ -153,8 +152,7 @@ void OptimizeLatticeForCellType::exec() {
try
{
ub_alg
=
createChildAlgorithm
(
"FindUBUsingLatticeParameters"
,
-
1
,
-
1
,
false
);
}
catch
(
Exception
::
NotFoundError
&
)
{
}
catch
(
Exception
::
NotFoundError
&
)
{
g_log
.
error
(
"Can't locate FindUBUsingLatticeParameters algorithm"
);
throw
;
}
...
...
@@ -204,9 +202,9 @@ void OptimizeLatticeForCellType::exec() {
runWS
[
i_run
]
->
getName
()
+
".integrate"
);
savePks_alg
->
executeAsChildAlg
();
g_log
.
notice
()
<<
"See output file: "
<<
outputdir
+
"ls"
+
runWS
[
i_run
]
->
getName
()
+
".integrate"
g_log
.
notice
()
<<
"See output file: "
<<
outputdir
+
"ls"
+
runWS
[
i_run
]
->
getName
()
+
".integrate"
<<
"
\n
"
;
// Save UB
Mantid
::
API
::
IAlgorithm_sptr
saveUB_alg
=
...
...
This diff is collapsed.
Click to expand it.
Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h
+
2
−
2
View file @
939401a7
...
...
@@ -68,8 +68,8 @@ public:
// Check that the UB matrix is the same as in TOPAZ_3007.mat
OrientedLattice
latt
=
ws
->
mutableSample
().
getOrientedLattice
();
double
correct_UB
[]
=
{
0.0454
,
0.0406
,
0.0122
,
-
0.0014
,
-
0.0031
,
-
0.1165
,
-
0.0574
,
0.0322
,
-
0.0273
};
double
correct_UB
[]
=
{
0.0454
,
0.0406
,
0.0122
,
-
0.0014
,
-
0.0031
,
-
0.1165
,
-
0.0574
,
0.0322
,
-
0.0273
};
std
::
vector
<
double
>
UB_calculated
=
latt
.
getUB
().
getVector
();
...
...
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