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

fixed a problem with the general exponential for negative times

Browse Source
This commit is contained in:
nemu 2008-09-30 08:09:08 +00:00
parent 1b35506339
commit fa47ee966e
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/classes/PMusrCanvas.cpp
View File

@ -274,8 +274,8 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
// cout << ">fMainCanvas " << fMainCanvas << endl; // cout << ">fMainCanvas " << fMainCanvas << endl;
// cout << ">selected " << selected << endl; // cout << ">selected " << selected << endl;
// //
cout << "x : " << (char)x << endl; //cout << "x : " << (char)x << endl;
cout << "px: " << (char)fMainCanvas->GetEventX() << endl; //cout << "px: " << (char)fMainCanvas->GetEventX() << endl;
if (x == 'q') { if (x == 'q') {
Done(0); Done(0);
@ -612,7 +612,7 @@ void PMusrCanvas::UpdateInfoPad()
// energy if present // energy if present
tstr += TString("E="); tstr += TString("E=");
dval = fRunList->GetEnergy(runs[runNo].fRunName); dval = fRunList->GetEnergy(runs[runNo].fRunName);
cout << endl << ">> dval = " << dval << " (Engery)"; //cout << endl << ">> dval = " << dval << " (Engery)";
if (dval == -9.9e99) { if (dval == -9.9e99) {
tstr += TString("??,"); tstr += TString("??,");
} else { } else {

13
src/classes/PRunSingleHisto.cpp
View File

@ -146,7 +146,15 @@ double PRunSingleHisto::CalcChiSquare(const std::vector<double>& par)
} }
} }
//cout << endl << "chisq=" << chisq*fRunInfo->fPacking; /*
static int firstTime = 0;
if (firstTime < 4) {
firstTime++;
cout << endl << "size=" << fData.fValue.size() << ", fDataTimeStart=" << fData.fDataTimeStart << ", fDataTimeStep=" << fData.fDataTimeStep << ", fFitStartTime=" << fFitStartTime << ", fFitStopTime=" << fFitStopTime;
cout << endl << "chisq=" << chisq*fRunInfo->fPacking;
cout << endl << "----";
}
*/
return chisq; return chisq;
} }
@ -458,6 +466,7 @@ bool PRunSingleHisto::PrepareFitData()
// count the number of bins to be fitted // count the number of bins to be fitted
fNoOfFitBins=0; fNoOfFitBins=0;
double time; double time;
//cout << endl << ">> size=" << fData.fValue.size() << ", fDataTimeStart=" << fData.fDataTimeStart << ", fDataTimeStep=" << fData.fDataTimeStep << ", fFitStartTime=" << fFitStartTime << ", fFitStopTime=" << fFitStopTime;
for (unsigned int i=0; i<fData.fValue.size(); i++) { for (unsigned int i=0; i<fData.fValue.size(); i++) {
time = fData.fDataTimeStart + (double)i*fData.fDataTimeStep; time = fData.fDataTimeStart + (double)i*fData.fDataTimeStep;
if ((time >= fFitStartTime) && (time <= fFitStopTime)) if ((time >= fFitStartTime) && (time <= fFitStopTime))
@ -862,6 +871,7 @@ cout << endl << "--------------------------------";
double theoryValue; double theoryValue;
fData.fTheoryTimeStart = startTime; fData.fTheoryTimeStart = startTime;
fData.fTheoryTimeStep = fTimeResolution; fData.fTheoryTimeStep = fTimeResolution;
//cout << endl << ">> size=" << size << ", startTime=" << startTime << ", fTimeResolution=" << fTimeResolution;
for (unsigned int i=0; i<size; i++) { for (unsigned int i=0; i<size; i++) {
time = startTime + (double)i*fTimeResolution; time = startTime + (double)i*fTimeResolution;
theoryValue = fTheory->Func(time, par, fFuncValues); theoryValue = fTheory->Func(time, par, fFuncValues);
@ -940,6 +950,7 @@ bool PRunSingleHisto::EstimateBkg(unsigned int histoNo)
double bkg = 0.0; double bkg = 0.0;
// forward // forward
//cout << endl << ">> bkg start=" << start << ", end=" << end;
for (unsigned int i=start; i<end; i++) for (unsigned int i=start; i<end; i++)
bkg += runData->fDataBin[histoNo][i]; bkg += runData->fDataBin[histoNo][i];
bkg /= static_cast<double>(end - start + 1); bkg /= static_cast<double>(end - start + 1);

12
src/classes/PTheory.cpp
View File

@ -684,7 +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(); //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
@ -913,6 +913,7 @@ double PTheory::GeneralExp(register double t, const PDoubleVector& paramValues,
// expected parameters: lambda beta [tshift] // expected parameters: lambda beta [tshift]
double val[3]; double val[3];
double result;
assert(fParamNo.size() <= 3); assert(fParamNo.size() <= 3);
@ -931,7 +932,14 @@ double PTheory::GeneralExp(register double t, const PDoubleVector& paramValues,
else // tshift present else // tshift present
tt = t-val[2]; tt = t-val[2];
return TMath::Exp(-TMath::Power(tt*val[0], val[1]));; // check if tt*val[0] < 0 and
if ((tt*val[0] < 0) && (trunc(val[1])-val[1] != 0.0)) {
result = 0.0;
} else {
result = TMath::Exp(-TMath::Power(tt*val[0], val[1]));
}
return result;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------