Fixes to allow static linking

Author: HaarigerHarald

setup.py

@@ -75,7 +75,7 @@ def build_extension(self, ext):
 
 setup(
     name="geant4_pybind",
-    version="0.1.0",
+    version="0.1.0b0",
     author="Benjamin H.",
     author_email="haarigerharald@gmx.at",
     description="Alternative python bindings for Geant4 via pybind11",

source/analysis/pyG4AnalysisManager.cc

@@ -1,4 +1,5 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include <G4RootAnalysisManager.hh>
 #include <G4RootAnalysisReader.hh>
@@ -15,6 +16,7 @@
 #include "G4VNtupleFileManager.hh"
 
 #include "typecast.hh"
+#include "opaques.hh"
 #include "holder.hh"
 
 namespace py = pybind11;

source/analysis/pyG4TScoreNtupleWriter.cc

@@ -1,4 +1,5 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include <G4TScoreNtupleWriter.hh>
 
@@ -16,6 +17,7 @@
 #include "G4XmlAnalysisReader.hh"
 
 #include "typecast.hh"
+#include "opaques.hh"
 #include "holder.hh"
 
 namespace py = pybind11;

source/analysis/pyG4VAnalysisManager.cc

@@ -18,6 +18,7 @@
 #include <tools/histo/hmpi>
 
 #include "typecast.hh"
+#include "opaques.hh"
 #include "holder.hh"
 
 namespace py = pybind11;

source/analysis/pyhisto.cc

@@ -1,4 +1,5 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include <tools/histo/h1d>
 #include <tools/histo/h2d>
@@ -7,6 +8,7 @@
 #include <tools/histo/p2d>
 
 #include "typecast.hh"
+#include "opaques.hh"
 #include "holder.hh"
 
 namespace py = pybind11;

source/analysis/pymodG4analysis.cc

@@ -1,6 +1,8 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include "typecast.hh"
+#include "opaques.hh"
 
 namespace py = pybind11;
 

source/datainit.py

@@ -61,6 +61,10 @@ def download_dataset(url, directory):
 
 
 def ask_for_download(data_directory):
+    # Skip for automated tests
+    if "CI" in os.environ and os.environ["CI"] == "true":
+        return True
+
     print("One or more Geant4 datasets were not found.")
     answer=input("Would you like to download the missing ones? [Y/n] ")
     if answer.lower() == 'y' or answer.lower() == 'yes':

source/digits_hits/pyG4HCofThisEvent.cc

@@ -1,9 +1,11 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include <G4HCofThisEvent.hh>
 
 #include "holder.hh"
 #include "typecast.hh"
+#include "opaques.hh"
 
 namespace py = pybind11;
 
@@ -16,7 +18,7 @@ void export_G4HCofThisEvent(py::module &m)
       .def("AddHitsCollection",
            [](G4HCofThisEvent &self, G4int HCID, G4VHitsCollection *aHC) {
               owntrans_ptr<G4VHitsCollection>::remove(aHC);
-              //TRAMPOLINE_REF_INCREASE(G4VHitsCollection, aHC);
+              // TRAMPOLINE_REF_INCREASE(G4VHitsCollection, aHC);
               self.AddHitsCollection(HCID, aHC);
            })
 

source/digits_hits/pyG4MultiFunctionalDetector.cc

@@ -1,11 +1,13 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include <G4MultiFunctionalDetector.hh>
 #include <G4VPrimitiveScorer.hh>
 #include <G4VPrimitivePlotter.hh>
 
 #include "holder.hh"
 #include "typecast.hh"
+#include "opaques.hh"
 
 namespace py = pybind11;
 
@@ -57,18 +59,20 @@ void export_G4MultiFunctionalDetector(py::module &m)
       .def("DrawAll", &G4MultiFunctionalDetector::DrawAll)
       .def("PrintAll", &G4MultiFunctionalDetector::PrintAll)
       .def("ProcessHits", &PublicG4MultiFunctionalDetector::ProcessHits)
-      .def("RegisterPrimitive", [] (G4MultiFunctionalDetector & self, G4VPrimitivePlotter* plotter)
-      {
-         owntrans_ptr<G4VPrimitivePlotter>::remove(plotter);
-         TRAMPOLINE_REF_INCREASE(G4VPrimitivePlotter, plotter);
-         return self.RegisterPrimitive(plotter);
-      })
-      .def("RegisterPrimitive", [] (G4MultiFunctionalDetector & self, G4VPrimitiveScorer* scorer)
-      {
-         owntrans_ptr<G4VPrimitiveScorer>::remove(scorer);
-         TRAMPOLINE_REF_INCREASE(G4VPrimitiveScorer, scorer);
-         return self.RegisterPrimitive(scorer);
-      })
+      .def("RegisterPrimitive",
+           [](G4MultiFunctionalDetector &self, G4VPrimitivePlotter *plotter) {
+              owntrans_ptr<G4VPrimitivePlotter>::remove(plotter);
+              TRAMPOLINE_REF_INCREASE(G4VPrimitivePlotter, plotter);
+              return self.RegisterPrimitive(plotter);
+           })
+
+      .def("RegisterPrimitive",
+           [](G4MultiFunctionalDetector &self, G4VPrimitiveScorer *scorer) {
+              owntrans_ptr<G4VPrimitiveScorer>::remove(scorer);
+              TRAMPOLINE_REF_INCREASE(G4VPrimitiveScorer, scorer);
+              return self.RegisterPrimitive(scorer);
+           })
+
       .def("RemovePrimitive", &G4MultiFunctionalDetector::RemovePrimitive) // TODO pass ownership
       .def("GetNumberOfPrimitives", &G4MultiFunctionalDetector::GetNumberOfPrimitives)
       .def("GetPrimitive", &G4MultiFunctionalDetector::GetPrimitive, py::return_value_policy::reference_internal);

source/digits_hits/pyG4SDFilter.cc

@@ -1,4 +1,5 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 
 #include <G4SDChargedFilter.hh>
 #include <G4SDKineticEnergyFilter.hh>
@@ -11,6 +12,7 @@
 
 #include "holder.hh"
 #include "typecast.hh"
+#include "opaques.hh"
 
 namespace py = pybind11;