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:
@ -503,8 +503,9 @@ void musrAnalysis::ReadInInputParameters(char* charV1190FileName) {
|
||||
}
|
||||
}
|
||||
else if (strcmp(tmpString0,"fit")==0) {
|
||||
char histoName[100]; char functionName[100]; float xMin; float xMax; float p0, p1, p2, p3, p4, p5, p6;
|
||||
sscanf(&line[0],"%*s %s %s %g %g %g %g %g %g %g",histoName,functionName,&xMin,&xMax,&p0,&p1,&p2,&p3,&p4,&p5,&p6);
|
||||
char histoName[100]; char functionName[100]; char functOption[100]; float xMin; float xMax; float p0, p1, p2, p3, p4, p5, p6;
|
||||
sscanf(&line[0],"%*s %s %s %s %g %g %g %g %g %g %g",histoName,functionName,functOption,&xMin,&xMax,&p0,&p1,&p2,&p3,&p4,&p5,&p6);
|
||||
if (strcmp(functOption,"\"\"")==0) strcpy(functOption,"");
|
||||
|
||||
TF1 *funct;
|
||||
|
||||
@ -576,7 +577,7 @@ void musrAnalysis::ReadInInputParameters(char* charV1190FileName) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
tmpHistograms->AssignFunction(funct, xMin, xMax);
|
||||
tmpHistograms->AssignFunction(funct, functOption, xMin, xMax);
|
||||
}
|
||||
|
||||
else {
|
||||
@ -957,6 +958,8 @@ void musrAnalysis::FillHistograms(Int_t iiiEntry) {
|
||||
// Long64_t dataBinMax = (mCounterHitExistsForThisEventID) ? timeBin0+dataWindowBinMax : timeBinOfThePreviouslyProcessedHit+100000000;
|
||||
pileup_eventID = -1001;
|
||||
pileup_muDecayDetID_double = -1001;
|
||||
pileup_muDecayPosX = -1000000000;
|
||||
pileup_muDecayPosY = -1000000000;
|
||||
pileup_muDecayPosZ = -1000000000;
|
||||
pileup_muDecayPosR = -1000000000;
|
||||
if (mCounterHitExistsForThisEventID) {
|
||||
@ -970,6 +973,8 @@ void musrAnalysis::FillHistograms(Int_t iiiEntry) {
|
||||
fChain->GetEntry(posEntry);
|
||||
pileup_eventID = eventID;
|
||||
pileup_muDecayDetID_double = muDecayDetID;
|
||||
pileup_muDecayPosX = muDecayPosX;
|
||||
pileup_muDecayPosY = muDecayPosY;
|
||||
pileup_muDecayPosZ = muDecayPosZ;
|
||||
pileup_muDecayPosR = sqrt(muDecayPosX*muDecayPosX+muDecayPosY*muDecayPosY);
|
||||
// if (pileup_muDecayDetID_double==-1000) {
|
||||
|
Reference in New Issue
Block a user