21.1.2011 Kamil Sedlak
This version contains many changes! 1) Optical photon simulation is now possible - some work still may need to be done (e.g. the manual is not updated yet), but it should basically work already now. 2) Changes in the musrSimAna - correction of some bugs (mainly in the coincidence of coincidence and veto detectors) and some other improvements
This commit is contained in:
@ -79,6 +79,9 @@ class musrRootOutput {
|
||||
G4double ekVertex, G4double xVertex, G4double yVertex, G4double zVertex,
|
||||
G4int idVolVertex, G4int idProcVertex, G4int idTrackVertex, G4int particleID) ;
|
||||
|
||||
void SetOPSAinfo (G4int nDetectors, G4int ID, G4int nPhot, G4double timeFirst, G4double timeA,
|
||||
G4double timeB, G4double timeC, G4double timeD, G4double timeE, G4double timeLast);
|
||||
|
||||
void SetSaveDetectorInfo (G4int ID, G4int particleID, G4double ke, G4double x, G4double y, G4double z, G4double time,
|
||||
G4double px, G4double py, G4double pz, G4double polx, G4double poly, G4double polz) ;
|
||||
|
||||
@ -208,7 +211,15 @@ class musrRootOutput {
|
||||
static G4bool store_fieldIntegralBz1;
|
||||
static G4bool store_fieldIntegralBz2;
|
||||
static G4bool store_fieldIntegralBz3;
|
||||
|
||||
static G4bool store_odet_ID;
|
||||
static G4bool store_odet_nPhot;
|
||||
static G4bool store_odet_timeFirst;
|
||||
static G4bool store_odet_timeA;
|
||||
static G4bool store_odet_timeB;
|
||||
static G4bool store_odet_timeC;
|
||||
static G4bool store_odet_timeD;
|
||||
static G4bool store_odet_timeE;
|
||||
static G4bool store_odet_timeLast;
|
||||
|
||||
static G4int oldEventNumberInG4EqEMFieldWithSpinFunction;
|
||||
|
||||
@ -299,6 +310,21 @@ class musrRootOutput {
|
||||
G4int det_VvvTrackID[det_nMax];
|
||||
G4int det_VvvParticleID[det_nMax];
|
||||
|
||||
public:
|
||||
static const Int_t odet_nMax=det_nMax;
|
||||
|
||||
private:
|
||||
G4int odet_n;
|
||||
G4int odet_ID[odet_nMax];
|
||||
G4int odet_nPhot[odet_nMax];
|
||||
G4double odet_timeFirst[odet_nMax];
|
||||
G4double odet_timeA[odet_nMax];
|
||||
G4double odet_timeB[odet_nMax];
|
||||
G4double odet_timeC[odet_nMax];
|
||||
G4double odet_timeD[odet_nMax];
|
||||
G4double odet_timeE[odet_nMax];
|
||||
G4double odet_timeLast[odet_nMax];
|
||||
|
||||
public:
|
||||
static const Int_t save_nMax=1000;
|
||||
|
||||
|
Reference in New Issue
Block a user