diff --git a/emcal_electrons.cxx b/emcal_electrons.cxx
index ee64ab4a8db2b7e2332b693aea28fcfcc2116f46..ca45a209de64a25df72c5b0c628d3e2acb936090 100644
--- a/emcal_electrons.cxx
+++ b/emcal_electrons.cxx
@@ -40,7 +40,7 @@ void emcal_electrons(int n_events = 1e6, const char* out_fname = "./data/emcal_e
         FourVector(0.0, 0.0, 0.0, 0.938), 2212, 4);
 
     // Define momentum
-    Double_t p = 0.0 + events_parsed * 3.e-4;
+    Double_t p = r1->Uniform(0.0, 30.0);
     Double_t px;
     Double_t py;
     Double_t pz;
@@ -53,7 +53,7 @@ void emcal_electrons(int n_events = 1e6, const char* out_fname = "./data/emcal_e
     GenParticlePtr p3 = std::make_shared<GenParticle>(
         FourVector(
             px, py, pz,
-            sqrt((px * px) + (py * py) + (pz * pz) + (0.000511 * 0.000511))),
+            sqrt(p*p + (0.000511 * 0.000511))),
         11, 1);
 
     GenVertexPtr v1 = std::make_shared<GenVertex>();
diff --git a/results/emcal_electrons_energy_0GeVto30GeV.pdf b/results/emcal_electrons_energy_0GeVto30GeV.pdf
deleted file mode 100644
index 44a15d3777acdd7d051a3e002351efe9c23d2710..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_energy_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_energy_0GeVto30GeV.png b/results/emcal_electrons_energy_0GeVto30GeV.png
deleted file mode 100644
index 38c4210c5172c9ccda05ca63979f5bc6e571e8e7..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_energy_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_electrons_energy_reader.pdf b/results/emcal_electrons_energy_reader.pdf
deleted file mode 100644
index 3e03c25aa9ff48ecea2f792effe18a00518d62c0..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_energy_reader.pdf and /dev/null differ
diff --git a/results/emcal_electrons_energy_reader.png b/results/emcal_electrons_energy_reader.png
deleted file mode 100644
index 85c0ae853a71e03ec142c330589aa42584a5327d..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_energy_reader.png and /dev/null differ
diff --git a/results/emcal_electrons_eta_0GeVto30GeV.pdf b/results/emcal_electrons_eta_0GeVto30GeV.pdf
deleted file mode 100644
index dfe71386bdf197551465f965684ee6799b3189c7..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_eta_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_eta_0GeVto30GeV.png b/results/emcal_electrons_eta_0GeVto30GeV.png
deleted file mode 100644
index 3ddcb577fb7fa2001cc9cc4d371e0dc6736c2673..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_eta_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_electrons_eta_reader.pdf b/results/emcal_electrons_eta_reader.pdf
deleted file mode 100644
index 327f9447263467aacda5a3518ae8525c4800445e..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_eta_reader.pdf and /dev/null differ
diff --git a/results/emcal_electrons_eta_reader.png b/results/emcal_electrons_eta_reader.png
deleted file mode 100644
index c1c841d0e5354d0d48331ea804929dcfac9a1477..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_eta_reader.png and /dev/null differ
diff --git a/results/emcal_electrons_p_0GeVto30GeV.pdf b/results/emcal_electrons_p_0GeVto30GeV.pdf
deleted file mode 100644
index 63da3df79d12f88889d9c8732f28a116f67b37f6..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_p_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_p_0GeVto30GeV.png b/results/emcal_electrons_p_0GeVto30GeV.png
deleted file mode 100644
index ab114940b1ec5acd1b31ae223b4bc49f6ae6c06e..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_p_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_electrons_phi_0GeVto30GeV.pdf b/results/emcal_electrons_phi_0GeVto30GeV.pdf
deleted file mode 100644
index d7168ff2d89835421553d2326bea56ae498a33e7..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_phi_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_phi_0GeVto30GeV.png b/results/emcal_electrons_phi_0GeVto30GeV.png
deleted file mode 100644
index 688afbca1a5dbcad2f64120b218b0422da5d2a7c..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_phi_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_electrons_pxpy_0GeVto30GeV.pdf b/results/emcal_electrons_pxpy_0GeVto30GeV.pdf
deleted file mode 100644
index 3233f10c9801827f75bdadef864d71d8d0b2eb34..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_pxpy_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_pxpy_0GeVto30GeV.png b/results/emcal_electrons_pxpy_0GeVto30GeV.png
deleted file mode 100644
index da56090d8d9833add3a6c297d8168cec753eb346..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_pxpy_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_electrons_pzpt_0GeVto30GeV.pdf b/results/emcal_electrons_pzpt_0GeVto30GeV.pdf
deleted file mode 100644
index 8ffbee61ddbf7f97aaf375ecf60e0492dbbfa14b..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_pzpt_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_pzpt_0GeVto30GeV.png b/results/emcal_electrons_pzpt_0GeVto30GeV.png
deleted file mode 100644
index d8b2adeefd67825f4452864aab99e9dc9df45812..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_pzpt_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_electrons_theta_0GeVto30GeV.pdf b/results/emcal_electrons_theta_0GeVto30GeV.pdf
deleted file mode 100644
index c92440112e28ca07894f49660cfadf7581a48dfa..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_theta_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_electrons_theta_0GeVto30GeV.png b/results/emcal_electrons_theta_0GeVto30GeV.png
deleted file mode 100644
index d54bd777d3a89b78ffccb577dc0957593cd98529..0000000000000000000000000000000000000000
Binary files a/results/emcal_electrons_theta_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_energy_0GeVto30GeV.pdf b/results/emcal_pi0_energy_0GeVto30GeV.pdf
deleted file mode 100644
index ea994e44819a8bf803d4289f136a2fdec4fc77ce..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_energy_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_energy_0GeVto30GeV.png b/results/emcal_pi0_energy_0GeVto30GeV.png
deleted file mode 100644
index 2e499a38fe087ba4d486a8354893a05a44b6e724..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_energy_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_eta_0GeVto30GeV.pdf b/results/emcal_pi0_eta_0GeVto30GeV.pdf
deleted file mode 100644
index 128526ce499c1a7278e73386098dee0fd6b2f701..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_eta_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_eta_0GeVto30GeV.png b/results/emcal_pi0_eta_0GeVto30GeV.png
deleted file mode 100644
index 522aefc900d605032c6bd7ef7aea13a11b12437b..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_eta_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_p_0GeVto30GeV.pdf b/results/emcal_pi0_p_0GeVto30GeV.pdf
deleted file mode 100644
index e14d6f9c55328dc3a07a9c7074449b74d9d4604e..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_p_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_p_0GeVto30GeV.png b/results/emcal_pi0_p_0GeVto30GeV.png
deleted file mode 100644
index da3780e8f0a539cb2ed4c626a137799751682b78..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_p_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_phi_0GeVto30GeV.pdf b/results/emcal_pi0_phi_0GeVto30GeV.pdf
deleted file mode 100644
index 2d59de99b80120f5d9608ed08ad73bb6633aae43..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_phi_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_phi_0GeVto30GeV.png b/results/emcal_pi0_phi_0GeVto30GeV.png
deleted file mode 100644
index e12d8043e536751572293b4e83ceba51c900d64b..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_phi_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_pxpy_0GeVto30GeV.pdf b/results/emcal_pi0_pxpy_0GeVto30GeV.pdf
deleted file mode 100644
index b69413d60e779d9a11a24b0512b8ff23013a291a..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_pxpy_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_pxpy_0GeVto30GeV.png b/results/emcal_pi0_pxpy_0GeVto30GeV.png
deleted file mode 100644
index 415b1beb32c87cbf583683e2da11a99f5b224261..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_pxpy_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_pzpt_0GeVto30GeV.pdf b/results/emcal_pi0_pzpt_0GeVto30GeV.pdf
deleted file mode 100644
index 7f61370ea04f7e491d58b60af6eb90a0ec6d8146..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_pzpt_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_pzpt_0GeVto30GeV.png b/results/emcal_pi0_pzpt_0GeVto30GeV.png
deleted file mode 100644
index 9d664fbea962ec5939a2288c46fe53ef93e509ec..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_pzpt_0GeVto30GeV.png and /dev/null differ
diff --git a/results/emcal_pi0_theta_0GeVto30GeV.pdf b/results/emcal_pi0_theta_0GeVto30GeV.pdf
deleted file mode 100644
index a2fad704e95371d9623eacc32dbe2eb3d556f43c..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_theta_0GeVto30GeV.pdf and /dev/null differ
diff --git a/results/emcal_pi0_theta_0GeVto30GeV.png b/results/emcal_pi0_theta_0GeVto30GeV.png
deleted file mode 100644
index c3228bece9e285fe83c311eac942875a57651935..0000000000000000000000000000000000000000
Binary files a/results/emcal_pi0_theta_0GeVto30GeV.png and /dev/null differ
diff --git a/results/zdc_photons_energy_reader.pdf b/results/zdc_photons_energy_reader.pdf
deleted file mode 100644
index f6af41d34e985cb26d35f6109afa78f072503eae..0000000000000000000000000000000000000000
Binary files a/results/zdc_photons_energy_reader.pdf and /dev/null differ
diff --git a/results/zdc_photons_energy_reader.png b/results/zdc_photons_energy_reader.png
deleted file mode 100644
index 64b072a93ae02bf24c7a04e31d7722ebd78e467c..0000000000000000000000000000000000000000
Binary files a/results/zdc_photons_energy_reader.png and /dev/null differ
diff --git a/results/zdc_photons_eta_reader.pdf b/results/zdc_photons_eta_reader.pdf
deleted file mode 100644
index cc564f731e99879b418147bfeaa29d42a3268662..0000000000000000000000000000000000000000
Binary files a/results/zdc_photons_eta_reader.pdf and /dev/null differ
diff --git a/results/zdc_photons_eta_reader.png b/results/zdc_photons_eta_reader.png
deleted file mode 100644
index 28405b088d371a758aeaf83a5e6f4a4446b6f41a..0000000000000000000000000000000000000000
Binary files a/results/zdc_photons_eta_reader.png and /dev/null differ