6.5.2011 Kamil Sedlak
1) Adding/improving the simulation of light signals and APD 2) Many small changes and improvements 3) Adding manual to musrSimAna to the svn repository 4) Adding some example files for musrSim
This commit is contained in:
@ -16,6 +16,7 @@ musrTH::musrTH(char* dimension, char* histoName, char* histoTitle, Int_t nrOfBin
|
||||
bool_rotating_reference_frame=false;
|
||||
rot_ref_frequency=0;
|
||||
rot_ref_phase=0;
|
||||
strcpy(funct_option,"");
|
||||
// std::cout<<"hojhoj variableName1="<<variableName1<<" variableToBeFilled_X="<<variableToBeFilled_X<<std::endl;
|
||||
|
||||
char nameHist[500];
|
||||
@ -189,10 +190,12 @@ void musrTH::FillHumanDecayArray(musrTH* decayMapHistos, humanDecayMapType myMap
|
||||
}
|
||||
}
|
||||
//==============================================================================================
|
||||
void musrTH::AssignFunction(TF1* function, Double_t xMin, Double_t xMax) {
|
||||
void musrTH::AssignFunction(TF1* function, char* functOption, Double_t xMin, Double_t xMax) {
|
||||
funct = function;
|
||||
strcpy(funct_option,functOption);
|
||||
funct_xMin = xMin;
|
||||
funct_xMax = xMax;
|
||||
std::cout<<"musrTH::AssignFunction: "<<funct->GetName()<<", option="<<funct_option<<", xMin="<<xMin<<", xMax="<<xMax<<std::endl;
|
||||
|
||||
}
|
||||
//==============================================================================================
|
||||
@ -218,13 +221,16 @@ void musrTH::FitHistogramsIfRequired(Double_t omega) {
|
||||
}
|
||||
}
|
||||
|
||||
Double_t ppp[100];
|
||||
std::cout<<" Initial parameter setting: ";
|
||||
for (Int_t i=0; i<(funct->GetNumberFreeParameters()); i++) std::cout<<funct->GetParameter(i)<<", ";
|
||||
Int_t n_ppp = funct->GetNumberFreeParameters();
|
||||
for (Int_t i=0; i<n_ppp; i++) {ppp[i]=funct->GetParameter(i); std::cout<<ppp[i]<<", ";}
|
||||
std::cout<<std::endl;
|
||||
|
||||
for (Int_t i=0; i<musrAnalysis::nrConditions; i++) {
|
||||
// std::cout<<"fitted histogram pointer="<<histArray1D[i]<<std::endl;
|
||||
histArray1D[i]->Fit(funct,"WW","",funct_xMin,funct_xMax);
|
||||
for (Int_t j=0; j<n_ppp; j++) {funct->SetParameter(j,ppp[j]);}
|
||||
histArray1D[i]->Fit(funct,funct_option,"",funct_xMin,funct_xMax);
|
||||
// histArray1D[i]->Fit(funct,"LL","",funct_xMin,funct_xMax);
|
||||
}
|
||||
// if (strcmp(funct->GetName(),"simpleExpoPLUSconst")==0) {
|
||||
|
Reference in New Issue
Block a user