Skip to content

Commit

Permalink
Continuing with refactoring:
Browse files Browse the repository at this point in the history
* Start to functionalise the algorithm
* Follow coding standard for member variables names
Refs #10470
  • Loading branch information
martyngigg committed Nov 3, 2014
1 parent 39f2d5e commit c6ecf32
Show file tree
Hide file tree
Showing 2 changed files with 195 additions and 166 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,31 @@ namespace Mantid
void init();
void exec();

/// Retrieve the energy transfer mode of the input workspace data
std::string inputEnergyMode() const;

/// function to calculate intersections of teh trajectory with MDBoxes
std::vector<Kernel::VMD> calculateIntersections(Mantid::Geometry::IDetector_const_sptr detector);
void initCaches();
std::vector<coord_t> getValuesFromOtherDimensions(bool & skipNormalization) const;
MDEvents::MDHistoWorkspace_sptr binInputWS();

/// function to calculate intersections of the trajectory with MDBoxes
std::vector<Kernel::VMD> calculateIntersections(const Geometry::IDetector_const_sptr &detector);

/// number of MD dimensions
size_t m_nDims;
/// Normalization workspace
MDEvents::MDHistoWorkspace_sptr m_normWS;
/// Input workspace
API::IMDEventWorkspace_sptr m_inputWS;
///limits for h,k,l dimensions
coord_t hMin,hMax,kMin,kMax,lMin,lMax;
///flag for integrated h,k,l dimensions
bool hIntegrated,kIntegrated,lIntegrated;
///(2*PiRUBW)^-1
Mantid::Kernel::DblMatrix transf;
/// limits for h,k,l dimensions
coord_t m_hmin, m_hmax, m_kmin, m_kmax, m_lmin, m_lmax;
/// flag for integrated h,k,l dimensions
bool m_hIntegrated, m_kIntegrated, m_lIntegrated;
/// (2*PiRUBW)^-1
Mantid::Kernel::DblMatrix m_rubw;
/// limits for momentum
double KincidentMin,KincidentMax;
double m_kiMin, m_kiMax;
///index of h,k,l dimensions in the output workspaces
size_t hIndex,kIndex,lIndex;
/// cached x values along dimensions h,k,l
size_t m_hIdx, m_kIdx, m_lIdx;
/// cached X values along dimensions h,k,l
std::vector<double> m_hX, m_kX, m_lX;
};

Expand Down

0 comments on commit c6ecf32

Please sign in to comment.