LMU/musrsim
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

26.8.2011 Kamil Sedlak

Browse Source 
- implementataion of volume "TubeWithHolePlusTubeHole"
 - some other changes in musrSimAna
This commit is contained in:
sedlak
2011-08-26 15:26:57 +00:00
parent 0de813e1f3
commit b4299fe10d
5 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
musrSimAna/musrAnalysis.cxx
View File

@ -575,12 +575,20 @@ void musrAnalysis::ReadInInputParameters(char* charV1190FileName) {
funct -> SetParameter(1,p1);
funct -> SetParameter(2,p2);
}
else if (strcmp(functionName,"gaus")==0) {
std::cout<<"Gausssssssss"<<std::endl;
funct = new TF1("gaus","gaus");
funct -> SetParameter(0,p0);
funct -> SetParameter(1,p1);
funct -> SetParameter(2,p2);
std::cout<<"GausssssssssGausssssssss"<<std::endl;
}
else {
std::cout<<"musrAnalysis::ReadInInputParameters: function \""<<functionName<<"\" not defined! ==> S T O P"<<std::endl;
exit(1);
}
musrTH* tmpHistograms;
musrTH* tmpHistograms=NULL;
for(std::list<musrTH*>::const_iterator it = listOfAllHistograms1D.begin(); it != listOfAllHistograms1D.end(); ++it) {
if ((*it)->IsThisHistoNamed(histoName)) {
tmpHistograms = *it;
@ -1005,6 +1013,13 @@ void musrAnalysis::FillHistograms(Int_t iiiEntry) {
// }
// CALCULATE VARIABLES
// Initial muon
muIniPosR = sqrt(muIniPosX*muIniPosX+muIniPosY*muIniPosY);
muIniMomTrans = sqrt(muIniMomX*muIniMomX+muIniMomY*muIniMomY);
muTargetPol_Theta = myAtan2(sqrt(muTargetPolX*muTargetPolX+muTargetPolY*muTargetPolY),muTargetPolZ) * 180./pi;
muTargetPol_Theta360 = (muTargetPol_Theta<0) ? muTargetPol_Theta+360. : muTargetPol_Theta;
muTargetPol_Phi = myAtan2(muTargetPolY,muTargetPolX) * 180./pi;
muTargetPol_Phi360= (muTargetPol_Phi<0) ? muTargetPol_Phi+360. : muTargetPol_Phi;
// Initial positron
pos_Trans_Momentum = sqrt(posIniMomX*posIniMomX+posIniMomY*posIniMomY);
pos_Momentum = sqrt(pos_Trans_Momentum*pos_Trans_Momentum+posIniMomZ*posIniMomZ);

12
musrSimAna/musrAnalysis.hh
View File

@ -193,6 +193,12 @@ public :
Double_t wght;
Double_t det_m0edep;
Double_t det_posEdep;
Double_t muIniPosR;
Double_t muIniMomTrans;
Double_t muTargetPol_Theta;
Double_t muTargetPol_Theta360;
Double_t muTargetPol_Phi;
Double_t muTargetPol_Phi360;
Double_t pos_Trans_Momentum;
Double_t pos_Momentum;
Double_t pos_Radius;
@ -440,6 +446,12 @@ musrAnalysis::musrAnalysis(TTree *tree)
variableMap["wght"]=&wght;
variableMap["det_m0edep"]=&det_m0edep;
variableMap["det_posEdep"]=&det_posEdep;
variableMap["muIniPosR"]=&muIniPosR;
variableMap["muIniMomTrans"]=&muIniMomTrans;
variableMap["muTargetPol_Theta"]=&muTargetPol_Theta;
variableMap["muTargetPol_Theta360"]=&muTargetPol_Theta360;
variableMap["muTargetPol_Phi"]=&muTargetPol_Phi;
variableMap["muTargetPol_Phi360"]=&muTargetPol_Phi360;
variableMap["pos_Trans_Momentum"]=&pos_Trans_Momentum;
variableMap["pos_Momentum"]=&pos_Momentum;
variableMap["pos_Radius"]=&pos_Radius;

3
musrSimAna/musrTH.cxx
View File

@ -234,7 +234,8 @@ void musrTH::FitHistogramsIfRequired(Double_t omega) {
Double_t ppp[100];
std::cout<<" Initial parameter setting: ";
Int_t n_ppp = funct->GetNumberFreeParameters();
// Int_t n_ppp = funct->GetNumberFreeParameters();
Int_t n_ppp = funct->GetNpar();
for (Int_t i=0; i<n_ppp; i++) {ppp[i]=funct->GetParameter(i); std::cout<<ppp[i]<<", ";}
std::cout<<std::endl;