Skip to content

Commit

Permalink
refs #7351 Changes in formatting.
Browse files Browse the repository at this point in the history
  • Loading branch information
abuts committed Jul 18, 2013
1 parent dd11775 commit 5e9e5a8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 25 deletions.
32 changes: 16 additions & 16 deletions Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SofQCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@

#include "MantidAPI/Algorithm.h"
#include "MantidGeometry/IDetector.h"
// number of small routines used by all SofQW algorithms intended to provide united user interface to all SofQ algorihtms.

// Two small routines used by all SofQW algorithms intended to provide united user interface to all SofQ algorihtms.
namespace Mantid
{
namespace Algorithms
{

struct SofQCommon
{
struct SofQCommon
{

/// E Mode
int m_emode;
/// EFixed has been provided
bool m_efixedGiven;
/// EFixed
double m_efixed;
/// E Mode
int m_emode;
/// EFixed has been provided
bool m_efixedGiven;
/// EFixed
double m_efixed;

SofQCommon():m_emode(0), m_efixedGiven(false), m_efixed(0.0){}
//Constructor
SofQCommon():m_emode(0), m_efixedGiven(false), m_efixed(0.0){}
// init the class parameters, defined above
void initCachedValues(API::MatrixWorkspace_const_sptr workspace, API::Algorithm *const hostAlgorithm);

void initCachedValues(API::MatrixWorkspace_const_sptr workspace, API::Algorithm *const hostAlgorithm);

/// Get the efixed value for the given detector
double getEFixed(Geometry::IDetector_const_sptr det) const;
};
/// Get the efixed value for the given detector
double getEFixed(Geometry::IDetector_const_sptr det) const;
};

}
}
Expand Down
12 changes: 3 additions & 9 deletions Code/Mantid/Framework/Algorithms/src/SofQCommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ namespace Mantid
namespace Algorithms
{
/** The procedure analyses emode and efixed properties provided to the algorithm and identify the energy analysis mode and the way the properties are defined
@param workspace :: input workspace which may or may not have incident energy property (Ei) attached to it as the run log
@param hostAlgorithm :: the pointer to SofQ algorithm hosting the base class. This algorithm expects to have EMode and EFixed properties attached to it.
*@param workspace :: input workspace which may or may not have incident energy property (Ei) attached to it as the run log
*@param hostAlgorithm :: the pointer to SofQ algorithm hosting the base class. This algorithm expects to have EMode and EFixed properties attached to it.
*/
void SofQCommon::initCachedValues(API::MatrixWorkspace_const_sptr workspace, API::Algorithm *const hostAlgorithm)
{
Expand Down Expand Up @@ -52,10 +50,6 @@ namespace Mantid
}
}





/**
* Return the efixed for this detector. In Direct mode this has to be property set up earlier and in Indirect mode it may be the property of a component
if not specified globally for the instrument.
Expand Down Expand Up @@ -83,6 +77,6 @@ namespace Mantid
return efixed;
}


}
}

0 comments on commit 5e9e5a8

Please sign in to comment.