7.2.2011 Kamil Sedlak
1) Constant fraction discriminator added to the analysis of the optical photon signal. 2) Bug fixes in the optical photon simulation. 3) A few other small improvements.
This commit is contained in:
@ -645,21 +645,21 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
G4cout<<"ERROR! musrDetectorConstruction::Construct(): Optical type \""<<type<<"\" not found!"<<G4endl;
|
||||
G4cout<<" (Maybe it exists in Geant4 but was not added to musrSim ==> update musrDetectorConstruction.cc file!)"<< G4endl;
|
||||
G4cout << " ==> S T O P F O R C E D"<<G4endl;
|
||||
G4cout<<" "<<line;
|
||||
G4cout<<" "<<line<<G4endl;
|
||||
exit(1);
|
||||
}
|
||||
if ((OpticalModel==0)&&(strcmp(model,"glisur")!=0)) {
|
||||
G4cout<<"ERROR! musrDetectorConstruction::Construct(): Optical surface model \""<<model<<"\" not found!"<<G4endl;
|
||||
G4cout<<" (Maybe it exists in Geant4 but was not added to musrSim ==> update musrDetectorConstruction.cc file!)"<< G4endl;
|
||||
G4cout << " ==> S T O P F O R C E D"<<G4endl;
|
||||
G4cout<<" "<<line;
|
||||
G4cout<<" "<<line<<G4endl;
|
||||
exit(1);
|
||||
}
|
||||
if ((OpticalFinish==0)&&(strcmp(finish,"polished")!=0)) {
|
||||
G4cout<<"ERROR! musrDetectorConstruction::Construct(): Optical surface finish \""<<finish<<"\" not found!"<<G4endl;
|
||||
G4cout<<" (Maybe it exists in Geant4 but was not added to musrSim ==> update musrDetectorConstruction.cc file!)"<< G4endl;
|
||||
G4cout << " ==> S T O P F O R C E D"<<G4endl;
|
||||
G4cout<<" "<<line;
|
||||
G4cout<<" "<<line<<G4endl;
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@ -726,6 +726,16 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
sscanf(&line[0],"%*s %*s %*s %d %lf %lf",&nBins,&min,&max);
|
||||
myMusrScintSD -> SetOPSAhistoBinning(nBins,min*nanosecond,max*nanosecond);
|
||||
}
|
||||
else if (strcmp(varName,"pulseShapeArray")==0) {
|
||||
char fileName[500];
|
||||
sscanf(&line[0],"%*s %*s %*s %s",fileName);
|
||||
myMusrScintSD -> ReadInPulseShapeArray(fileName);
|
||||
}
|
||||
else if (strcmp(varName,"CFD")==0) {
|
||||
double a1, delay, timeShiftOffset;
|
||||
sscanf(&line[0],"%*s %*s %*s %lf %lf %lf",&a1,&delay,&timeShiftOffset);
|
||||
myMusrScintSD -> Set_OPSA_CFD(a1,delay,timeShiftOffset);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -922,6 +932,14 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
}
|
||||
|
||||
|
||||
else if (strcmp(tmpString1,"rootOutputDirectoryName")==0){
|
||||
char rootOutDirName[1000];
|
||||
sscanf(&line[0],"%*s %*s %s",rootOutDirName);
|
||||
// Cut out the character '/' at the end of the directory name, if it was specified in the name
|
||||
if (rootOutDirName[strlen(rootOutDirName)-1]=='/') rootOutDirName[strlen(rootOutDirName)-1]='\0';
|
||||
myRootOutput->setRootOutputDirectoryName(rootOutDirName);
|
||||
}
|
||||
|
||||
else if (strcmp(tmpString1,"storeOnlyEventsWithHitInDetID")==0){
|
||||
G4int variable;
|
||||
sscanf(&line[0],"%*s %*s %d",&variable);
|
||||
|
Reference in New Issue
Block a user