23.2.2010 Kamil Sedlak

1) changed treatment for the odet_timeCFD determination
  2) changed definition of odet_timeC and odet_timeD
  3) corrected bug in execution time calculation for randomOption 3
  4) corrected bug in eventID setting when randomOption=3
This commit is contained in:
2011-02-23 15:22:19 +00:00
parent 1ccd56485e
commit 2eb7e764d9
7 changed files with 79 additions and 29 deletions

View File

@ -78,8 +78,8 @@ class musrScintSD : public G4VSensitiveDetector
// Optical Photon Signal Analysis (OPSA)
void Set_OPSA_minNrOfDetectedPhotons(G4int val) {OPSA_minNrOfDetectedPhotons=val;}
void Set_OPSA_SignalSeparationTime(G4double val) {OPSA_signalSeparationTime=val;}
void Set_OPSA_frac(G4double a, G4double b, G4double c, G4double d)
{OPSA_fracA=a; OPSA_fracB=b; OPSA_fracC=c; OPSA_fracD=d;}
void Set_OPSA_variables(G4double a, G4double b, G4double c, G4double d)
{OPSA_fracA=a; OPSA_fracB=b; OPSA_C_threshold=c; OPSA_D_threshold=d;}
void Set_OPSA_CFD(G4double a1, G4double delay, G4double timeShiftOffset)
{OPSA_CFD_a1=a1; OPSA_CFD_delay=delay; OPSA_CFD_timeShiftOffset = timeShiftOffset;}
void AddEventIDToMultimapOfEventIDsForOPSAhistos (G4int ev_ID, G4int detector_ID) {
@ -115,8 +115,8 @@ class musrScintSD : public G4VSensitiveDetector
G4double OPSA_signalSeparationTime;
G4double OPSA_fracA;
G4double OPSA_fracB;
G4double OPSA_fracC;
G4double OPSA_fracD;
G4double OPSA_C_threshold;
G4double OPSA_D_threshold;
typedef std::multimap<G4int,signalInfo*> OPSA_signal_MapType;
OPSA_signal_MapType OPSA_signal_Map;