11.2.2011 Kamil Sedlak
1) correction of GNUmakefile - by mistake a musrSimTest was set there instead of musrSim 2) replacing odet_timeE variable by odet_timeMean 3) replacing one obsolete method from stepping action (Geant 4.9.4 was complaining) by a proper method 4) update of the first part of the documentation 5) implementing a possibility to write out output Root data into a different directory 6) perhaps some other minor changes
This commit is contained in:
@ -78,12 +78,14 @@ 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, G4double e)
|
||||
{OPSA_fracA=a; OPSA_fracB=b; OPSA_fracC=c; OPSA_fracD=d; OPSA_fracE=e;}
|
||||
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_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) {
|
||||
bool_multimapOfEventIDsForOPSAhistosEXISTS=true;
|
||||
bool_multimapOfEventIDsForOPSAhistosEXISTS=true;
|
||||
if (ev_ID==-1) bool_StoreThisOPSAhistSUMMED = true;
|
||||
if (ev_ID==-2) bool_StoreThisOPSAhistALL = true;
|
||||
multimapOfEventIDsForOPSAhistos.insert(std::pair<G4int,G4int>(ev_ID,detector_ID));
|
||||
}
|
||||
void SetOPSAhistoBinning(Int_t nBins, Double_t min, Double_t max) {
|
||||
@ -115,11 +117,12 @@ class musrScintSD : public G4VSensitiveDetector
|
||||
G4double OPSA_fracB;
|
||||
G4double OPSA_fracC;
|
||||
G4double OPSA_fracD;
|
||||
G4double OPSA_fracE;
|
||||
typedef std::multimap<G4int,signalInfo*> OPSA_signal_MapType;
|
||||
OPSA_signal_MapType OPSA_signal_Map;
|
||||
|
||||
G4bool bool_multimapOfEventIDsForOPSAhistosEXISTS;
|
||||
G4bool bool_StoreThisOPSAhistSUMMED;
|
||||
G4bool bool_StoreThisOPSAhistALL;
|
||||
typedef std::multimap<G4int,G4int> multimapOfEventIDsForOPSAhistos_Type;
|
||||
multimapOfEventIDsForOPSAhistos_Type multimapOfEventIDsForOPSAhistos;
|
||||
TH1D* OPSAhisto;
|
||||
|
Reference in New Issue
Block a user