added a NPP, PPC switch and performed some clean-up

This commit is contained in:
nemu
2008-09-22 06:24:52 +00:00
parent a3756c511b
commit 8ba07a692a
11 changed files with 90 additions and 67 deletions

View File

@@ -505,6 +505,7 @@ void PMusrFourier::ApodizeData(int apodizationTag) {
switch (apodizationTag) {
case F_APODIZATION_NONE:
return;
break;
case F_APODIZATION_WEAK:
c[0] = cweak[0]+cweak[1]+cweak[2];

View File

@@ -185,7 +185,7 @@ cout << endl << "#bins=" << histo->GetNbinsX();
cout << endl << ">> Do you wish to apodize your data (y/n)? ";
cin >> answer;
unsigned int apodizationTag=0;
unsigned int apodizationTag = F_APODIZATION_NONE;
if (strstr(answer, "y")) {
cout << endl << ">> apodization (1=weak, 2=medium, 3=strong, 4=user) = ";
cin >> apodizationTag;

View File

@@ -78,17 +78,17 @@ void minuit2test()
// set parameters
gFitFcn->SetParNames("N0", "asym", "lambda", "B", "phase", "Bkg");
gFitFcn->SetParameter(0, 30.0); // N0
// gFitFcn->SetParLimits(0, 0.0, 1.0e6);
gFitFcn->SetParLimits(0, 0.0, 1.0e6);
gFitFcn->SetParameter(1, 0.26); // asym
// gFitFcn->SetParLimits(1, 0.0, 0.33);
gFitFcn->SetParLimits(1, 0.0, 0.33);
gFitFcn->SetParameter(2, 0.3); // lambda
// gFitFcn->SetParLimits(2, 0.0, 100.0);
gFitFcn->SetParLimits(2, 0.0, 100.0);
gFitFcn->SetParameter(3, 100.0); // B
// gFitFcn->SetParLimits(3, 0.0, 1000.0);
gFitFcn->SetParLimits(3, 0.0, 1000.0);
gFitFcn->SetParameter(4, 0.0); // phase
// gFitFcn->SetParLimits(4, -90.0, 90.0);
gFitFcn->SetParLimits(4, -90.0, 90.0);
gFitFcn->SetParameter(5, 5.0); // Bkg
// gFitFcn->SetParLimits(5, 0.0, 1000.0);
gFitFcn->SetParLimits(5, 0.0, 1000.0);
cout << endl << "gFitFcn->Integral(0.0, 12.0) = " << gFitFcn->Integral(0.0, 12.0);
cout << endl;
@@ -100,9 +100,13 @@ void minuit2test()
histo->Draw();
gFitFcn->SetParameter(0, 150.0); // N0
gFitFcn->SetParameter(5, 23.0); // Bkg
gFitFcn->SetParameter(0, 1000.0); // N0
gFitFcn->SetParameter(1, 0.1); // asym
gFitFcn->SetParameter(2, 1.0); // lambda
gFitFcn->SetParameter(3, 50.0); // B
gFitFcn->SetParameter(4, 0.0); // phase
gFitFcn->SetParameter(5, 300.0); // Bkg
TVirtualFitter::SetDefaultFitter("Minuit2");
histo->Fit("gFitFcn", "L"); // L->likleyhood, E->minos
histo->Fit("gFitFcn", ""); // L->likleyhood, E->minos
}