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
10b0d1b6
Commit
10b0d1b6
authored
Jun 17, 2014
by
Russell Taylor
Browse files
Re #7778. Remove unneeded use of the AnalysisDataService.
parent
731948d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Code/Mantid/Framework/DataHandling/src/AppendGeometryToSNSNexus.cpp
View file @
10b0d1b6
...
...
@@ -136,16 +136,6 @@ namespace DataHandling
m_idf_filename
=
ExperimentInfo
::
getInstrumentFilename
(
m_instrument
);
g_log
.
debug
()
<<
"Loading instrument definition from "
<<
m_idf_filename
<<
"."
<<
std
::
endl
;
// Let's load the empty instrument
//IAlgorithm_sptr alg = AlgorithmFactory::Instance().create("LoadEmptyInstrument", 1);
//alg->initialize();
//alg->setPropertyValue("Filename", m_idf_filename);
//alg->setPropertyValue("OutputWorkspace", workspaceName);
//alg->execute();
//MatrixWorkspace_sptr ws;
//ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(workspaceName);
// Modified to call LoadInstrument directly as a Child Algorithm
ws
=
WorkspaceFactory
::
Instance
().
create
(
"Workspace2D"
,
1
,
2
,
1
);
...
...
@@ -321,10 +311,6 @@ namespace DataHandling
}
}
// Clean up the workspace
//AnalysisDataService::Instance().remove(workspaceName);
}
...
...
Code/Mantid/Framework/DataHandling/src/FilterEventsByLogValuePreNexus.cpp
View file @
10b0d1b6
...
...
@@ -407,7 +407,6 @@ namespace DataHandling
{
declareProperty
(
new
WorkspaceProperty
<
IEventWorkspace
>
(
"OutputFilteredWorkspace"
,
"WS_A"
,
Direction
::
Output
),
""
);
setProperty
<
IEventWorkspace_sptr
>
(
"OutputFilteredWorkspace"
,
localWorkspaceBA
);
// AnalysisDataService::Instance().addOrReplace("WS_BA", localWorkspaceBA);
}
// Add fast frequency sample environment (events) data to workspace's log
...
...
Code/Mantid/Framework/DataHandling/src/LoadIsawDetCal.cpp
View file @
10b0d1b6
...
...
@@ -58,12 +58,8 @@ namespace DataHandling
void
LoadIsawDetCal
::
center
(
double
x
,
double
y
,
double
z
,
std
::
string
detname
,
std
::
string
inname
)
{
MatrixWorkspace_sptr
inputW
=
boost
::
dynamic_pointer_cast
<
MatrixWorkspace
>
(
AnalysisDataService
::
Instance
().
retrieve
(
inname
));
IAlgorithm_sptr
alg1
=
createChildAlgorithm
(
"MoveInstrumentComponent"
);
alg1
->
setProperty
<
MatrixWorkspace_sptr
>
(
"Workspace"
,
in
putW
);
alg1
->
setProperty
(
"Workspace"
,
in
name
);
alg1
->
setPropertyValue
(
"ComponentName"
,
detname
);
alg1
->
setProperty
(
"X"
,
x
);
alg1
->
setProperty
(
"Y"
,
y
);
...
...
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