Merge branch 'master' into 'master'

Beam bkg charge added

See merge request !65

.gitignore

@@ -4,4 +4,4 @@ spack*
 ./Generator/output/
 ./Generator/options/
 
-InstallArea/
\ No newline at end of file
+InstallArea/

Generator/src/BeamBackgroundFileParserV1.cpp

@@ -51,6 +51,7 @@ bool BeamBackgroundFileParserV1::load(IBeamBackgroundFileParser::BeamBackgroundD
         // Now, we get a almost valid data
         const double m2mm = 1e3; // convert from m to mm
         result.pdgid = pid;
+        result.charge = (pid == 11) ? -1 : (pid == -11) ? 1 : -1;
         result.x     = x * m2mm;
         result.y     = y * m2mm;
         result.z     = (z+dz) * m2mm;

Generator/src/BeamBackgroundFileParserV1.h

@@ -23,7 +23,7 @@ private:
     double m_timewindow; 
 
     double x, y, z, cosx, cosy, dz, dp, cosz;
-    int pid;
+    int pid, charge;
 
 };