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
75030948
Commit
75030948
authored
9 years ago
by
Peterson, Peter
Browse files
Options
Downloads
Patches
Plain Diff
Fixing minor logging isues
parent
94768652
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+9
-6
9 additions, 6 deletions
Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
with
9 additions
and
6 deletions
Framework/WorkflowAlgorithms/src/AlignAndFocusPowder.cpp
+
9
−
6
View file @
75030948
...
...
@@ -494,11 +494,6 @@ void AlignAndFocusPowder::exec() {
// turn off the low res stuff
m_processLowResTOF
=
false
;
g_log
.
information
()
<<
"running CropWorkspace(MinWavelength="
<<
minwl
;
if
(
!
isEmpty
(
maxwl
))
g_log
.
information
()
<<
", MaxWavelength="
<<
maxwl
;
g_log
.
information
()
<<
")
\n
"
;
EventWorkspace_sptr
ews
=
boost
::
dynamic_pointer_cast
<
EventWorkspace
>
(
m_outputW
);
if
(
ews
)
...
...
@@ -508,6 +503,11 @@ void AlignAndFocusPowder::exec() {
m_outputW
=
convertUnits
(
m_outputW
,
"Wavelength"
);
g_log
.
information
()
<<
"running CropWorkspace(WavelengthMin="
<<
minwl
;
if
(
!
isEmpty
(
maxwl
))
g_log
.
information
()
<<
", WavelengthMax="
<<
maxwl
;
g_log
.
information
()
<<
")
\n
"
;
API
::
IAlgorithm_sptr
removeAlg
=
createChildAlgorithm
(
"CropWorkspace"
);
removeAlg
->
setProperty
(
"InputWorkspace"
,
m_outputW
);
removeAlg
->
setProperty
(
"OutputWorkspace"
,
m_outputW
);
...
...
@@ -515,6 +515,9 @@ void AlignAndFocusPowder::exec() {
removeAlg
->
setProperty
(
"XMax"
,
maxwl
);
removeAlg
->
executeAsChildAlg
();
m_outputW
=
removeAlg
->
getProperty
(
"OutputWorkspace"
);
if
(
ews
)
g_log
.
information
()
<<
"Number of events = "
<<
ews
->
getNumberEvents
()
<<
". "
;
}
else
if
(
DIFCref
>
0.
)
{
g_log
.
information
()
<<
"running RemoveLowResTof(RefDIFC="
<<
DIFCref
<<
",K=3.22)
\n
"
;
...
...
@@ -729,7 +732,7 @@ AlignAndFocusPowder::diffractionFocus(API::MatrixWorkspace_sptr ws) {
API
::
MatrixWorkspace_sptr
AlignAndFocusPowder
::
convertUnits
(
API
::
MatrixWorkspace_sptr
matrixws
,
std
::
string
target
)
{
g_log
.
information
()
<<
"running ConvertUnits(Target=
dSpacing
)
\n
"
;
g_log
.
information
()
<<
"running ConvertUnits(Target=
"
<<
target
<<
"
)
\n
"
;
API
::
IAlgorithm_sptr
convert2Alg
=
createChildAlgorithm
(
"ConvertUnits"
);
convert2Alg
->
setProperty
(
"InputWorkspace"
,
matrixws
);
...
...
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