Skip to content

Commit

Permalink
refs #4201 algorithm renamed according to the ticket name
Browse files Browse the repository at this point in the history
  • Loading branch information
@abuts
abuts committed Nov 29, 2011
1 parent 9125ebd commit a6f88ba
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 105 deletions.
8 changes: 4 additions & 4 deletions Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set ( SRC_FILES
src/CompositeImplicitFunction.cpp
src/CompositeImplicitFunctionParser.cpp
src/ConvertToQ3DdE.cpp
src/ConvertToQNDany.cpp
src/ConvertToMDEvents.cpp
src/DivideMD.cpp
src/EqualToMD.cpp
src/ExponentialMD.cpp
Expand Down Expand Up @@ -50,8 +50,8 @@ set ( INC_FILES
inc/MantidMDAlgorithms/CompositeImplicitFunction.h
inc/MantidMDAlgorithms/CompositeImplicitFunctionParser.h
inc/MantidMDAlgorithms/ConvertToQ3DdE.h
inc/MantidMDAlgorithms/ConvertToQNDanyMethodsTemplate.h
inc/MantidMDAlgorithms/ConvertToQNDany.h
inc/MantidMDAlgorithms/ConvertToMDEventsMethodsTemplate.h
inc/MantidMDAlgorithms/ConvertToMDEvents.h
inc/MantidMDAlgorithms/DivideMD.h
inc/MantidMDAlgorithms/EqualToMD.h
inc/MantidMDAlgorithms/ExponentialMD.h
Expand Down Expand Up @@ -89,7 +89,7 @@ set ( TEST_FILES
test/AndMDTest.h
test/BooleanBinaryOperationMDTest.h
test/ConvertToQ3DdETest.h
test/ConvertToQNDanyTest.h
test/ConvertToMDEventsTest.h
test/DivideMDTest.h
test/EqualToMDTest.h
test/ExponentialMDTest.h
Expand Down
20 changes: 10 additions & 10 deletions .../inc/MantidMDAlgorithms/ConvertToQNDany.h → ...nc/MantidMDAlgorithms/ConvertToMDEvents.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef MANTID_MD_CONVERT2_Q_ND_ANY
#define MANTID_MD_CONVERT2_Q_ND_ANY
#ifndef MANTID_MD_CONVERT2_MDEVENTS
#define MANTID_MD_CONVERT2_MDEVENTS

#include "MantidKernel/System.h"
#include "MantidKernel/Exception.h"
Expand Down Expand Up @@ -50,27 +50,27 @@ namespace MDAlgorithms
File change history is stored at: <https://svn.mantidproject.org/mantid/trunk/Code/Mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
class ConvertToQNDany;
class ConvertToMDEvents;
// signature for an algorithm processing n-dimension event workspace
typedef boost::function<void (ConvertToQNDany*, API::IMDEventWorkspace *const)> pMethod;
typedef boost::function<void (ConvertToMDEvents*, API::IMDEventWorkspace *const)> pMethod;
// signature for a fucntion, creating n-dimension workspace
//typedef boost::function<API::IMDEventWorkspace_sptr (ConvertToQNDany*, const std::vector<std::string> &,const std::vector<std::string> &, size_t ,size_t ,size_t )> pWSCreator;
typedef boost::function<API::IMDEventWorkspace_sptr (ConvertToQNDany*, size_t ,size_t ,size_t )> pWSCreator;
//typedef boost::function<API::IMDEventWorkspace_sptr (ConvertToMDEvents*, const std::vector<std::string> &,const std::vector<std::string> &, size_t ,size_t ,size_t )> pWSCreator;
typedef boost::function<API::IMDEventWorkspace_sptr (ConvertToMDEvents*, size_t ,size_t ,size_t )> pWSCreator;

enum Q_state{
NoQ,
modQ,
Q3D
};
//
class DLLExport ConvertToQNDany : public API::Algorithm
class DLLExport ConvertToMDEvents : public API::Algorithm
{
public:
ConvertToQNDany();
~ConvertToQNDany();
ConvertToMDEvents();
~ConvertToMDEvents();

/// Algorithm's name for identification
virtual const std::string name() const { return "ConvertToQNDany";};
virtual const std::string name() const { return "ConvertToMDEvents";};
/// Algorithm's version for identification
virtual int version() const { return 1;};
/// Algorithm's category for identification
Expand Down
20 changes: 10 additions & 10 deletions ...gorithms/ConvertToQNDanyMethodsTemplate.h → ...rithms/ConvertToMDEventsMethodsTemplate.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "MantidMDAlgorithms/ConvertToQNDany.h"
#include "MantidMDAlgorithms/ConvertToMDEvents.h"
namespace Mantid
{
namespace MDAlgorithms
Expand All @@ -8,7 +8,7 @@ namespace MDAlgorithms
//-----------------------------------------------
template<size_t nd,Q_state Q>
void
ConvertToQNDany::processQND(API::IMDEventWorkspace *const piWS)
ConvertToMDEvents::processQND(API::IMDEventWorkspace *const piWS)
{
// service variable used for efficient filling of the MD event WS -> should be moved to configuration;
size_t SPLIT_LEVEL(1024);
Expand All @@ -22,7 +22,7 @@ ConvertToQNDany::processQND(API::IMDEventWorkspace *const piWS)

MDEvents::MDEventWorkspace<MDEvents::MDEvent<nd>,nd> *const pWs = dynamic_cast<MDEvents::MDEventWorkspace<MDEvents::MDEvent<nd>,nd> *>(piWS);
if(!pWs){
g_log.error()<<"ConvertToQNDany: can not cast input worspace pointer into pointer to proper target workspace\n";
g_log.error()<<"ConvertToMDEvents: can not cast input worspace pointer into pointer to proper target workspace\n";
throw(std::bad_cast());
}

Expand Down Expand Up @@ -84,7 +84,7 @@ ConvertToQNDany::processQND(API::IMDEventWorkspace *const piWS)

template<size_t nd>
API::IMDEventWorkspace_sptr
ConvertToQNDany::createEmptyEventWS(size_t split_into,size_t split_threshold,size_t split_maxDepth)
ConvertToMDEvents::createEmptyEventWS(size_t split_into,size_t split_threshold,size_t split_maxDepth)
{

boost::shared_ptr<MDEvents::MDEventWorkspace<MDEvents::MDEvent<nd>,nd> > ws =
Expand All @@ -111,7 +111,7 @@ ConvertToQNDany::createEmptyEventWS(size_t split_into,size_t split_threshold,siz


template<>
inline void ConvertToQNDany::calc_generic_variables<NoQ>(std::vector<coord_t> &Coord, size_t nd){
inline void ConvertToMDEvents::calc_generic_variables<NoQ>(std::vector<coord_t> &Coord, size_t nd){
// workspace defines 2 properties
fillAddProperties(Coord,nd,2);
// get the Y axis;
Expand All @@ -121,14 +121,14 @@ inline void ConvertToQNDany::calc_generic_variables<NoQ>(std::vector<coord_t> &C
}
}
template<>
void ConvertToQNDany::calc_generic_variables<modQ>(std::vector<coord_t> &Coord, size_t nd){
void ConvertToMDEvents::calc_generic_variables<modQ>(std::vector<coord_t> &Coord, size_t nd){
UNUSED_ARG(Coord);
UNUSED_ARG(nd);
throw(Kernel::Exception::NotImplementedError("not yet implemented"));
}

template<>
inline void ConvertToQNDany::calc_generic_variables<Q3D>(std::vector<coord_t> &Coord, size_t nd){
inline void ConvertToMDEvents::calc_generic_variables<Q3D>(std::vector<coord_t> &Coord, size_t nd){
// INELASTIC:
// four inital properties came from workspace and all are interconnnected all additional defined by properties:
fillAddProperties(Coord,nd,4);
Expand All @@ -141,20 +141,20 @@ inline void ConvertToQNDany::calc_generic_variables<Q3D>(std::vector<coord_t> &C


template<>
void ConvertToQNDany::calculate_y_coordinate<NoQ>(std::vector<coord_t> &Coord,size_t i)
void ConvertToMDEvents::calculate_y_coordinate<NoQ>(std::vector<coord_t> &Coord,size_t i)
{
UNUSED_ARG(i);
Coord[1] = pYAxis->operator()(i);
}

template<>
bool ConvertToQNDany::calculate_ND_coordinates<NoQ>(const MantidVec& X,size_t i,size_t j,std::vector<coord_t> &Coord){
bool ConvertToMDEvents::calculate_ND_coordinates<NoQ>(const MantidVec& X,size_t i,size_t j,std::vector<coord_t> &Coord){
Coord[0] = 0.5*( X[j]+ X[j+1]);
return true;
}

template<>
bool ConvertToQNDany::calculate_ND_coordinates<Q3D>(const MantidVec& X,size_t i,size_t j,std::vector<coord_t> &Coord){
bool ConvertToMDEvents::calculate_ND_coordinates<Q3D>(const MantidVec& X,size_t i,size_t j,std::vector<coord_t> &Coord){

coord_t E_tr = 0.5*( X[j]+ X[j+1]);
Coord[3] = E_tr;
Expand Down

0 comments on commit a6f88ba

Please sign in to comment.