Commit ebfbfa8f authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'v2.3-stable' into 'v2.3-stable' 

[v2.3-stable] Resolve "Framework Unit of Magnetic Field: Discrepancy btw. Code & Manual"

See merge request allpix-squared/allpix-squared!836
parents f6196493 cfb35ab7

doc/usermanual/chapters/getting_started.tex

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ The internal base units of the framework are not chosen for user convenience but 
\multirow{2}{*}{\textit{Voltage}} & \multirow{2}{*}{MV (megavolt)}          & V (volt)                 \\

                                  &                                         & kV (kilovolt)            \\

\midrule

\textit{Magnetic field strength}  & T (tesla)                               & mT (millitesla)          \\

\multirow{2}{*}{\textit{Magnetic field strength}}  & kT (kilotesla)         & T (tesla)                \\

                                  &                                         & mT (millitesla)          \\

\midrule

\multirow{2}{*}{\textit{Angle}}   & \multirow{2}{*}{rad (radian)}           & deg (degree)             \\

                                  &                                         & mrad (milliradian)       \\

src/tools/units.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ namespace allpix { 
        Units::add("kV", 1e-3);



        // MAGNETIC FIELD

        Units::add("kT", 1);

        Units::add("T", 1e-3);

        Units::add("mT", 1e-6);