From 6b9421259ec8125e7d77d2bd9f8da8d6d6b3516c Mon Sep 17 00:00:00 2001
From: Graeme A Stewart <graeme.andrew.stewart@cern.ch>
Date: Fri, 12 May 2023 18:05:16 -0400
Subject: [PATCH] Add the HepMC reader to our project

This speeds things up a lot and avoids needing to add a development
package to the Project.toml file
---
 Project.toml                       | 1 -
 chep.jl                            | 1 -
 hepmc3jl/Manifest.toml             | 7 -------
 hepmc3jl/Project.toml              | 4 ----
 {hepmc3jl/src => src}/HepMC3.jl    | 0
 src/JetReconstruction.jl           | 6 +++++-
 src/{pseudojet.jl => Pseudojet.jl} | 0
 7 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 hepmc3jl/Manifest.toml
 delete mode 100644 hepmc3jl/Project.toml
 rename {hepmc3jl/src => src}/HepMC3.jl (100%)
 rename src/{pseudojet.jl => Pseudojet.jl} (100%)

diff --git a/Project.toml b/Project.toml
index 2c535fd..9207697 100644
--- a/Project.toml
+++ b/Project.toml
@@ -7,7 +7,6 @@ version = "0.1.0"
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 FlameGraphs = "08572546-2f56-4bcf-ba4e-bab62c3a3f89"
-HepMC3 = "423f2d09-83c6-4bed-945f-581c3d5a0e70"
 HepMC3_jll = "b85c3e40-22db-5268-bacb-02bd65cb4e01"
 JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
diff --git a/chep.jl b/chep.jl
index ca0b1b2..d2a7d8f 100644
--- a/chep.jl
+++ b/chep.jl
@@ -4,7 +4,6 @@ Wrapper to run jet reco code feeding in the standard set of HepMC events that
 are used for benchmarking jet reco.
 """
 
-import HepMC3
 import FlameGraphs
 import ProfileSVG
 
diff --git a/hepmc3jl/Manifest.toml b/hepmc3jl/Manifest.toml
deleted file mode 100644
index 7da0644..0000000
--- a/hepmc3jl/Manifest.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is machine-generated - editing it directly is not advised
-
-julia_version = "1.8.1"
-manifest_format = "2.0"
-project_hash = "da39a3ee5e6b4b0d3255bfef95601890afd80709"
-
-[deps]
diff --git a/hepmc3jl/Project.toml b/hepmc3jl/Project.toml
deleted file mode 100644
index d553f38..0000000
--- a/hepmc3jl/Project.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-name = "HepMC3"
-uuid = "423f2d09-83c6-4bed-945f-581c3d5a0e70"
-authors = ["Philippe Gras <philippe.gras@cern.ch>"]
-version = "0.1.0"
diff --git a/hepmc3jl/src/HepMC3.jl b/src/HepMC3.jl
similarity index 100%
rename from hepmc3jl/src/HepMC3.jl
rename to src/HepMC3.jl
diff --git a/src/JetReconstruction.jl b/src/JetReconstruction.jl
index 0b1d2e1..de7239c 100644
--- a/src/JetReconstruction.jl
+++ b/src/JetReconstruction.jl
@@ -8,9 +8,13 @@ include("Particle.jl")
 export energy, px, py, pz, pt, phi, mass, eta, kt, ϕ, η
 
 # Philipp's pseudojet
-include("pseudojet.jl")
+include("Pseudojet.jl")
 export PseudoJet, rap, phi, pt2
 
+# Simple HepMC3 reader
+include("HepMC3.jl")
+export HepMC3
+
 # algorithmic part
 include("Algo.jl")
 export sequential_jet_reconstruct, kt_algo, anti_kt_algo, anti_kt_algo_alt, cambridge_aachen_algo
diff --git a/src/pseudojet.jl b/src/Pseudojet.jl
similarity index 100%
rename from src/pseudojet.jl
rename to src/Pseudojet.jl