LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

fixed bug in tidyfing theory block. Added a parameter to InternalBessel

Browse Source
This commit is contained in:
nemu 2008-09-24 05:31:18 +00:00
parent 4f1ade3ca7
commit f3e700b03f
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/classes/PFitter.cpp
View File

@ -280,19 +280,19 @@ bool PFitter::SetParameters()
} else { // add free parameter } else { // add free parameter
// check if boundaries are given // check if boundaries are given
if (fParams[i].fNoOfParams > 5) { // boundaries given if (fParams[i].fNoOfParams > 5) { // boundaries given
cout << endl << ">> name=" << fParams[i].fName.Data() << ", lower=" << fParams[i].fLowerBoundaryPresent << ", upper=" << fParams[i].fUpperBoundaryPresent; //cout << endl << ">> name=" << fParams[i].fName.Data() << ", lower=" << fParams[i].fLowerBoundaryPresent << ", upper=" << fParams[i].fUpperBoundaryPresent;
if (fParams[i].fLowerBoundaryPresent && if (fParams[i].fLowerBoundaryPresent &&
fParams[i].fUpperBoundaryPresent) { // upper and lower boundaries given fParams[i].fUpperBoundaryPresent) { // upper and lower boundaries given
cout << endl << ">> lower and upper"; //cout << endl << ">> lower and upper";
fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep, fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep,
fParams[i].fLowerBoundary, fParams[i].fUpperBoundary); fParams[i].fLowerBoundary, fParams[i].fUpperBoundary);
} else if (fParams[i].fLowerBoundaryPresent && } else if (fParams[i].fLowerBoundaryPresent &&
!fParams[i].fUpperBoundaryPresent) { // lower boundary limited !fParams[i].fUpperBoundaryPresent) { // lower boundary limited
cout << endl << ">> lower only"; //cout << endl << ">> lower only";
fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep); fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep);
fMnUserParams.SetLowerLimit(fParams[i].fName.Data(), fParams[i].fLowerBoundary); fMnUserParams.SetLowerLimit(fParams[i].fName.Data(), fParams[i].fLowerBoundary);
} else { // upper boundary limited } else { // upper boundary limited
cout << endl << ">> upper only"; //cout << endl << ">> upper only";
fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep); fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep);
fMnUserParams.SetUpperLimit(fParams[i].fName.Data(), fParams[i].fUpperBoundary); fMnUserParams.SetUpperLimit(fParams[i].fName.Data(), fParams[i].fUpperBoundary);
} }
@ -301,7 +301,7 @@ cout << endl << ">> upper only";
} }
} }
} }
cout << endl; //cout << endl;
// check if there is an unused parameter, if so, fix it // check if there is an unused parameter, if so, fix it
for (unsigned int i=0; i<fParams.size(); i++) { for (unsigned int i=0; i<fParams.size(); i++) {

24
src/classes/PTheory.cpp
View File

@ -684,6 +684,7 @@ void PTheory::MakeCleanAndTidyTheoryBlock(PMsrLines *fullTheoryBlock)
line = &(*fullTheoryBlock)[i]; line = &(*fullTheoryBlock)[i];
// copy line content to str in order to remove comments // copy line content to str in order to remove comments
str = line->fLine.Copy(); str = line->fLine.Copy();
cout << endl << ">> str = " << str.Data();
// remove theory line comment if present, i.e. something starting with '(' // remove theory line comment if present, i.e. something starting with '('
int index = str.Index("("); int index = str.Index("(");
if (index > 0) // theory line comment present if (index > 0) // theory line comment present
@ -696,16 +697,16 @@ void PTheory::MakeCleanAndTidyTheoryBlock(PMsrLines *fullTheoryBlock)
str = ostr->GetString(); str = ostr->GetString();
// check if the line is just a '+' if so nothing to be done // check if the line is just a '+' if so nothing to be done
if (str.Contains("+")) if (str.Contains("+"))
return; continue;
// check if the function is a polynom // check if the function is a polynom
if (!str.CompareTo("p") || str.Contains("polynom")) { if (!str.CompareTo("p") || str.Contains("polynom")) {
MakeCleanAndTidyPolynom(i, fullTheoryBlock); MakeCleanAndTidyPolynom(i, fullTheoryBlock);
return; continue;
} }
// check if the function is a userFcn // check if the function is a userFcn
if (!str.CompareTo("u") || str.Contains("userFcn")) { if (!str.CompareTo("u") || str.Contains("userFcn")) {
MakeCleanAndTidyUserFcn(i, fullTheoryBlock); MakeCleanAndTidyUserFcn(i, fullTheoryBlock);
return; continue;
} }
// search the theory function // search the theory function
for (unsigned int j=0; j<THEORY_MAX; j++) { for (unsigned int j=0; j<THEORY_MAX; j++) {
@ -1324,11 +1325,11 @@ double PTheory::Bessel(register double t, const PDoubleVector& paramValues, cons
*/ */
double PTheory::InternalBessel(register double t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const double PTheory::InternalBessel(register double t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const
{ {
// expected parameters: phase frequency rateT rateL [tshift] // expected parameters: fraction phase frequency rateT rateL [tshift]
double val[5]; double val[6];
assert(fParamNo.size() <= 5); assert(fParamNo.size() <= 6);
// check if FUNCTIONS are used // check if FUNCTIONS are used
for (unsigned int i=0; i<fParamNo.size(); i++) { for (unsigned int i=0; i<fParamNo.size(); i++) {
@ -1340,15 +1341,14 @@ double PTheory::InternalBessel(register double t, const PDoubleVector& paramValu
} }
double tt; double tt;
if (fParamNo.size() == 4) // no tshift if (fParamNo.size() == 5) // no tshift
tt = t; tt = t;
else // tshift present else // tshift present
tt = t-val[4]; tt = t-val[5];
return 0.666666666666667* return val[0]* TMath::BesselJ0(DEG_TO_RAD*val[1]+TWO_PI*val[2]*tt)*
TMath::BesselJ0(DEG_TO_RAD*val[0]+TWO_PI*val[1]*tt)* TMath::Exp(-val[3]*tt) +
TMath::Exp(-val[2]*tt) + (1.0-val[0])*TMath::Exp(-val[4]*tt);
0.333333333333333*TMath::Exp(-val[3]*tt);
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------

4
src/include/PTheory.h
View File

@ -87,7 +87,7 @@
#define THEORY_PARAM_INTERNAL_FIELD 4 // phase, frequency, TF damping, damping (tshift) #define THEORY_PARAM_INTERNAL_FIELD 4 // phase, frequency, TF damping, damping (tshift)
#define THEORY_PARAM_TF_COS 2 // phase, frequency (tshift) #define THEORY_PARAM_TF_COS 2 // phase, frequency (tshift)
#define THEORY_PARAM_BESSEL 2 // phase, frequency (tshift) #define THEORY_PARAM_BESSEL 2 // phase, frequency (tshift)
#define THEORY_PARAM_INTERNAL_BESSEL 5 // fraction, phase, frequency, TF damping, damping (tshift) #define THEORY_PARAM_INTERNAL_BESSEL 5 // fraction, phase, frequency, TF damping, LF damping (tshift)
#define THEORY_PARAM_SKEWED_GAUSS 4 // phase, frequency, rate minus, rate plus (tshift) #define THEORY_PARAM_SKEWED_GAUSS 4 // phase, frequency, rate minus, rate plus (tshift)
// number of available user functions // number of available user functions
@ -163,7 +163,7 @@ static PTheoDataBase fgTheoDataBase[THEORY_MAX] = {
"bessel", "b", "(phase frequency)", "(phase frequency tshift)"}, "bessel", "b", "(phase frequency)", "(phase frequency tshift)"},
{THEORY_INTERNAL_BESSEL, THEORY_PARAM_INTERNAL_BESSEL, false, {THEORY_INTERNAL_BESSEL, THEORY_PARAM_INTERNAL_BESSEL, false,
"internBsl", "ib", "(phase frequency Trate Lrate)", "(phase frequency Trate Lrate tshift)"}, "internBsl", "ib", "(fraction phase frequency Trate Lrate)", "(fraction phase frequency Trate Lrate tshift)"},
{THEORY_SKEWED_GAUSS, THEORY_PARAM_SKEWED_GAUSS, false, {THEORY_SKEWED_GAUSS, THEORY_PARAM_SKEWED_GAUSS, false,
"skewedGss", "skg", "(phase frequency rate_m rate_p)", "(phase frequency rate_m rate_p tshift)"}, "skewedGss", "skg", "(phase frequency rate_m rate_p)", "(phase frequency rate_m rate_p tshift)"},