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:
2011-05-06 15:16:49 +00:00
parent 9bc0d53074
commit cb18486947
22 changed files with 11942 additions and 173 deletions

View File

@ -160,7 +160,7 @@ G4bool musrRootOutput::store_odet_timeMean = true;
G4bool musrRootOutput::store_odet_timeLast = true;
G4bool musrRootOutput::store_odet_timeCFD = true;
G4bool musrRootOutput::store_odet_amplCFD = true;
G4bool musrRootOutput::store_odet_timeCFDarray = false;
G4int musrRootOutput::oldEventNumberInG4EqEMFieldWithSpinFunction=-1;
@ -301,7 +301,73 @@ void musrRootOutput::BeginOfRunAction() {
if (store_odet_timeLast) {rootTree->Branch("odet_timeLast",&odet_timeLast,"odet_timeLast[odet_n]/D");}
if (store_odet_timeCFD) {rootTree->Branch("odet_timeCFD",&odet_timeCFD,"odet_timeCFD[odet_n]/D");}
if (store_odet_amplCFD) {rootTree->Branch("odet_amplCFD",&odet_amplCFD,"odet_amplCFD[odet_n]/D");}
if (store_odet_timeCFDarray) {
rootTree->Branch("odet_timeCFD100",&odet_timeCFD100,"odet_timeCFD100[odet_n]/D");
rootTree->Branch("odet_timeCFD101",&odet_timeCFD101,"odet_timeCFD101[odet_n]/D");
rootTree->Branch("odet_timeCFD102",&odet_timeCFD102,"odet_timeCFD102[odet_n]/D");
rootTree->Branch("odet_timeCFD103",&odet_timeCFD103,"odet_timeCFD103[odet_n]/D");
rootTree->Branch("odet_timeCFD104",&odet_timeCFD104,"odet_timeCFD104[odet_n]/D");
rootTree->Branch("odet_timeCFD105",&odet_timeCFD105,"odet_timeCFD105[odet_n]/D");
rootTree->Branch("odet_timeCFD106",&odet_timeCFD106,"odet_timeCFD106[odet_n]/D");
rootTree->Branch("odet_timeCFD107",&odet_timeCFD107,"odet_timeCFD107[odet_n]/D");
rootTree->Branch("odet_timeCFD108",&odet_timeCFD108,"odet_timeCFD108[odet_n]/D");
rootTree->Branch("odet_timeCFD109",&odet_timeCFD109,"odet_timeCFD109[odet_n]/D");
rootTree->Branch("odet_timeCFD110",&odet_timeCFD110,"odet_timeCFD110[odet_n]/D");
rootTree->Branch("odet_timeCFD111",&odet_timeCFD111,"odet_timeCFD111[odet_n]/D");
rootTree->Branch("odet_timeCFD112",&odet_timeCFD112,"odet_timeCFD112[odet_n]/D");
rootTree->Branch("odet_timeCFD200",&odet_timeCFD200,"odet_timeCFD200[odet_n]/D");
rootTree->Branch("odet_timeCFD201",&odet_timeCFD201,"odet_timeCFD201[odet_n]/D");
rootTree->Branch("odet_timeCFD202",&odet_timeCFD202,"odet_timeCFD202[odet_n]/D");
rootTree->Branch("odet_timeCFD203",&odet_timeCFD203,"odet_timeCFD203[odet_n]/D");
rootTree->Branch("odet_timeCFD204",&odet_timeCFD204,"odet_timeCFD204[odet_n]/D");
rootTree->Branch("odet_timeCFD205",&odet_timeCFD205,"odet_timeCFD205[odet_n]/D");
rootTree->Branch("odet_timeCFD206",&odet_timeCFD206,"odet_timeCFD206[odet_n]/D");
rootTree->Branch("odet_timeCFD207",&odet_timeCFD207,"odet_timeCFD207[odet_n]/D");
rootTree->Branch("odet_timeCFD208",&odet_timeCFD208,"odet_timeCFD208[odet_n]/D");
rootTree->Branch("odet_timeCFD209",&odet_timeCFD209,"odet_timeCFD209[odet_n]/D");
rootTree->Branch("odet_timeCFD210",&odet_timeCFD210,"odet_timeCFD210[odet_n]/D");
rootTree->Branch("odet_timeCFD211",&odet_timeCFD211,"odet_timeCFD211[odet_n]/D");
rootTree->Branch("odet_timeCFD212",&odet_timeCFD212,"odet_timeCFD212[odet_n]/D");
rootTree->Branch("odet_timeCFD300",&odet_timeCFD300,"odet_timeCFD300[odet_n]/D");
rootTree->Branch("odet_timeCFD301",&odet_timeCFD301,"odet_timeCFD301[odet_n]/D");
rootTree->Branch("odet_timeCFD302",&odet_timeCFD302,"odet_timeCFD302[odet_n]/D");
rootTree->Branch("odet_timeCFD303",&odet_timeCFD303,"odet_timeCFD303[odet_n]/D");
rootTree->Branch("odet_timeCFD304",&odet_timeCFD304,"odet_timeCFD304[odet_n]/D");
rootTree->Branch("odet_timeCFD305",&odet_timeCFD305,"odet_timeCFD305[odet_n]/D");
rootTree->Branch("odet_timeCFD306",&odet_timeCFD306,"odet_timeCFD306[odet_n]/D");
rootTree->Branch("odet_timeCFD307",&odet_timeCFD307,"odet_timeCFD307[odet_n]/D");
rootTree->Branch("odet_timeCFD308",&odet_timeCFD308,"odet_timeCFD308[odet_n]/D");
rootTree->Branch("odet_timeCFD309",&odet_timeCFD309,"odet_timeCFD309[odet_n]/D");
rootTree->Branch("odet_timeCFD310",&odet_timeCFD310,"odet_timeCFD310[odet_n]/D");
rootTree->Branch("odet_timeCFD311",&odet_timeCFD311,"odet_timeCFD311[odet_n]/D");
rootTree->Branch("odet_timeCFD312",&odet_timeCFD312,"odet_timeCFD312[odet_n]/D");
rootTree->Branch("odet_timeCFD400",&odet_timeCFD400,"odet_timeCFD400[odet_n]/D");
rootTree->Branch("odet_timeCFD401",&odet_timeCFD401,"odet_timeCFD401[odet_n]/D");
rootTree->Branch("odet_timeCFD402",&odet_timeCFD402,"odet_timeCFD402[odet_n]/D");
rootTree->Branch("odet_timeCFD403",&odet_timeCFD403,"odet_timeCFD403[odet_n]/D");
rootTree->Branch("odet_timeCFD404",&odet_timeCFD404,"odet_timeCFD404[odet_n]/D");
rootTree->Branch("odet_timeCFD405",&odet_timeCFD405,"odet_timeCFD405[odet_n]/D");
rootTree->Branch("odet_timeCFD406",&odet_timeCFD406,"odet_timeCFD406[odet_n]/D");
rootTree->Branch("odet_timeCFD407",&odet_timeCFD407,"odet_timeCFD407[odet_n]/D");
rootTree->Branch("odet_timeCFD408",&odet_timeCFD408,"odet_timeCFD408[odet_n]/D");
rootTree->Branch("odet_timeCFD409",&odet_timeCFD409,"odet_timeCFD409[odet_n]/D");
rootTree->Branch("odet_timeCFD410",&odet_timeCFD410,"odet_timeCFD410[odet_n]/D");
rootTree->Branch("odet_timeCFD411",&odet_timeCFD411,"odet_timeCFD411[odet_n]/D");
rootTree->Branch("odet_timeCFD412",&odet_timeCFD412,"odet_timeCFD412[odet_n]/D");
rootTree->Branch("odet_timeCFD500",&odet_timeCFD500,"odet_timeCFD500[odet_n]/D");
rootTree->Branch("odet_timeCFD501",&odet_timeCFD501,"odet_timeCFD501[odet_n]/D");
rootTree->Branch("odet_timeCFD502",&odet_timeCFD502,"odet_timeCFD502[odet_n]/D");
rootTree->Branch("odet_timeCFD503",&odet_timeCFD503,"odet_timeCFD503[odet_n]/D");
rootTree->Branch("odet_timeCFD504",&odet_timeCFD504,"odet_timeCFD504[odet_n]/D");
rootTree->Branch("odet_timeCFD505",&odet_timeCFD505,"odet_timeCFD505[odet_n]/D");
rootTree->Branch("odet_timeCFD506",&odet_timeCFD506,"odet_timeCFD506[odet_n]/D");
rootTree->Branch("odet_timeCFD507",&odet_timeCFD507,"odet_timeCFD507[odet_n]/D");
rootTree->Branch("odet_timeCFD508",&odet_timeCFD508,"odet_timeCFD508[odet_n]/D");
rootTree->Branch("odet_timeCFD509",&odet_timeCFD509,"odet_timeCFD509[odet_n]/D");
rootTree->Branch("odet_timeCFD510",&odet_timeCFD510,"odet_timeCFD510[odet_n]/D");
rootTree->Branch("odet_timeCFD511",&odet_timeCFD511,"odet_timeCFD511[odet_n]/D");
rootTree->Branch("odet_timeCFD512",&odet_timeCFD512,"odet_timeCFD512[odet_n]/D");
}
// htest1 = new TH1F("htest1","The debugging histogram 1",50,-4.,4.);
// htest2 = new TH1F("htest2","The debugging histogram 2",50,0.,3.142);
@ -562,7 +628,74 @@ void musrRootOutput::SetOPSAinfo (G4int nDetectors, G4int ID, G4int nPhot, G4
odet_amplCFD[nDetectors]=amplCFD;
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrRootOutput::SetCFDSpecialInfo (G4int n, G4double time) {
if (n==100) {odet_timeCFD100[odet_n-1] = time/microsecond;} // G4cout<<"OKKKKK odet_n-1="<<odet_n-1<<G4endl;}
else if (n==101) {odet_timeCFD101[odet_n-1] = time/microsecond;}
else if (n==102) {odet_timeCFD102[odet_n-1] = time/microsecond;}
else if (n==103) {odet_timeCFD103[odet_n-1] = time/microsecond;}
else if (n==104) {odet_timeCFD104[odet_n-1] = time/microsecond;}
else if (n==105) {odet_timeCFD105[odet_n-1] = time/microsecond;}
else if (n==106) {odet_timeCFD106[odet_n-1] = time/microsecond;}
else if (n==107) {odet_timeCFD107[odet_n-1] = time/microsecond;}
else if (n==108) {odet_timeCFD108[odet_n-1] = time/microsecond;}
else if (n==109) {odet_timeCFD109[odet_n-1] = time/microsecond;}
else if (n==110) {odet_timeCFD110[odet_n-1] = time/microsecond;}
else if (n==111) {odet_timeCFD111[odet_n-1] = time/microsecond;}
else if (n==112) {odet_timeCFD112[odet_n-1] = time/microsecond;}
else if (n==200) {odet_timeCFD200[odet_n-1] = time/microsecond;}
else if (n==201) {odet_timeCFD201[odet_n-1] = time/microsecond;}
else if (n==202) {odet_timeCFD202[odet_n-1] = time/microsecond;}
else if (n==203) {odet_timeCFD203[odet_n-1] = time/microsecond;}
else if (n==204) {odet_timeCFD204[odet_n-1] = time/microsecond;}
else if (n==205) {odet_timeCFD205[odet_n-1] = time/microsecond;}
else if (n==206) {odet_timeCFD206[odet_n-1] = time/microsecond;}
else if (n==207) {odet_timeCFD207[odet_n-1] = time/microsecond;}
else if (n==208) {odet_timeCFD208[odet_n-1] = time/microsecond;}
else if (n==209) {odet_timeCFD209[odet_n-1] = time/microsecond;}
else if (n==210) {odet_timeCFD210[odet_n-1] = time/microsecond;}
else if (n==211) {odet_timeCFD211[odet_n-1] = time/microsecond;}
else if (n==212) {odet_timeCFD212[odet_n-1] = time/microsecond;}
else if (n==300) {odet_timeCFD300[odet_n-1] = time/microsecond;}
else if (n==301) {odet_timeCFD301[odet_n-1] = time/microsecond;}
else if (n==302) {odet_timeCFD302[odet_n-1] = time/microsecond;}
else if (n==303) {odet_timeCFD303[odet_n-1] = time/microsecond;}
else if (n==304) {odet_timeCFD304[odet_n-1] = time/microsecond;}
else if (n==305) {odet_timeCFD305[odet_n-1] = time/microsecond;}
else if (n==306) {odet_timeCFD306[odet_n-1] = time/microsecond;}
else if (n==307) {odet_timeCFD307[odet_n-1] = time/microsecond;}
else if (n==308) {odet_timeCFD308[odet_n-1] = time/microsecond;}
else if (n==309) {odet_timeCFD309[odet_n-1] = time/microsecond;}
else if (n==310) {odet_timeCFD310[odet_n-1] = time/microsecond;}
else if (n==311) {odet_timeCFD311[odet_n-1] = time/microsecond;}
else if (n==312) {odet_timeCFD312[odet_n-1] = time/microsecond;}
else if (n==400) {odet_timeCFD400[odet_n-1] = time/microsecond;}
else if (n==401) {odet_timeCFD401[odet_n-1] = time/microsecond;}
else if (n==402) {odet_timeCFD402[odet_n-1] = time/microsecond;}
else if (n==403) {odet_timeCFD403[odet_n-1] = time/microsecond;}
else if (n==404) {odet_timeCFD404[odet_n-1] = time/microsecond;}
else if (n==405) {odet_timeCFD405[odet_n-1] = time/microsecond;}
else if (n==406) {odet_timeCFD406[odet_n-1] = time/microsecond;}
else if (n==407) {odet_timeCFD407[odet_n-1] = time/microsecond;}
else if (n==408) {odet_timeCFD408[odet_n-1] = time/microsecond;}
else if (n==409) {odet_timeCFD409[odet_n-1] = time/microsecond;}
else if (n==410) {odet_timeCFD410[odet_n-1] = time/microsecond;}
else if (n==411) {odet_timeCFD411[odet_n-1] = time/microsecond;}
else if (n==412) {odet_timeCFD412[odet_n-1] = time/microsecond;}
else if (n==500) {odet_timeCFD500[odet_n-1] = time/microsecond;}
else if (n==501) {odet_timeCFD501[odet_n-1] = time/microsecond;}
else if (n==502) {odet_timeCFD502[odet_n-1] = time/microsecond;}
else if (n==503) {odet_timeCFD503[odet_n-1] = time/microsecond;}
else if (n==504) {odet_timeCFD504[odet_n-1] = time/microsecond;}
else if (n==505) {odet_timeCFD505[odet_n-1] = time/microsecond;}
else if (n==506) {odet_timeCFD506[odet_n-1] = time/microsecond;}
else if (n==507) {odet_timeCFD507[odet_n-1] = time/microsecond;}
else if (n==508) {odet_timeCFD508[odet_n-1] = time/microsecond;}
else if (n==509) {odet_timeCFD509[odet_n-1] = time/microsecond;}
else if (n==510) {odet_timeCFD510[odet_n-1] = time/microsecond;}
else if (n==511) {odet_timeCFD511[odet_n-1] = time/microsecond;}
else if (n==512) {odet_timeCFD512[odet_n-1] = time/microsecond;}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void musrRootOutput::setRootOutputDirectoryName(char dirName[1000]) {