Python: Simplify Map6x6 Exposure

Author: ax3l

examples/fodo_userdef/run_fodo_userdef.py

@@ -6,7 +6,7 @@
 #
 # -*- coding: utf-8 -*-
 
-from impactx import ImpactX, distribution, elements, twiss
+from impactx import ImpactX, Map6x6, distribution, elements, twiss
 
 sim = ImpactX()
 
@@ -49,7 +49,7 @@
 monitor = elements.BeamMonitor("monitor", backend="h5")
 
 # add a user-defined, linear element for the drifts
-Iden = elements.LinearMap.Map6x6.identity()
+Iden = Map6x6.identity()
 R1, R2 = Iden, Iden
 
 ds1 = 0.25

examples/linear_map/run_map.py

@@ -9,7 +9,7 @@
 # from elements import LinearTransport
 import numpy as np
 
-from impactx import ImpactX, distribution, elements, twiss
+from impactx import ImpactX, Map6x6, distribution, elements, twiss
 
 sim = ImpactX()
 
@@ -57,7 +57,7 @@
 monitor = elements.BeamMonitor("monitor", backend="h5")
 
 # initialize the linear map
-Iden = elements.LinearMap.Map6x6.identity()
+Iden = Map6x6.identity()
 Rmat = Iden
 
 # desired tunes

examples/scraping_beam/run_scraping.py

@@ -6,7 +6,7 @@
 #
 # -*- coding: utf-8 -*-
 
-from impactx import ImpactX, distribution, elements
+from impactx import ImpactX, Map6x6, distribution, elements
 
 sim = ImpactX()
 
@@ -61,7 +61,7 @@
 monitor = elements.BeamMonitor("monitor", backend="h5")
 
 # initialize the linear map
-Iden = elements.LinearMap.Map6x6.identity()
+Iden = Map6x6.identity()
 Rmat = Iden
 Rmat[2, 1] = correlation_k
 Rmat[4, 3] = correlation_k

src/python/elements.cpp

@@ -158,13 +158,7 @@ namespace
 
 void init_elements(py::module& m)
 {
-    /*
-    m.def_property_readonly_static(
-        "Map6x6",
-        [](py::object){ return py::type::of<Map6x6>(); },
-        "1-indexed, Fortran-ordered, 6x6 linear transport map type"
-    );
-    */
+    m.attr("Map6x6") = py::type::of<Map6x6>();
 
     py::module_ me = m.def_submodule(
         "elements",