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:
parent
d05e77dbe5
commit
b5594b4513
BIN
doc/musrSim.pdf
BIN
doc/musrSim.pdf
Binary file not shown.
@ -321,8 +321,28 @@ Three special volumes ``Target, M0, M1 and M2''.
|
||||
(compact format).\\
|
||||
{\bf 3DBOpera} -- 3D magnetic field in the form of OPERA output.
|
||||
It is expected that the \emph{length unit} is 1\,m, and
|
||||
the \emph{field normalisation factor} is 1. (Note that this is
|
||||
different from 2DBOpera and 2DBOperaXY options).\\
|
||||
the \emph{field normalisation factor} is 1. (Note that this default
|
||||
normalisation is different from 2DBOpera and 2DBOperaXY options).
|
||||
However, a different \emph{field normalisation factor} can be specified
|
||||
in the field map using the keyword ``fieldNormalisation \emph{number}''
|
||||
before the line started with 0.\\
|
||||
Example of the beginning of the field map file:\\
|
||||
2 2 55\\
|
||||
1 X\\
|
||||
2 Y\\
|
||||
3 Z\\
|
||||
4 BX\\
|
||||
5 BY\\
|
||||
6 BZ\\
|
||||
7 DUMMY\\
|
||||
fieldNormalisation -22.5733634\\
|
||||
0 [METRE]\\
|
||||
-0.2 -0.2 -1.35 0. 0. 0. 0.\\
|
||||
-0.2 -0.2 -1.30 0. -0.0002 0. 0.\\
|
||||
-0.2 -0.2 -1.25 0. -0.0002 0. 0.\\
|
||||
-0.2 -0.2 -1.20 0. -0.005 0. 0.\\
|
||||
...\\
|
||||
|
||||
{\bf 2DB, 2DE} -- magnetic or electric field specified in $R$ and $z$
|
||||
coordinate system. The first line of the file has to contain
|
||||
the information about \emph{nR, nz, length unit} and
|
||||
@ -334,8 +354,10 @@ Three special volumes ``Target, M0, M1 and M2''.
|
||||
values.\\
|
||||
{\bf 2DBOpera} -- 2D magnetic field in the form of OPERA output.
|
||||
It is expected that the \emph{length unit} is 1\,cm, and
|
||||
the \emph{field normalisation factor} is 0.00001 (Note that this is
|
||||
different from 3DBOpera option).
|
||||
the \emph{field normalisation factor} is 0.00001 (Note that this default
|
||||
normalisation is different from 3DBOpera option).
|
||||
See example of {\bf 3DBOpera} for the usage of keyword
|
||||
``fieldNormalisation \emph{number}''.
|
||||
The data in the field map OPERA file are ordered as
|
||||
\emph{R, dummy, z, Field\_R, Field\_z, dummy}\\
|
||||
{\bf 2DBOperaXY} -- same as 2DBOpera except that the
|
||||
@ -357,7 +379,8 @@ Three special volumes ``Target, M0, M1 and M2''.
|
||||
\emph{halfLength} \emph{fieldRadius} \emph{fringeFactor} \emph{logicalVolume}
|
||||
\emph{gradientValue} \emph{[gradientValueFinal]} \emph{[gradientNrOfSteps]} }\\
|
||||
Set up the field of a quadrupole magnet including the Enge function approximation of the
|
||||
fringe fields. The description is similar to the uniform field and to the tabulated fields.
|
||||
fringe fields. The unit of \emph{gradientValue} is T/m.
|
||||
The description is similar to the uniform field and to the tabulated fields.
|
||||
See ``musrDetectorConstruction.cc'' and ``BLEngeFunction.hh'' for the details.
|
||||
|
||||
\item{\bf /musr/command globalfield setparameter \emph{parameterName} \emph{parameterValue} }\\
|
||||
@ -556,6 +579,13 @@ Three special volumes ``Target, M0, M1 and M2''.
|
||||
quadrupole of a beam-pipe, and in the simulation the edge of the last quadrupole corresponds
|
||||
to 100\,cm, than the \emph{z0\_InitialTurtle} should be also set to 100\,cm.\\
|
||||
|
||||
\item{\bf /gun/turtleInterpretAxes \emph{axesWithSign}}\\
|
||||
Normally it is expected that the coordinates in TURTLE are x, xprime, y and yprime.
|
||||
One can specify whether the x and y axes of the position in TURTLE should be interpretted differently.
|
||||
The following options are supported for \emph{axesWithSign}: x-y, -xy, -x-y, yx, y-x, -yx, -y-x .\\
|
||||
Example: the option y-x means that first four coordinates in the TURTLE input file
|
||||
are interpreded as y, yprime, -x, -xprime.
|
||||
|
||||
\item{\bf /gun/turtleMomentumBite \emph{turtleMomentumP0} \emph{turtleSmearingFactor} \emph{dummy} }\\
|
||||
Modify the smearing of the momentum bite specified in the TURTLE input file.
|
||||
Normally the muon momentum is defined already in the TURTLE input file. This command allows the user
|
||||
@ -836,6 +866,8 @@ The list of variables that can be stored in the Root tree:
|
||||
entered the save volume (``GetPreStepPoint()'') (in mm).
|
||||
\item{\bf save\_px[save\_n], save\_py[save\_n], save\_pz[save\_n]} (array of Double\_t) -- momentum of the particle when it
|
||||
entered the save volume (in MeV/c).
|
||||
\item{\bf save\_polx[save\_n], save\_poly[save\_n], save\_polz[save\_n]} (array of Double\_t) -- polarisation of the particle when it
|
||||
entered the save volume.
|
||||
\item{\bf save\_ke[save\_n]} (array of Double\_t) -- kinetic energy of the particle when it
|
||||
entered the save volume (in MeV).
|
||||
\end{description}
|
||||
|
||||
@ -64,6 +64,9 @@ class musrPhysicsList: public G4VUserPhysicsList
|
||||
void ReportProblemWithProcessDefinition(char myString[501]);
|
||||
G4Region* FindG4Region(G4String regionName, char* lineOfSteeringFile);
|
||||
char eMessage[200];
|
||||
G4double cutForGamma;
|
||||
G4double cutForElectron;
|
||||
G4double cutForMuon;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -65,6 +65,7 @@ class musrPrimaryGeneratorMessenger: public G4UImessenger
|
||||
G4UIcmdWith3VectorAndUnit* setMuonDecayTimeCmd;
|
||||
G4UIcmdWithAString* setTurtleCmd;
|
||||
G4UIcmdWithADoubleAndUnit* setTurtleZ0Cmd;
|
||||
G4UIcmdWithAString* setTurtleInterpretAxesCmd;
|
||||
G4UIcmdWith3Vector* setTurtleMomentumBite;
|
||||
G4UIcmdWithAnInteger* setTurtleEventNrCmd;
|
||||
};
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -462,6 +462,8 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
if ((strcmp(name,"Target")==0)||(strcmp(name,"target")==0)) {
|
||||
musrRootOutput::store_muTargetTime = true; musrRootOutput::store_muTargetPolX = true;
|
||||
musrRootOutput::store_muTargetPolY = true; musrRootOutput::store_muTargetPolZ = true;
|
||||
musrRootOutput::store_muTargetMomX = true;
|
||||
musrRootOutput::store_muTargetMomY = true; musrRootOutput::store_muTargetMomZ = true;
|
||||
}
|
||||
if ((strcmp(name,"M0")==0)||(strcmp(name,"m0")==0)) {
|
||||
musrRootOutput::store_muM0Time = true; musrRootOutput::store_muM0PolX = true;
|
||||
@ -577,7 +579,7 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
|
||||
else if (strcmp(typeOfField,"quadrupole")==0) {
|
||||
float halfLength, fieldRadius, gradientValue, gradientValueFinal, fringeFactor;
|
||||
int gradientNrOfSteps;
|
||||
int gradientNrOfSteps = 0;
|
||||
char logicalVolumeName[100];
|
||||
sscanf(&line[0],"%*s %*s %*s %*g %*g %*g %*s %g %g %g %s %g %g %d",&halfLength,&fieldRadius,&fringeFactor,logicalVolumeName,
|
||||
&gradientValue,&gradientValueFinal,&gradientNrOfSteps);
|
||||
@ -676,7 +678,7 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
G4LogicalVolume* pLogVol = FindLogicalVolume(tmpString2);
|
||||
if (pLogVol==NULL) {
|
||||
G4cout << "ERROR! musrDetectorConstruction::Construct(): SetUserLimits: Logical Volume \""
|
||||
<< tmpString3 <<"\" not found!"<<G4endl<<"S T O P F O R C E D"<<G4endl;
|
||||
<< tmpString2 <<"\" not found!"<<G4endl<<"S T O P F O R C E D"<<G4endl;
|
||||
ReportGeometryProblem(line);
|
||||
}
|
||||
// float maxStep, ;
|
||||
@ -871,6 +873,9 @@ G4VPhysicalVolume* musrDetectorConstruction::Construct() {
|
||||
if (strcmp(tmpString2,"muTargetPolX")==0) {musrRootOutput::store_muTargetPolX = false;}
|
||||
if (strcmp(tmpString2,"muTargetPolY")==0) {musrRootOutput::store_muTargetPolY = false;}
|
||||
if (strcmp(tmpString2,"muTargetPolZ")==0) {musrRootOutput::store_muTargetPolZ = false;}
|
||||
if (strcmp(tmpString2,"muTargetMomX")==0) {musrRootOutput::store_muTargetMomX = false;}
|
||||
if (strcmp(tmpString2,"muTargetMomY")==0) {musrRootOutput::store_muTargetMomY = false;}
|
||||
if (strcmp(tmpString2,"muTargetMomZ")==0) {musrRootOutput::store_muTargetMomZ = false;}
|
||||
if (strcmp(tmpString2,"muM0Time")==0) {musrRootOutput::store_muM0Time = false;}
|
||||
if (strcmp(tmpString2,"muM0PolX")==0) {musrRootOutput::store_muM0PolX = false;}
|
||||
if (strcmp(tmpString2,"muM0PolY")==0) {musrRootOutput::store_muM0PolY = false;}
|
||||
|
||||
@ -51,6 +51,9 @@
|
||||
musrPhysicsList::musrPhysicsList(): G4VUserPhysicsList()
|
||||
{
|
||||
defaultCutValue = 0.1*mm;
|
||||
cutForGamma = 0.1*mm;
|
||||
cutForElectron = 0.1*mm;
|
||||
cutForMuon = 0.01*mm;
|
||||
SetVerboseLevel(0);
|
||||
}
|
||||
|
||||
@ -248,6 +251,7 @@ void musrPhysicsList::ConstructEM()
|
||||
if ( (strcmp(tmpString0,"/musr/ignore")!=0)&&(strcmp(tmpString0,"/musr/command")!=0) ) continue;
|
||||
if (strcmp(tmpString1,"process")!=0) continue;
|
||||
|
||||
float tmpCutValue;
|
||||
if ((strcmp(tmpString2,"addProcess")==0)||(strcmp(tmpString2,"addDiscreteProcess")==0)) {
|
||||
char charParticleName[100], charProcessName[100];
|
||||
sscanf(&line[0],"%*s %*s %s %s %s",tmpString2,charParticleName,charProcessName);
|
||||
@ -346,6 +350,23 @@ void musrPhysicsList::ConstructEM()
|
||||
}
|
||||
}
|
||||
|
||||
else if (strcmp(tmpString2,"cutForGamma")==0) {
|
||||
sscanf(&line[0],"%*s %*s %*s %g",&tmpCutValue);
|
||||
cutForGamma = tmpCutValue;
|
||||
}
|
||||
|
||||
else if (strcmp(tmpString2,"cutForElectron")==0) {
|
||||
sscanf(&line[0],"%*s %*s %*s %g",&tmpCutValue);
|
||||
cutForElectron = tmpCutValue;
|
||||
}
|
||||
|
||||
//cks UNFORTUNATELY cutForMuon does not work!!!
|
||||
// else if (strcmp(tmpString2,"cutForMuon")==0) {
|
||||
// sscanf(&line[0],"%*s %*s %*s %g",&tmpCutValue);
|
||||
// cutForMuon = tmpCutValue;
|
||||
// }
|
||||
|
||||
|
||||
else ReportProblemWithProcessDefinition(line);
|
||||
}
|
||||
}
|
||||
@ -440,7 +461,20 @@ void musrPhysicsList::SetCuts()
|
||||
//G4VUserPhysicsList::SetCutsWithDefault method sets
|
||||
//the default cut value for all particle types
|
||||
//
|
||||
SetCutsWithDefault();
|
||||
//cks 6.10.2009 SetCutsWithDefault();
|
||||
|
||||
// set cut values for gamma at first and for e- second and next for e+,
|
||||
// because some processes for e+/e- need cut values for gamma
|
||||
SetCutValue(cutForGamma, "gamma");
|
||||
SetCutValue(cutForElectron, "e-");
|
||||
SetCutValue(cutForElectron, "e+");
|
||||
//cks - This command does not work for muons: SetCutValue(cutForMuon, "mu-");
|
||||
//cks - This command does not work for muons: SetCutValue(cutForMuon, "mu+");
|
||||
|
||||
// G4cout<<"Kamil: cutForGamma = "<<cutForGamma/mm<<" mm"<<G4endl;
|
||||
// G4cout<<"Kamil: cutForElectron = "<<cutForElectron/mm<<" mm"<<G4endl;
|
||||
// G4cout<<"Kamil: cutForMuons = "<<cutForMuon/mm<<" mm"<<G4endl;
|
||||
|
||||
|
||||
if (verboseLevel>0) DumpCutValuesTable();
|
||||
DumpCutValuesTable();
|
||||
|
||||
@ -82,6 +82,7 @@ musrPrimaryGeneratorAction::musrPrimaryGeneratorAction(
|
||||
// cks Implement also alpha and proton particles for the simulation of Juan Pablo Urrego
|
||||
alphaParticle= particleTable->FindParticle("alpha");
|
||||
protonParticle= particleTable->FindParticle("proton");
|
||||
turtleInterpretAxes="undefined";
|
||||
// csk
|
||||
|
||||
G4int n_particle = 1;
|
||||
@ -149,6 +150,7 @@ void musrPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
|
||||
}
|
||||
numberOfGeneratedEvents++;
|
||||
sscanf(&line[0],"%g %g %g %g %g %g %g %d %d",&xTmp,&xAngleTmp,&yTmp,&yAngleTmp,&pTmp,&dummy1,&dummy2,&Ztmp,&Atmp);
|
||||
if (turtleInterpretAxes!="undefined") swapTheAxisInTurtle(xTmp,xAngleTmp,yTmp,yAngleTmp);
|
||||
if (boolPrintInfoAboutGeneratedParticles) {
|
||||
G4cout<<"musrPrimaryGeneratorAction::GeneratePrimaries: Turtle input for this event: "
|
||||
<<xTmp<<", "<<xAngleTmp<<" "<<yTmp<<" "<<yAngleTmp<<" "<< pTmp<<G4endl;
|
||||
@ -475,3 +477,38 @@ void musrPrimaryGeneratorAction::SetPrimaryParticule(G4String particleName) {
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
//===============================================================================
|
||||
void musrPrimaryGeneratorAction::swapTheAxisInTurtle(float& x_x, float& x_xprime ,float& y_y, float& y_yprime) {
|
||||
// G4cout<<"turtleInterpretAxes = "<<turtleInterpretAxes<<G4endl;
|
||||
if (turtleInterpretAxes=="-xy") {
|
||||
x_x = -x_x; x_xprime = -x_xprime;
|
||||
}
|
||||
else if (turtleInterpretAxes=="x-y") {
|
||||
y_y = -y_y; y_yprime = -y_yprime;
|
||||
}
|
||||
else if (turtleInterpretAxes=="-x-y") {
|
||||
x_x = -x_x; x_xprime = -x_xprime; y_y = -y_y; y_yprime = -y_yprime;
|
||||
}
|
||||
else if (turtleInterpretAxes=="yx") {
|
||||
float tmpX = x_x; float tmpXprime = x_xprime;
|
||||
x_x = y_y; x_xprime = y_yprime; y_y = tmpX; y_yprime = tmpXprime;
|
||||
}
|
||||
else if (turtleInterpretAxes=="-yx") {
|
||||
float tmpX = x_x; float tmpXprime = x_xprime;
|
||||
x_x = y_y; x_xprime = y_yprime; y_y = -tmpX; y_yprime = -tmpXprime;
|
||||
}
|
||||
else if (turtleInterpretAxes=="y-x") {
|
||||
float tmpX = x_x; float tmpXprime = x_xprime;
|
||||
x_x = -y_y; x_xprime = -y_yprime; y_y = tmpX; y_yprime = tmpXprime;
|
||||
}
|
||||
else if (turtleInterpretAxes=="-y-x") {
|
||||
float tmpX = x_x; float tmpXprime = x_xprime;
|
||||
x_x = -y_y; x_xprime = -y_yprime; y_y = -tmpX; y_yprime = -tmpXprime;
|
||||
}
|
||||
else {
|
||||
G4cout<<"musrPrimaryGeneratorAction::swapTheAxisInTurtle: Not known how to inpterpret turtleInterpretAxes="<<turtleInterpretAxes<<G4endl;
|
||||
G4cout<<"S T O P F O R C E D" << G4endl;
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -130,6 +130,13 @@ musrPrimaryGeneratorMessenger::musrPrimaryGeneratorMessenger(musrPrimaryGenerato
|
||||
setTurtleZ0Cmd->SetParameterName("mes_z0Turtle",true);
|
||||
setTurtleZ0Cmd->SetDefaultUnit("mm");
|
||||
|
||||
setTurtleInterpretAxesCmd = new G4UIcmdWithAString("/gun/turtleInterpretAxes",this);
|
||||
setTurtleInterpretAxesCmd->SetGuidance("Specify whether the x and y axes of the position in TURTLE should be interpretted differently.");
|
||||
setTurtleInterpretAxesCmd->SetGuidance("The following options are supported: x-y, -xy, -x-y, yx, y-x, -yx, -y-x .");
|
||||
setTurtleInterpretAxesCmd->SetGuidance("Example: the option y-x means that first four coordinates in the TURTLE input file");
|
||||
setTurtleInterpretAxesCmd->SetGuidance(" are interpreded as y, yprime, -x, -xprime.");
|
||||
setTurtleInterpretAxesCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
|
||||
|
||||
setTurtleMomentumBite = new G4UIcmdWith3Vector("/gun/turtleMomentumBite",this);
|
||||
setTurtleMomentumBite->SetGuidance(" Modify smearing of the turtle momentum bite. The first value is the mean momentum in MeV/c,");
|
||||
setTurtleMomentumBite->SetGuidance(" the second value is the smearing factor in per cent, by which the momentum bite,");
|
||||
@ -168,6 +175,7 @@ musrPrimaryGeneratorMessenger::~musrPrimaryGeneratorMessenger()
|
||||
delete setMuonDecayTimeCmd;
|
||||
delete setTurtleCmd;
|
||||
delete setTurtleZ0Cmd;
|
||||
delete setTurtleInterpretAxesCmd;
|
||||
delete setTurtleMomentumBite;
|
||||
delete setTurtleEventNrCmd;
|
||||
}
|
||||
@ -212,6 +220,8 @@ void musrPrimaryGeneratorMessenger::SetNewValue(G4UIcommand * command,G4String n
|
||||
{ musrAction->SetTurtleInput(newValue); }
|
||||
if( command == setTurtleZ0Cmd)
|
||||
{ musrAction->SetTurtleZ0(setTurtleZ0Cmd->GetNewDoubleValue(newValue)); }
|
||||
if( command == setTurtleInterpretAxesCmd)
|
||||
{ musrAction->SetTurtleInterpretAxes(newValue);}
|
||||
if( command == setTurtleMomentumBite)
|
||||
{ musrAction-> SetTurtleMomentumBite(setTurtleMomentumBite->GetNew3VectorValue(newValue)); }
|
||||
if( command == setTurtleEventNrCmd)
|
||||
|
||||
@ -87,6 +87,9 @@ G4bool musrRootOutput::store_muTargetTime = false;
|
||||
G4bool musrRootOutput::store_muTargetPolX = false;
|
||||
G4bool musrRootOutput::store_muTargetPolY = false;
|
||||
G4bool musrRootOutput::store_muTargetPolZ = false;
|
||||
G4bool musrRootOutput::store_muTargetMomX = false;
|
||||
G4bool musrRootOutput::store_muTargetMomY = false;
|
||||
G4bool musrRootOutput::store_muTargetMomZ = false;
|
||||
G4bool musrRootOutput::store_muM0Time = false;
|
||||
G4bool musrRootOutput::store_muM0PolX = false;
|
||||
G4bool musrRootOutput::store_muM0PolY = false;
|
||||
@ -177,6 +180,9 @@ void musrRootOutput::BeginOfRunAction() {
|
||||
if (store_muTargetPolX) {rootTree->Branch("muTargetPolX",&muTargetPolX_t,"muTargetPolX/D");}
|
||||
if (store_muTargetPolY) {rootTree->Branch("muTargetPolY",&muTargetPolY_t,"muTargetPolY/D");}
|
||||
if (store_muTargetPolZ) {rootTree->Branch("muTargetPolZ",&muTargetPolZ_t,"muTargetPolZ/D");}
|
||||
if (store_muTargetMomX) {rootTree->Branch("muTargetMomX",&muTargetMomX_t,"muTargetMomX/D");}
|
||||
if (store_muTargetMomY) {rootTree->Branch("muTargetMomY",&muTargetMomY_t,"muTargetMomY/D");}
|
||||
if (store_muTargetMomZ) {rootTree->Branch("muTargetMomZ",&muTargetMomZ_t,"muTargetMomZ/D");}
|
||||
if (store_muM0Time) {rootTree->Branch("muM0Time",&muM0Time_t,"muM0Time/D");}
|
||||
if (store_muM0PolX) {rootTree->Branch("muM0PolX",&muM0PolX_t,"muM0PolX/D");}
|
||||
if (store_muM0PolY) {rootTree->Branch("muM0PolY",&muM0PolY_t,"muM0PolY/D");}
|
||||
@ -248,6 +254,9 @@ void musrRootOutput::BeginOfRunAction() {
|
||||
rootTree->Branch("save_px",&save_px,"save_px[save_n]/D");
|
||||
rootTree->Branch("save_py",&save_py,"save_py[save_n]/D");
|
||||
rootTree->Branch("save_pz",&save_pz,"save_pz[save_n]/D");
|
||||
rootTree->Branch("save_polx",&save_polx,"save_polx[save_n]/D");
|
||||
rootTree->Branch("save_poly",&save_poly,"save_poly[save_n]/D");
|
||||
rootTree->Branch("save_polz",&save_polz,"save_polz[save_n]/D");
|
||||
}
|
||||
|
||||
// htest1 = new TH1F("htest1","The debugging histogram 1",50,-4.,4.);
|
||||
@ -313,6 +322,7 @@ void musrRootOutput::ClearAllRootVariables() {
|
||||
muDecayDetID_t=-1000;
|
||||
muDecayPolX_t=-1000; muDecayPolY_t=-1000; muDecayPolZ_t=-1000;
|
||||
muTargetTime_t=-1000; muTargetPolX_t=-1000; muTargetPolY_t=-1000; muTargetPolZ_t=-1000;
|
||||
muTargetMomX_t=-1000; muTargetMomY_t=-1000; muTargetMomZ_t=-1000;
|
||||
muM0Time_t=-1000; muM0PolX_t=-1000; muM0PolY_t=-1000; muM0PolZ_t=-1000;
|
||||
muM1Time_t=-1000; muM1PolX_t=-1000; muM1PolY_t=-1000; muM1PolZ_t=-1000;
|
||||
muM2Time_t=-1000; muM2PolX_t=-1000; muM2PolY_t=-1000; muM2PolZ_t=-1000;
|
||||
@ -371,7 +381,7 @@ G4int musrRootOutput::ConvertProcessToID(std::string processName) {
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
void musrRootOutput::SetSaveDetectorInfo (G4int ID, G4int particleID, G4double ke,
|
||||
G4double x, G4double y, G4double z, G4double px, G4double py, G4double pz) {
|
||||
G4double x, G4double y, G4double z, G4double px, G4double py, G4double pz, G4double polx, G4double poly, G4double polz) {
|
||||
if (save_n>=save_nMax) {
|
||||
char message[200];
|
||||
sprintf(message,"musrRootOutput.cc::SetSaveDetectorInfo(): more \"save\" hits then allowed: save_nMax=%i",save_nMax);
|
||||
@ -387,7 +397,9 @@ void musrRootOutput::SetSaveDetectorInfo (G4int ID, G4int particleID, G4double k
|
||||
save_px[save_n]=px/MeV;
|
||||
save_py[save_n]=py/MeV;
|
||||
save_pz[save_n]=pz/MeV;
|
||||
|
||||
save_polx[save_n]=polx;
|
||||
save_poly[save_n]=poly;
|
||||
save_polz[save_n]=polz;
|
||||
save_n++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -208,7 +208,10 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep) {
|
||||
G4double px_save=aStep->GetPreStepPoint()->GetMomentum().x();
|
||||
G4double py_save=aStep->GetPreStepPoint()->GetMomentum().y();
|
||||
G4double pz_save=aStep->GetPreStepPoint()->GetMomentum().z();
|
||||
myRootOutput->SetSaveDetectorInfo(tmpVolumeID,particle_id_save,ke_save,x_save,y_save,z_save,px_save,py_save,pz_save);
|
||||
G4double polx_save=aStep->GetPreStepPoint()->GetPolarization().x();
|
||||
G4double poly_save=aStep->GetPreStepPoint()->GetPolarization().y();
|
||||
G4double polz_save=aStep->GetPreStepPoint()->GetPolarization().z();
|
||||
myRootOutput->SetSaveDetectorInfo(tmpVolumeID,particle_id_save,ke_save,x_save,y_save,z_save,px_save,py_save,pz_save,polx_save,poly_save,polz_save);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -222,6 +225,10 @@ void musrSteppingAction::UserSteppingAction(const G4Step* aStep) {
|
||||
muAlreadyWasInTargetInThisEvent=true;
|
||||
myRootOutput->SetPolInTarget(aTrack->GetPolarization());
|
||||
myRootOutput->SetTimeInTarget(aTrack->GetGlobalTime());
|
||||
G4ThreeVector p_beforeEnteringTarget = aTrack->GetMomentum() - aStep->GetDeltaMomentum(); // must be - sign because DeltaMomentum is negative
|
||||
// std::cout<<"(aStep->GetDeltaMomentum()).z() = "<<(aStep->GetDeltaMomentum()).z()<<std::endl;
|
||||
myRootOutput->SetMomentumInTarget(p_beforeEnteringTarget);
|
||||
// myRootOutput->SetMomentumInTarget(aTrack->GetMomentum());
|
||||
}
|
||||
}
|
||||
else if ((actualVolume=="log_M0")||(actualVolume=="log_m0")) {
|
||||
|
||||
@ -66,6 +66,8 @@ musrTabulatedElementField::musrTabulatedElementField( const char* filename, cons
|
||||
}
|
||||
|
||||
char buffer[256];
|
||||
char tmpString1[100]="Unset";
|
||||
float fvalue;
|
||||
G4bool boolMinimaAndMaximaDefinedInTheFile = false;
|
||||
if (fldType=='E') G4cout<<" Electric field ";
|
||||
if (fldType=='B') G4cout<<" Magnetic field ";
|
||||
@ -118,6 +120,11 @@ musrTabulatedElementField::musrTabulatedElementField( const char* filename, cons
|
||||
// be the last line of the header.
|
||||
do {
|
||||
file.getline(buffer,256);
|
||||
sscanf(&buffer[0],"%s %g",tmpString1,&fvalue);
|
||||
if (strcmp(tmpString1,"fieldNormalisation")==0) {
|
||||
fieldNormalisation = fvalue;
|
||||
G4cout << "DEBUG: musrTabulatedElementField: fieldNormalisation set to "<<fieldNormalisation<<G4endl;
|
||||
}
|
||||
} while ( buffer[1]!='0');
|
||||
}
|
||||
else if ((strcmp(fieldTableType,"2DE")==0)||(strcmp(fieldTableType,"2DB")==0)||(strcmp(fieldTableType,"2DEf")==0)) {
|
||||
@ -142,6 +149,11 @@ musrTabulatedElementField::musrTabulatedElementField( const char* filename, cons
|
||||
file >> nx >> nz >> nDummy;
|
||||
do {
|
||||
file.getline(buffer,256);
|
||||
sscanf(&buffer[0],"%s %g",tmpString1,&fvalue);
|
||||
if (strcmp(tmpString1,"fieldNormalisation")==0) {
|
||||
fieldNormalisation = fvalue;
|
||||
G4cout << "DEBUG: musrTabulatedElementField: fieldNormalisation set to "<<fieldNormalisation<<G4endl;
|
||||
}
|
||||
} while ( buffer[1]!='0');
|
||||
}
|
||||
else if ((strcmp(fieldTableType,"2D")==0)||(strcmp(fieldTableType,"2DBOpera")==0)) {
|
||||
@ -154,6 +166,11 @@ musrTabulatedElementField::musrTabulatedElementField( const char* filename, cons
|
||||
// G4cout << nx <<" "<< nDummy <<" "<< nz<<G4endl;
|
||||
do {
|
||||
file.getline(buffer,256);
|
||||
sscanf(&buffer[0],"%s %g",tmpString1,&fvalue);
|
||||
if (strcmp(tmpString1,"fieldNormalisation")==0) {
|
||||
fieldNormalisation = fvalue;
|
||||
G4cout << "DEBUG: musrTabulatedElementField: fieldNormalisation set to "<<fieldNormalisation<<G4endl;
|
||||
}
|
||||
} while ( buffer[1]!='0');
|
||||
}
|
||||
else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user