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:
2009-11-20 10:29:02 +00:00
parent d05e77dbe5
commit b5594b4513
15 changed files with 183 additions and 14 deletions

View File

@ -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}