Skip to content

Commit

Permalink
C++11 syntax fixes for MDAlgorithms. refs #6592
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartcampbell committed Feb 19, 2013
1 parent 308c3c8 commit 2d8b0cb
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace MDAlgorithms
std::map<int, Geometry::RectangularDetector_const_sptr> getBanks();

template <class T, class MDE, size_t nd>
void convertEventList(boost::shared_ptr<Mantid::MDEvents::MDEventWorkspace<MDE, nd>> outWS,
void convertEventList(boost::shared_ptr<Mantid::MDEvents::MDEventWorkspace<MDE, nd> > outWS,
size_t workspaceIndex, coord_t x, coord_t y, coord_t bankNum,
uint16_t runIndex, int32_t detectorID);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ namespace Mantid
/// The generated value of the in-place mosaic (eta_3)
mutable std::vector<double> m_etaOutPlane;
/// A pre-sized vector for the QE position to be evaluated
mutable std::vector<std::vector<double>> m_deltaQE;
mutable std::vector<std::vector<double> > m_deltaQE;

/// Cache of experiment info caches
std::map<std::pair<int, detid_t>, CachedExperimentInfo*> m_exptCache;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace Mantid
API::IMDEventWorkspace_const_sptr m_inputWS;

/// Output events. Need to find a better way to handle other dimensions
mutable std::list<MDEvents::MDEvent<4>> m_simulatedEvents;
mutable std::list<MDEvents::MDEvent<4> > m_simulatedEvents;

/// A reference to the logger
static Kernel::Logger & g_log;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ namespace MDAlgorithms
* @param detectorID : detectorID for this event list
*/
template <class T, class MDE, size_t nd>
void ConvertToDetectorFaceMD::convertEventList(boost::shared_ptr<Mantid::MDEvents::MDEventWorkspace<MDE, nd>> outWS,
void ConvertToDetectorFaceMD::convertEventList(boost::shared_ptr<Mantid::MDEvents::MDEventWorkspace<MDE, nd> > outWS,
size_t workspaceIndex, coord_t x, coord_t y, coord_t bankNum,
uint16_t runIndex, int32_t detectorID)
{
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/Framework/MDAlgorithms/src/MaskMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ namespace MDAlgorithms
{
declareProperty(new PropertyWithValue<bool>("ClearExistingMasks", "1", Direction::Input), "Clears any existing masks before applying the provided masking.");
declareProperty(new WorkspaceProperty<IMDWorkspace>("Workspace","",Direction::InOut), "An input/output workspace.");
declareProperty(new ArrayProperty<std::string>("Dimensions",boost::make_shared<MandatoryValidator<std::vector<std::string>>>(),Direction::Input),
declareProperty(new ArrayProperty<std::string>("Dimensions",boost::make_shared<MandatoryValidator<std::vector<std::string> > >(),Direction::Input),
"Dimension ids/names all comma separated.\n"
"According to the dimensionality of the workspace, these names will be grouped,\n"
"so the number of entries must be n*(number of dimensions in the workspace)."
);

declareProperty(new ArrayProperty<double>("Extents",boost::make_shared<MandatoryValidator<std::vector<double>>>(),Direction::Input),
declareProperty(new ArrayProperty<double>("Extents",boost::make_shared<MandatoryValidator<std::vector<double> > >(),Direction::Input),
"Extents {min, max} corresponding to each of the dimensions specified, according to the order those identifies have been specified." );
}

Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/MDAlgorithms/src/MergeMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ namespace MDAlgorithms
{
// declare arbitrary number of input m_workspaces as a list of strings at the moment
declareProperty(
new ArrayProperty<std::string>("InputWorkspaces", boost::make_shared<MandatoryValidator<std::vector<std::string>>>()),
new ArrayProperty<std::string>("InputWorkspaces", boost::make_shared<MandatoryValidator<std::vector<std::string> > >()),
"The names of the input MDWorkspaces as a comma-separated list" );

declareProperty(new WorkspaceProperty<IMDEventWorkspace>("OutputWorkspace","",Direction::Output),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@ namespace Mantid
"The name of the TableWorkspace in which to store the final covariance matrix" );

std::vector<std::string> models = MDResolutionConvolutionFactory::Instance().getKeys();
declareProperty(RESOLUTION_NAME, "", boost::make_shared<ListValidator<std::string>>(models),
declareProperty(RESOLUTION_NAME, "", boost::make_shared<ListValidator<std::string> >(models),
"The name of a resolution model", Direction::Input);

models = ForegroundModelFactory::Instance().getKeys();
declareProperty(FOREGROUND_NAME, "", boost::make_shared<ListValidator<std::string>>(models),
declareProperty(FOREGROUND_NAME, "", boost::make_shared<ListValidator<std::string> >(models),
"The name of a foreground function", Direction::Input);

declareProperty(MAX_ITER_NAME, 20, "The maximum number of iterations to perform for the fitting",
Direction::Input);

declareProperty(PARS_NAME, "", boost::make_shared<MandatoryValidator<std::string>>(),
declareProperty(PARS_NAME, "", boost::make_shared<MandatoryValidator<std::string> >(),
"The parameters/attributes for the function & model. See Fit documentation for format",
Direction::Input);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ namespace Mantid
m_yvector = std::vector<TobyFitYVector>(nthreads, TobyFitYVector());
m_etaInPlane = std::vector<double>(nthreads, 0.0);
m_etaOutPlane = std::vector<double>(nthreads, 0.0);
m_deltaQE = std::vector<std::vector<double>>(nthreads, std::vector<double>(4, 0.0));
m_deltaQE = std::vector<std::vector<double> >(nthreads, std::vector<double>(4, 0.0));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ namespace Mantid
"The simulated output workspace");

std::vector<std::string> models = MDResolutionConvolutionFactory::Instance().getKeys();
declareProperty(RESOLUTION_NAME, "", boost::make_shared<ListValidator<std::string>>(models),
declareProperty(RESOLUTION_NAME, "", boost::make_shared<ListValidator<std::string> >(models),
"The name of a resolution model", Direction::Input);

models = ForegroundModelFactory::Instance().getKeys();
declareProperty(FOREGROUND_NAME, "", boost::make_shared<ListValidator<std::string>>(models),
declareProperty(FOREGROUND_NAME, "", boost::make_shared<ListValidator<std::string> >(models),
"The name of a foreground function", Direction::Input);

declareProperty(PARS_NAME, "", boost::make_shared<MandatoryValidator<std::string>>(),
declareProperty(PARS_NAME, "", boost::make_shared<MandatoryValidator<std::string> >(),
"The parameters/attributes for the function & model. See Fit documentation for format",
Direction::Input);

Expand Down

0 comments on commit 2d8b0cb

Please sign in to comment.