From ee3e46e4d488af5d0a2eb26247be80a5e5de0d89 Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Wed, 17 Feb 2016 11:29:06 -0500
Subject: [PATCH] Convert to boost::make_shared
---
Framework/API/src/Algorithm.cpp | 2 +-
Framework/API/src/MultipleExperimentInfos.cpp | 2 +-
Framework/DataHandling/src/Load.cpp | 2 +-
Framework/DataHandling/src/LoadCalFile.cpp | 2 +-
Framework/DataHandling/src/LoadCanSAS1D.cpp | 2 +-
Framework/DataHandling/src/LoadNexusProcessed.cpp | 2 +-
Framework/DataHandling/src/LoadVulcanCalFile.cpp | 2 +-
Framework/SINQ/src/InvertMDDim.cpp | 2 +-
Framework/SINQ/src/LoadFlexiNexus.cpp | 2 +-
Framework/SINQ/src/PoldiFitPeaks1D.cpp | 6 +++---
Framework/SINQ/src/PoldiFitPeaks1D2.cpp | 4 ++--
Framework/SINQ/src/PoldiFitPeaks2D.cpp | 6 +++---
Framework/SINQ/src/ProjectMD.cpp | 2 +-
Framework/SINQ/src/SINQHMListener.cpp | 2 +-
Framework/SINQ/src/SINQTranspose3D.cpp | 8 ++++----
Framework/SINQ/src/SliceMDHisto.cpp | 2 +-
16 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Framework/API/src/Algorithm.cpp b/Framework/API/src/Algorithm.cpp
index 9320fc423a4..a4357751884 100644
--- a/Framework/API/src/Algorithm.cpp
+++ b/Framework/API/src/Algorithm.cpp
@@ -1230,7 +1230,7 @@ bool Algorithm::processGroups() {
for (auto &pureOutputWorkspaceProp : m_pureOutputWorkspaceProps) {
Property *prop = dynamic_cast<Property *>(pureOutputWorkspaceProp);
if (prop) {
- WorkspaceGroup_sptr outWSGrp = WorkspaceGroup_sptr(new WorkspaceGroup());
+ auto outWSGrp = boost::make_shared<WorkspaceGroup>();
outGroups.push_back(outWSGrp);
// Put the GROUP in the ADS
AnalysisDataService::Instance().addOrReplace(prop->value(), outWSGrp);
diff --git a/Framework/API/src/MultipleExperimentInfos.cpp b/Framework/API/src/MultipleExperimentInfos.cpp
index 01c60a60f20..011d0365ead 100644
--- a/Framework/API/src/MultipleExperimentInfos.cpp
+++ b/Framework/API/src/MultipleExperimentInfos.cpp
@@ -100,7 +100,7 @@ void MultipleExperimentInfos::copyExperimentInfos(
m_expInfos.reserve(other.m_expInfos.size());
// Do a deep copy of ExperimentInfo's
for (const auto &expInfo : other.m_expInfos) {
- ExperimentInfo_sptr copy(new ExperimentInfo(*expInfo));
+ auto copy(boost::make_shared<ExperimentInfo>(*expInfo));
m_expInfos.push_back(copy);
}
}
diff --git a/Framework/DataHandling/src/Load.cpp b/Framework/DataHandling/src/Load.cpp
index 2ebe08683fb..3d4c2371c81 100644
--- a/Framework/DataHandling/src/Load.cpp
+++ b/Framework/DataHandling/src/Load.cpp
@@ -726,7 +726,7 @@ API::Workspace_sptr Load::plusWs(Workspace_sptr ws1, Workspace_sptr ws2) {
*/
API::WorkspaceGroup_sptr
Load::groupWsList(const std::vector<API::Workspace_sptr> &wsList) {
- WorkspaceGroup_sptr group = WorkspaceGroup_sptr(new WorkspaceGroup);
+ auto group = boost::make_shared<WorkspaceGroup>();
for (const auto &ws : wsList) {
WorkspaceGroup_sptr isGroup =
diff --git a/Framework/DataHandling/src/LoadCalFile.cpp b/Framework/DataHandling/src/LoadCalFile.cpp
index 38793cb2fae..ef43a2b6429 100644
--- a/Framework/DataHandling/src/LoadCalFile.cpp
+++ b/Framework/DataHandling/src/LoadCalFile.cpp
@@ -108,7 +108,7 @@ LoadCalFile::getInstrument3Ways(Algorithm *alg) {
} else {
Algorithm_sptr childAlg =
alg->createChildAlgorithm("LoadInstrument", 0.0, 0.2);
- MatrixWorkspace_sptr tempWS(new Workspace2D());
+ MatrixWorkspace_sptr tempWS = boost::make_shared<Workspace2D>();
childAlg->setProperty<MatrixWorkspace_sptr>("Workspace", tempWS);
childAlg->setPropertyValue("Filename", InstrumentFilename);
childAlg->setPropertyValue("InstrumentName", InstrumentName);
diff --git a/Framework/DataHandling/src/LoadCanSAS1D.cpp b/Framework/DataHandling/src/LoadCanSAS1D.cpp
index 43b1bc6cc33..096c1e96f75 100644
--- a/Framework/DataHandling/src/LoadCanSAS1D.cpp
+++ b/Framework/DataHandling/src/LoadCanSAS1D.cpp
@@ -129,7 +129,7 @@ void LoadCanSAS1D::exec() {
outputWork = WS;
break;
default:
- WorkspaceGroup_sptr group(new WorkspaceGroup);
+ auto group = boost::make_shared<WorkspaceGroup>();
for (unsigned int i = 0; i < numEntries; ++i) {
std::string runName;
MatrixWorkspace_sptr newWork = loadEntry(entryList->item(i), runName);
diff --git a/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Framework/DataHandling/src/LoadNexusProcessed.cpp
index 036d545ce74..becdba1f735 100644
--- a/Framework/DataHandling/src/LoadNexusProcessed.cpp
+++ b/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -436,7 +436,7 @@ void LoadNexusProcessed::exec() {
m_list = !specListProp->isDefault();
// Load all first level entries
- WorkspaceGroup_sptr wksp_group(new WorkspaceGroup);
+ auto wksp_group = boost::make_shared<WorkspaceGroup>();
// This forms the name of the group
std::string base_name = getPropertyValue("OutputWorkspace");
// First member of group should be the group itself, for some reason!
diff --git a/Framework/DataHandling/src/LoadVulcanCalFile.cpp b/Framework/DataHandling/src/LoadVulcanCalFile.cpp
index 4e0b22c9fdd..c75e092a8df 100644
--- a/Framework/DataHandling/src/LoadVulcanCalFile.cpp
+++ b/Framework/DataHandling/src/LoadVulcanCalFile.cpp
@@ -614,7 +614,7 @@ Geometry::Instrument_const_sptr LoadVulcanCalFile::getInstrument() {
Instrument_const_sptr inst;
Algorithm_sptr childAlg = createChildAlgorithm("LoadInstrument", 0.0, 0.2);
- MatrixWorkspace_sptr tempWS(new Workspace2D());
+ MatrixWorkspace_sptr tempWS = boost::make_shared<Workspace2D>();
childAlg->setProperty<MatrixWorkspace_sptr>("Workspace", tempWS);
childAlg->setPropertyValue("InstrumentName", InstrumentName);
childAlg->setProperty("RewriteSpectraMap",
diff --git a/Framework/SINQ/src/InvertMDDim.cpp b/Framework/SINQ/src/InvertMDDim.cpp
index cfb4e6cd467..92809998d50 100644
--- a/Framework/SINQ/src/InvertMDDim.cpp
+++ b/Framework/SINQ/src/InvertMDDim.cpp
@@ -39,7 +39,7 @@ void InvertMDDim::exec() {
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dimi));
}
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
outWS->setTo(.0, .0, .0);
int rank = static_cast<int>(inWS->getNumDims());
diff --git a/Framework/SINQ/src/LoadFlexiNexus.cpp b/Framework/SINQ/src/LoadFlexiNexus.cpp
index d4b2070b948..3ebf97dfeaa 100644
--- a/Framework/SINQ/src/LoadFlexiNexus.cpp
+++ b/Framework/SINQ/src/LoadFlexiNexus.cpp
@@ -207,7 +207,7 @@ void LoadFlexiNexus::loadMD(NeXus::File *fin) {
dimensions.push_back(makeDimension(fin, k, static_cast<int>(inf.dims[k])));
}
- MDHistoWorkspace_sptr ws(new MDHistoWorkspace(dimensions));
+ auto ws = boost::make_shared<MDHistoWorkspace>(dimensions);
signal_t *dd = ws->getSignalArray();
signal_t *ddE = ws->getErrorSquaredArray();
diff --git a/Framework/SINQ/src/PoldiFitPeaks1D.cpp b/Framework/SINQ/src/PoldiFitPeaks1D.cpp
index 4099d7db262..0035175c9cd 100644
--- a/Framework/SINQ/src/PoldiFitPeaks1D.cpp
+++ b/Framework/SINQ/src/PoldiFitPeaks1D.cpp
@@ -84,7 +84,7 @@ void PoldiFitPeaks1D::setPeakFunction(const std::string &peakFunction) {
PoldiPeakCollection_sptr PoldiFitPeaks1D::getInitializedPeakCollection(
const DataObjects::TableWorkspace_sptr &peakTable) const {
- PoldiPeakCollection_sptr peakCollection(new PoldiPeakCollection(peakTable));
+ auto peakCollection = boost::make_shared<PoldiPeakCollection>(peakTable);
peakCollection->setProfileFunctionName(m_profileTemplate);
return peakCollection;
@@ -100,7 +100,7 @@ PoldiFitPeaks1D::getPeakProfile(const PoldiPeak_sptr &poldiPeak) const {
IFunction_sptr clonedBackground = m_backgroundTemplate->clone();
- CompositeFunction_sptr totalProfile(new CompositeFunction);
+ auto totalProfile = boost::make_shared<CompositeFunction>();
totalProfile->initialize();
totalProfile->addFunction(clonedProfile);
totalProfile->addFunction(clonedBackground);
@@ -153,7 +153,7 @@ void PoldiFitPeaks1D::exec() {
Workspace2D_sptr dataWorkspace = getProperty("InputWorkspace");
- WorkspaceGroup_sptr fitPlotGroup(new WorkspaceGroup);
+ auto fitPlotGroup = boost::make_shared<WorkspaceGroup>();
for (size_t i = 0; i < m_peaks->peakCount(); ++i) {
PoldiPeak_sptr currentPeak = m_peaks->peak(i);
diff --git a/Framework/SINQ/src/PoldiFitPeaks1D2.cpp b/Framework/SINQ/src/PoldiFitPeaks1D2.cpp
index 421338f044b..ea733d6e460 100644
--- a/Framework/SINQ/src/PoldiFitPeaks1D2.cpp
+++ b/Framework/SINQ/src/PoldiFitPeaks1D2.cpp
@@ -182,7 +182,7 @@ void PoldiFitPeaks1D2::setPeakFunction(const std::string &peakFunction) {
PoldiPeakCollection_sptr PoldiFitPeaks1D2::getInitializedPeakCollection(
const DataObjects::TableWorkspace_sptr &peakTable) const {
- PoldiPeakCollection_sptr peakCollection(new PoldiPeakCollection(peakTable));
+ auto peakCollection = boost::make_shared<PoldiPeakCollection>(peakTable);
peakCollection->setProfileFunctionName(m_profileTemplate);
return peakCollection;
@@ -227,7 +227,7 @@ std::vector<RefinedRange_sptr> PoldiFitPeaks1D2::getReducedRanges(
API::IFunction_sptr
PoldiFitPeaks1D2::getRangeProfile(const RefinedRange_sptr &range, int n) const {
- CompositeFunction_sptr totalProfile(new CompositeFunction);
+ auto totalProfile = boost::make_shared<CompositeFunction>();
totalProfile->initialize();
std::vector<PoldiPeak_sptr> peaks = range->getPeaks();
diff --git a/Framework/SINQ/src/PoldiFitPeaks2D.cpp b/Framework/SINQ/src/PoldiFitPeaks2D.cpp
index 3e3e77a1c7b..b663b4ab1cb 100644
--- a/Framework/SINQ/src/PoldiFitPeaks2D.cpp
+++ b/Framework/SINQ/src/PoldiFitPeaks2D.cpp
@@ -469,7 +469,7 @@ Poldi2DFunction_sptr PoldiFitPeaks2D::getFunctionFromPeakCollection(
Poldi2DFunction_sptr PoldiFitPeaks2D::getFunctionIndividualPeaks(
std::string profileFunctionName,
const PoldiPeakCollection_sptr &peakCollection) const {
- Poldi2DFunction_sptr mdFunction(new Poldi2DFunction);
+ auto mdFunction = boost::make_shared<Poldi2DFunction>();
for (size_t i = 0; i < peakCollection->peakCount(); ++i) {
PoldiPeak_sptr peak = peakCollection->peak(i);
@@ -522,7 +522,7 @@ Poldi2DFunction_sptr PoldiFitPeaks2D::getFunctionIndividualPeaks(
Poldi2DFunction_sptr PoldiFitPeaks2D::getFunctionPawley(
std::string profileFunctionName,
const PoldiPeakCollection_sptr &peakCollection) {
- Poldi2DFunction_sptr mdFunction(new Poldi2DFunction);
+ auto mdFunction = boost::make_shared<Poldi2DFunction>();
boost::shared_ptr<PoldiSpectrumPawleyFunction> poldiPawleyFunction =
boost::dynamic_pointer_cast<PoldiSpectrumPawleyFunction>(
@@ -979,7 +979,7 @@ IAlgorithm_sptr PoldiFitPeaks2D::calculateSpectrum(
getNormalizedPeakCollections(peakCollections);
// Create a Poldi2DFunction that collects all sub-functions
- Poldi2DFunction_sptr mdFunction(new Poldi2DFunction);
+ auto mdFunction = boost::make_shared<Poldi2DFunction>();
// Add one Poldi2DFunction for each peak collection
for (auto &normalizedPeakCollection : normalizedPeakCollections) {
diff --git a/Framework/SINQ/src/ProjectMD.cpp b/Framework/SINQ/src/ProjectMD.cpp
index a79c1cf0514..f537b965e69 100644
--- a/Framework/SINQ/src/ProjectMD.cpp
+++ b/Framework/SINQ/src/ProjectMD.cpp
@@ -70,7 +70,7 @@ void ProjectMD::exec() {
}
}
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
outWS->setTo(.0, .0, .0);
memset(targetDim, 0, MAXDIM * sizeof(int));
diff --git a/Framework/SINQ/src/SINQHMListener.cpp b/Framework/SINQ/src/SINQHMListener.cpp
index 9235c1354d0..69c2fe886fb 100644
--- a/Framework/SINQ/src/SINQHMListener.cpp
+++ b/Framework/SINQ/src/SINQHMListener.cpp
@@ -106,7 +106,7 @@ boost::shared_ptr<Workspace> SINQHMListener::extractData() {
dimensions.push_back(MDHistoDimension_sptr(new MDHistoDimension(
dimNames[i], dimNames[i], frame, .0, coord_t(dim[i]), dim[i])));
}
- MDHistoWorkspace_sptr ws(new MDHistoWorkspace(dimensions));
+ auto ws = boost::make_shared<MDHistoWorkspace>(dimensions);
ws->setTo(.0, .0, .0);
readHMData(ws);
diff --git a/Framework/SINQ/src/SINQTranspose3D.cpp b/Framework/SINQ/src/SINQTranspose3D.cpp
index dff9c09e112..e48ec358a27 100644
--- a/Framework/SINQ/src/SINQTranspose3D.cpp
+++ b/Framework/SINQ/src/SINQTranspose3D.cpp
@@ -65,7 +65,7 @@ void SINQTranspose3D::doYXZ(IMDHistoWorkspace_sptr inWS) {
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(x));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(z));
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
inVal = inWS->getSignalArray();
inErr = inWS->getErrorSquaredArray();
@@ -102,7 +102,7 @@ void SINQTranspose3D::doXZY(IMDHistoWorkspace_sptr inWS) {
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(z));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(y));
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
inVal = inWS->getSignalArray();
inErr = inWS->getErrorSquaredArray();
@@ -141,7 +141,7 @@ void SINQTranspose3D::doTRICS(IMDHistoWorkspace_sptr inWS) {
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(z));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(y));
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
outWS->setTo(.0, .0, .0);
inVal = inWS->getSignalArray();
@@ -180,7 +180,7 @@ void SINQTranspose3D::doAMOR(IMDHistoWorkspace_sptr inWS) {
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(x));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(z));
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
outWS->setTo(.0, .0, .0);
xdim = static_cast<unsigned int>(x->getNBins());
diff --git a/Framework/SINQ/src/SliceMDHisto.cpp b/Framework/SINQ/src/SliceMDHisto.cpp
index 67b73875256..61413131791 100644
--- a/Framework/SINQ/src/SliceMDHisto.cpp
+++ b/Framework/SINQ/src/SliceMDHisto.cpp
@@ -78,7 +78,7 @@ void SliceMDHisto::exec() {
arDim->getName(), arDim->getName(), arDim->getMDFrame(),
arDim->getX(start[k]), arDim->getX(end[k]), end[k] - start[k])));
}
- MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
+ auto outWS = boost::make_shared<MDHistoWorkspace>(dimensions);
coord_t *sourceDim =
reinterpret_cast<coord_t *>(malloc(m_rank * sizeof(coord_t)));
--
GitLab