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:
@ -73,6 +73,7 @@ class musrPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
|
||||
void SetTurtleInput(G4String turtleFileName);
|
||||
void SetTurtleInputFileToEventNo(G4int lineNumberOfTurtleFile);
|
||||
void SetTurtleZ0(G4double val) {z0_InitialTurtle=val;}
|
||||
void SetTurtleInterpretAxes(G4String interpretAxes){turtleInterpretAxes=interpretAxes;}
|
||||
void SetOrReadTheRandomNumberSeeds(G4int eventID);
|
||||
void SetTurtleMomentumBite (G4ThreeVector smearingParam)
|
||||
{turtleMomentumBite=true; turtleMomentumP0=smearingParam[0]*MeV; turtleSmearingFactor=smearingParam[1]*0.01;}
|
||||
@ -85,7 +86,8 @@ class musrPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
|
||||
musrDetectorConstruction* musrDetector; // pointer to the geometry
|
||||
|
||||
musrPrimaryGeneratorMessenger* gunMessenger; // messenger of this class
|
||||
G4String rndmFlag; // flag for a random impact point
|
||||
G4String rndmFlag; // flag for a random impact point
|
||||
G4String turtleInterpretAxes; // specifies how to intrpret the TURTLE position axes x, y and z
|
||||
|
||||
// cks delete G4ParticleDefinition* muonMinusParticle;
|
||||
// cks Alpha and proton particles implemented for the simulation of Juan Pablo Urrego
|
||||
@ -114,6 +116,7 @@ class musrPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
|
||||
G4bool turtleMomentumBite;
|
||||
G4double turtleMomentumP0;
|
||||
G4double turtleSmearingFactor;
|
||||
void swapTheAxisInTurtle(float& x_x, float& x_xprime, float& y_y, float& y_yprime);
|
||||
|
||||
public:
|
||||
static G4bool setRandomNrSeedAccordingEventNr;
|
||||
|
Reference in New Issue
Block a user