Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge remote-tracking branch 'origin/feature/8060_MullerAnsatz'
- Loading branch information
Showing
8 changed files
with
485 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
...Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Models/MullerAnsatz.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
#ifndef MANTID_MDALGORITHMS_MULLERANSATZ_H_ | ||
#define MANTID_MDALGORITHMS_MULLERANSATZ_H_ | ||
/** | ||
Copyright © 2012 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory | ||
This file is part of Mantid. | ||
Mantid is free software; you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation; either version 3 of the License, or | ||
(at your option) any later version. | ||
Mantid is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
You should have received a copy of the GNU General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
File change history is stored at: <https://github.com/mantidproject/mantid>. | ||
Code Documentation is available at: <http://doxygen.mantidproject.org> | ||
*/ | ||
#include "MantidMDAlgorithms/Quantification/ForegroundModel.h" | ||
|
||
namespace Mantid | ||
{ | ||
namespace MDAlgorithms | ||
{ | ||
|
||
/** | ||
* Defines the Muller Ansatz model of Ewings et al. | ||
* This is model 300 in TobyFit. | ||
*/ | ||
class DLLExport MullerAnsatz : public ForegroundModel | ||
{ | ||
public: | ||
/// possible scattering chain directions | ||
enum ChainDirection | ||
{ | ||
Along_a, | ||
Along_b, | ||
Along_c | ||
}; | ||
/// possible magnetic form factor directions | ||
enum MagneticFFDirection | ||
{ | ||
NormalTo_a, | ||
NormalTo_b, | ||
NormalTo_c, | ||
Isotropic | ||
}; | ||
|
||
/// Calculates the intensity for the model for the current parameters. | ||
double scatteringIntensity(const API::ExperimentInfo & exptDescr, const std::vector<double> & point) const; | ||
/// Called when an attribute is set | ||
void setAttribute(const std::string & name, const API::IFunction::Attribute& attr); | ||
/// Returns the type of model | ||
ModelType modelType() const { return Broad; } | ||
/// String name of the model | ||
std::string name() const { return "MullerAnsatz"; } | ||
MullerAnsatz(); | ||
private: | ||
/// Setup the model | ||
void init(); | ||
// direction of the magnetic chain wrt the lattice vectors | ||
ChainDirection m_ChainDirection; | ||
// direction of the magnetic form factor wrt the lattice vectors. | ||
MagneticFFDirection m_FFDirection; | ||
|
||
}; | ||
|
||
} | ||
} | ||
#endif /* MANTID_MDALGORITHMS_STRONTIUM122_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,6 +52,8 @@ namespace Mantid | |
int m_twinType; | ||
/// MultEps attribute | ||
bool m_multEps; | ||
public: | ||
Strontium122(); | ||
}; | ||
|
||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.