Lukas' suggestions

CHANGELOG.md

@@ -1,19 +1,20 @@
 ## CRPropa vNext
 
 ### Bug fixes:
- * Fixed sign for exponential decay of magn. field strength with Galactic height in LogarithmicSpiralField 
- * Fixed r term in source distribution for SNR and Pulsar 
+ * Fixed sign for exponential decay of magn. field strength with Galactic height in LogarithmicSpiralField
+ * Fixed r term in source distribution for SNR and Pulsar
  * Fixed wrong mass inheritance for secondaries other than nuclei or electron/positron
 
 ### New features:
- * Added new backwards-compatible function particleMass that returns particle mass also for non-nuclei 
+ * Added new backwards-compatible function particleMass that returns particle mass also for non-nuclei
+ * Added the new Galactic magnetic field models from Unger&Farrar arXiv:2311.12120
 
 ### Interface changes:
 
 ### Features that are deprecated and will be removed after this release
  * EBL model from Finke et al. 2022
 
-### Removed features 
+### Removed features
 *  AMRMagneticField - underlying library (saga) is no longer supported.
 *  ObserverPoint: Use Observer1D instead.
 
@@ -42,8 +43,8 @@
 * ObserverPoint will be renamed into Observer1D.
 * AMRMagneticField - underlying library (saga) is no longer supported.
 
-### Removed features 
-* External extensions DINT and Eleca, which can be replaced with the 
+### Removed features
+* External extensions DINT and Eleca, which can be replaced with the
   EM*-modules combined with the thinning option for reasonable computation
   times.
 
@@ -52,20 +53,20 @@
 * grplinst
 * monopole
 * ROOTOutputPlugin
-  
+
 
 ## CRPropa 3.2
 
 ### Bug fixes:
 * Fix of reflective boundary condition for scalar- and vectorgrids
   that showed asymmetry and discontinuities (See issue [#361]).
 * Fix in EMTripletPairProduction
-* Fix of the data files of the Hackstein EGMF models as well as the 
+* Fix of the data files of the Hackstein EGMF models as well as the
   corresponding example notebook.
 * Fix of axis normalization of getRotated in Vector3.h.
 * Fix of secondary spectra in electromagnetic interactions
   (EM*-modules), issue [#334] and pull request [#15] in crpropa-data.
-* Fix weight inheritance for secondary particles; they are created with 
+* Fix weight inheritance for secondary particles; they are created with
   their parents weights as intial weights now.
 
 ### New features:
@@ -75,15 +76,15 @@
   and vectorgrids.
 * Add the new PolarizedSingleModeMagneticField class for polarized/
   helical single mode magnetic field models.
-* Add a source feature for targeted emission, following the 
+* Add a source feature for targeted emission, following the
   von-Mises-Fisher distribution
-* Updates in SNR and pulsar source distributions 
+* Updates in SNR and pulsar source distributions
 
 ### Interface changes:
-* Plane wave and grid turbulence models use same parameter convention now 
+* Plane wave and grid turbulence models use same parameter convention now
 
 ### Features that are deprecated and will be removed after this release
-* External extensions DINT and Eleca, which can be replaced with the 
+* External extensions DINT and Eleca, which can be replaced with the
   EM*-modules combined with the thinning option for reasonable computation
   times.
 

include/crpropa/magneticField/UF23Field.h

@@ -114,7 +114,7 @@ class UF23Field : public MagneticField  {
   double& fPoloidalR    = fParameters[ePoloidalR];
   double& fPoloidalW    = fParameters[ePoloidalW];
   double& fPoloidalZ    = fParameters[ePoloidalZ];
-  double& fPoloidalXi = fParameters[ePoloidalXi];
+  double& fPoloidalXi   = fParameters[ePoloidalXi];
   double& fSpurCenter   = fParameters[eSpurCenter];
   double& fSpurLength   = fParameters[eSpurLength];
   double& fSpurWidth    = fParameters[eSpurWidth];

src/magneticField/UF23Field.cpp

@@ -40,6 +40,10 @@ namespace uf23 {
     return acos(cos(phi1)*cos(phi0) + sin(phi1)*sin(phi0));
   }
 
+  // Interal units used in this code.
+  // Convert to crpropa with e.g. uf23::kpc / crpropa::kpc.
+  // The conversion is, however, only needed in the single non-private
+  // getField() method, all other functions use uf23 units.
   const double kPi = 3.1415926535897932384626;
   const double kTwoPi = 2*kPi;
   const double degree = kPi/180.;