Add Setup class (#48)

Closes #45

generate_docstrings.py

@@ -198,7 +198,8 @@ def handle_compounddef(results, node):
     if getter not in results:
         continue
     results[prop] = results[getter] + results[setter]
-    del results[getter]
+    if prop != getter:
+        del results[getter]
     del results[setter]
 
 # merge trivially duplicated entries

src/core.cpp

@@ -613,6 +613,20 @@ PYBIND11_MODULE(_core, m) {
       },
       DOC(Print.listing));
 
+  m.def("_Setup_print_errors", &Setup::print_errors, DOC(Setup.print_errors));
+
+  m.def("_Setup_set_print_errors", &Setup::set_print_errors,
+        DOC(Setup.set_print_errors));
+
+  m.def("_Setup_print_warnings", &Setup::print_warnings, DOC(Setup.print_warnings));
+
+  m.def("_Setup_set_print_warnings", &Setup::set_print_warnings,
+        DOC(Setup.set_print_warnings));
+
+  m.def("_Setup_debug_level", &Setup::debug_level, DOC(Setup.debug_level));
+
+  m.def("_Setup_set_debug_level", &Setup::set_debug_level, DOC(Setup.set_debug_level));
+
   FUNC(equal_particle_sets);
   FUNC(equal_vertex_sets);
 

src/from_hepevt.cpp

@@ -1,4 +1,5 @@
 #include "pybind.hpp"
+#include <HepMC3/Errors.h>
 #include <HepMC3/GenEvent.h>
 #include <HepMC3/GenParticle.h>
 #include <HepMC3/GenVertex.h>
@@ -36,6 +37,19 @@ void normalize(int& m1, int& m2) {
 
 namespace HepMC3 {
 
+void modded_add_particle_in(int vid, GenVertexPtr v, GenParticlePtr p) {
+  // Particle can only have one end vertex in HepMC3. Default is to reassign so
+  // that the later end vertex gets the particle. We change this here so that
+  // the first vertex keeps the particle. This is safer, because otherwise the
+  // first vertex may end up without incoming particles.
+  if (p->end_vertex()) {
+    // clang-format off
+    HEPMC3_DEBUG(10,"from_hepevt: vertex -" << vid << ": skipping incoming particle " << p->id() << " which already has end_vertex " << p->end_vertex()->id());
+    // clang-format on
+  } else
+    v->add_particle_in(p);
+}
+
 void connect_parents_and_children(GenEvent& event, bool parents,
                                   py::array_t<int> parents_or_children, py::object vx,
                                   py::object vy, py::object vz, py::object vt) {
@@ -126,13 +140,14 @@ void connect_parents_and_children(GenEvent& event, bool parents,
     }
 
     GenVertexPtr v{new GenVertex(pos)};
+    int vid = event.vertices().size();
 
     if (parents) {
-      for (int k = m1; k < m2; ++k) v->add_particle_in(particles.at(k));
+      for (int k = m1; k < m2; ++k) modded_add_particle_in(vid, v, particles.at(k));
       for (const auto k : co) v->add_particle_out(particles.at(k));
     } else {
       for (int k = m1; k < m2; ++k) v->add_particle_out(particles.at(k));
-      for (const auto k : co) v->add_particle_in(particles.at(k));
+      for (const auto k : co) modded_add_particle_in(vid, v, particles.at(k));
     }
 
     event.add_vertex(v);

src/pyhepmc/__init__.py

@@ -30,8 +30,8 @@
 Missing functionality
 ---------------------
 
-- Not yet implemented: ``GenParticleData``, ``GenVertexData``, ``ReaderMT``,
-  ``Setup``. These will be added in the future.
+- Not yet implemented: ``GenParticleData``, ``GenVertexData``, ``ReaderMT``.
+  These will be added in the future.
 
 """
 from sys import version_info
@@ -51,6 +51,12 @@
     equal_particle_sets,
     content,
     listing,
+    _Setup_print_errors,
+    _Setup_set_print_errors,
+    _Setup_print_warnings,
+    _Setup_set_print_warnings,
+    _Setup_debug_level,
+    _Setup_set_debug_level,
     delta_phi,
     delta_eta,
     delta_r2_eta,
@@ -80,6 +86,7 @@
     "equal_particle_sets",
     "content",
     "listing",
+    "Setup",
     "delta_phi",
     "delta_eta",
     "delta_r2_eta",
@@ -90,6 +97,29 @@
     "open",
 )
 
+
+class _Setup:
+    print_errors = property(
+        lambda s: _Setup_print_errors(),
+        lambda s, v: _Setup_set_print_errors(v),
+        "Whether to print errors or not.",
+    )
+
+    print_warnings = property(
+        lambda s: _Setup_print_warnings(),
+        lambda s, v: _Setup_set_print_warnings(v),
+        "Whether to print warnings or not.",
+    )
+
+    debug_level = property(
+        lambda s: _Setup_debug_level(),
+        lambda s, v: _Setup_set_debug_level(v),
+        "Access debug level.",
+    )
+
+
+Setup = _Setup()
+
 try:
     from .view import to_dot as _to_dot