__call__ operator fixed

Author: HaarigerHarald

source/geometry/biasing/pyG4GeometryCellComp.cc

@@ -16,7 +16,6 @@ void export_G4GeometryCellComp(py::module &m)
 
       .def(py::init<>())
       .def("__copy__", [](const G4GeometryCellComp &self) { return G4GeometryCellComp(self); })
-      .def("__deepcopy__", [](const G4GeometryCellComp &self, py::dict) { return G4GeometryCellComp(self); });
-
-   py::implicitly_convertible<G4GeometryCellComp, G4GeometryCell>();
+      .def("__deepcopy__", [](const G4GeometryCellComp &self, py::dict) { return G4GeometryCellComp(self); })
+      .def("__call__", &G4GeometryCellComp::operator(), py::arg("g1"), py::arg("g2"), py::is_operator());
 }

source/geometry/solids/specific/pyG4TessellatedSolid.cc

@@ -156,9 +156,8 @@ void export_G4TessellatedSolid(py::module &m)
 
       .def("__copy__", [](const G4VertexComparator &self) { return G4VertexComparator(self); })
       .def("__deepcopy__", [](const G4VertexComparator &self, py::dict) { return G4VertexComparator(self); })
-      .def(py::init<>());
-
-   py::implicitly_convertible<G4VertexComparator, G4VertexInfo>();
+      .def(py::init<>())
+      .def("__call__", &G4VertexComparator::operator(), py::arg("l"), py::arg("r"), py::is_operator());
 
    py::class_<G4TessellatedSolid, PyG4TessellatedSolid, G4VSolid, py::nodelete>(m, "G4TessellatedSolid")
 

source/graphics_reps/pyG4AttDefStore.cc

@@ -15,15 +15,18 @@ class ScopeG4AttDefStore {
 void export_G4AttDefStore(py::module &m)
 {
    py::class_<ScopeG4AttDefStore>(m, "G4AttDefStore")
-      .def_static("GetInstance",
-                  [](const G4String &storeKey) {
-                     G4bool                        isNew;
-                     std::map<G4String, G4AttDef> *store = G4AttDefStore::GetInstance(storeKey, isNew);
-                     return py::make_tuple(store, isNew);
-                  })
+      .def_static(
+         "GetInstance",
+         [](const G4String &storeKey) {
+            G4bool                        isNew;
+            std::map<G4String, G4AttDef> *store = G4AttDefStore::GetInstance(storeKey, isNew);
+            return std::make_tuple(store, isNew);
+         },
+         py::return_value_policy::automatic_reference)
+
       .def_static("GetStoreKey", [](const std::map<G4String, G4AttDef> *definitions) {
          G4String key;
          G4bool   contains = G4AttDefStore::GetStoreKey(definitions, key);
-         return py::make_tuple(contains, key);
+         return std::make_tuple(contains, key);
       });
 }