alias: revert pybind Medium.components

problem with wrapping the reference to a vector. error: new cannot be applied to a reference type.
tudo-astroparticlephysics · May 28, 2018 · dade213 · dade213
1 parent 3a39f33
commit dade213
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/private/python/pybindings.cxx b/private/python/pybindings.cxx
@@ -301,7 +301,6 @@ void export_medium()
         .add_property("mol_density", &Medium::GetMolDensity)
         .add_property("average_nucleon_weigth", &Medium::GetMM)
         .add_property("sum_nucleons", &Medium::GetSumNucleons)
-        .add_property("components", &Medium::GetComponents)
         .add_property("num_components", &Medium::GetNumComponents)
         .add_property("name", &Medium::GetName);
 
@@ -629,7 +628,6 @@ BOOST_PYTHON_MODULE(pyPROPOSAL)
 
     to_python_converter<std::vector<std::string>, VectorToPythonList<std::string> >();
 
-    to_python_converter<std::vector<Components::Component*>, PVectorToPythonList<Components::Component*> >();
     to_python_converter<std::vector<DynamicData*>, PVectorToPythonList<DynamicData*> >();
     to_python_converter<std::vector<Particle*>, PVectorToPythonList<Particle*> >();
 
@@ -641,7 +639,6 @@ BOOST_PYTHON_MODULE(pyPROPOSAL)
     iterable_converter()
         .from_python<std::vector<double> >()
         .from_python<std::vector<std::vector<double> > >()
-        .from_python<std::vector<Components::Component*> >()
         .from_python<std::vector<DynamicData*> >()
         // .from_python<std::vector<ParticleDef> >()
         .from_python<std::vector<Particle*> >()

diff --git a/public/PROPOSAL/medium/Medium.h b/public/PROPOSAL/medium/Medium.h
@@ -93,7 +93,7 @@ class Medium
 
     // Getter
     int GetNumComponents() const { return numComponents_; }
-    const std::vector<Components::Component*> GetComponents() const { return components_; }
+    const std::vector<Components::Component*>& GetComponents() const { return components_; }
     double GetSumCharge() const { return sumCharge_; }
     double GetZA() const { return ZA_; }
     double GetI() const { return I_; }