11.20.2009. - Kamil Sedlak
This svn update includes several smaller corrections and updates accumulated over last few months: 1) For the Geant4.9.2 it was necessary to remove the privately modified file src/G4EqEMFieldWithSpin.cc. Our corrections in this file (and also in the file src/G4DecayWithSpin.cc) were adopted by the Geant developers into the official Geant code, and therefore these two files were deleted. However, if one uses older version of Geant (i.e. Geant4.9.1 or older), one should rename the G4EqEMFieldWithSpin.cc_for_Geant4.9.1_and_older in his/her src directory to G4EqEMFieldWithSpin.cc to correct for a Geant bug. 2) Implementation of save_polx, save_poly and save_polz variables 3) Implementation of the field map normalisation within the field map itself (was already possible for the field-map formats generated by Toni, now it is extended also for the field maps generated by OPERA). 4) Possibility to swap and invert x and y axis read out from the TURTLE file. 5) Perhaps some other tiny changes
This commit is contained in:
@ -79,7 +79,7 @@ class musrRootOutput {
|
||||
G4int idVolVertex, G4int idProcVertex, G4int idTrackVertex, G4int particleID) ;
|
||||
|
||||
void SetSaveDetectorInfo (G4int ID, G4int particleID, G4double ke, G4double x, G4double y, G4double z,
|
||||
G4double px, G4double py, G4double pz) ;
|
||||
G4double px, G4double py, G4double pz, G4double polx, G4double poly, G4double polz) ;
|
||||
|
||||
void SetInitialMuonParameters(G4double x, G4double y, G4double z, G4double px, G4double py, G4double pz,
|
||||
G4double xpolaris, G4double ypolaris, G4double zpolaris, G4double particleTime) {
|
||||
@ -98,6 +98,7 @@ class musrRootOutput {
|
||||
|
||||
void SetPolInTarget(G4ThreeVector pol) {muTargetPolX_t=pol.x(); muTargetPolY_t=pol.y(); muTargetPolZ_t=pol.z();};
|
||||
void SetTimeInTarget(G4double time) {muTargetTime_t = time/microsecond;};
|
||||
void SetMomentumInTarget(G4ThreeVector mom) {muTargetMomX_t=(mom.x())/MeV; muTargetMomY_t=(mom.y())/MeV; muTargetMomZ_t=(mom.z())/MeV;};
|
||||
void SetPolInM0(G4ThreeVector pol) {muM0PolX_t=pol.x(); muM0PolY_t=pol.y(); muM0PolZ_t=pol.z();};
|
||||
void SetTimeInM0(G4double time) {muM0Time_t = time/microsecond;};
|
||||
void SetPolInM1(G4ThreeVector pol) {muM1PolX_t=pol.x(); muM1PolY_t=pol.y(); muM1PolZ_t=pol.z();};
|
||||
@ -150,6 +151,9 @@ class musrRootOutput {
|
||||
static G4bool store_muTargetPolX;
|
||||
static G4bool store_muTargetPolY;
|
||||
static G4bool store_muTargetPolZ;
|
||||
static G4bool store_muTargetMomX;
|
||||
static G4bool store_muTargetMomY;
|
||||
static G4bool store_muTargetMomZ;
|
||||
static G4bool store_muM0Time;
|
||||
static G4bool store_muM0PolX;
|
||||
static G4bool store_muM0PolY;
|
||||
@ -234,6 +238,7 @@ class musrRootOutput {
|
||||
Int_t muDecayDetID_t;
|
||||
Double_t muDecayPolX_t, muDecayPolY_t, muDecayPolZ_t;
|
||||
Double_t muTargetTime_t, muTargetPolX_t, muTargetPolY_t, muTargetPolZ_t;
|
||||
Double_t muTargetMomX_t, muTargetMomY_t, muTargetMomZ_t;
|
||||
Double_t muM0Time_t, muM0PolX_t, muM0PolY_t, muM0PolZ_t;
|
||||
Double_t muM1Time_t, muM1PolX_t, muM1PolY_t, muM1PolZ_t;
|
||||
Double_t muM2Time_t, muM2PolX_t, muM2PolY_t, muM2PolZ_t;
|
||||
@ -292,7 +297,7 @@ class musrRootOutput {
|
||||
G4int det_VvvParticleID[det_nMax];
|
||||
|
||||
public:
|
||||
static const Int_t save_nMax=2000;
|
||||
static const Int_t save_nMax=1000;
|
||||
|
||||
private:
|
||||
G4int save_n;
|
||||
@ -305,6 +310,9 @@ class musrRootOutput {
|
||||
G4double save_px[save_nMax];
|
||||
G4double save_py[save_nMax];
|
||||
G4double save_pz[save_nMax];
|
||||
G4double save_polx[save_nMax];
|
||||
G4double save_poly[save_nMax];
|
||||
G4double save_polz[save_nMax];
|
||||
|
||||
G4bool boolIsAnySpecialSaveVolumeDefined;
|
||||
|
||||
|
Reference in New Issue
Block a user