syned 1.0.35__tar.gz → 1.0.38__tar.gz

{syned-1.0.35/syned.egg-info → syned-1.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syned
-Version: 1.0.35
+Version: 1.0.38
 Summary: SYNED (SYNchrotron Elements Dictionary) kernel library
 Home-page: https://github.com/oasys-kit/syned
 Download-URL: https://github.com/oasys-kit/syned

{syned-1.0.35 → syned-1.0.38}/setup.py

@@ -11,7 +11,7 @@ except AttributeError:
 
 NAME = 'syned'
 
-VERSION = '1.0.35'
+VERSION = '1.0.38'
 ISRELEASED = True
 
 DESCRIPTION = 'SYNED (SYNchrotron Elements Dictionary) kernel library'

{syned-1.0.35 → syned-1.0.38}/syned/beamline/shape.py

@@ -1241,17 +1241,31 @@ class Paraboloid(SurfaceShape):
     It is defined with three parameters: the parabola_parameter and two more parameters
     defining the position of the origin of the mirror.
 
-    The parabola_parameter = 2 * focal_distance = - 0.5 * ccc_9 / ccc_2
+    The parabola_parameter = 2 * focal_length = - 0.5 * ccc_9 / ccc_2
 
     The additional parameter can be the focal distances
     ("p" or "q", one is infinity), "x0", "y0" or the grazing angle.
     Here, we selected the at_infinity and the finite focal distance p or q or distance from
     the mirror pole to focus (pole to focus).
 
+    The parabola equation is:
+
+    ccc_2 y^2 + ccc_9 z = 0 or
+
+    y^2 = -ccc_9/ccc_2 z = 2 parabola_parameter z = 4 focal_length z
+
+    The focus is at (0, 0, focal_length).
+
+    The directrix is at (0, 0, -focal_length).
+
+    The distance from the directrix to focus is 2 * focal_length.
+
+    The radius of curvature at the vertex is 2 * focal_length.
+
     Parameters
     ----------
     parabola_parameter : float, optional
-        parabola_parameter = 2 * focal_distance = - 0.5 * ccc_9 / ccc_2.
+        parabola_parameter = 2 * focal_length = - 0.5 * ccc_9 / ccc_2. Equation: y^2 = 2 parabola_parameter z.
     at_infinity : int (as defined by Side), optional
         SOURCE = 0, IMAGE = 1.
     pole_to_focus : float, optional
@@ -1261,6 +1275,10 @@ class Paraboloid(SurfaceShape):
 
     References
     ----------
+    https://en.wikipedia.org/wiki/Parabola
+
+    https://doi.org/10.1107/S1600577522004593
+
     Some equations can be found here: https://github.com/srio/shadow3-docs/blob/master/doc/conics.pdf
 
     """

{syned-1.0.35 → syned-1.0.38}/syned/syned_object.py

@@ -7,6 +7,23 @@ except:
 
 # TODO: although basic functionality is implemented, the use of exec should be replace by introspection tools
 class SynedObject(object):
+
+    # ---------------------------------------------------------------------------------------------------------
+    # This override is necessary to avoid TypeError: cannot pickle '_thread.lock' object while duplicating
+    # that occurs while enabling/disabling connectors
+    #
+    # When an attribute is an object that contains non pickable attributes, we make a shallow copy of it
+    # ---------------------------------------------------------------------------------------------------------
+
+    def __deepcopy__(self, memodict={}):
+        cls = self.__class__
+        result = cls.__new__(cls)
+        memodict[id(self)] = result
+        for k, v in self.__dict__.items():
+                try:              setattr(result, k, copy.deepcopy(v, memodict))
+                except TypeError: setattr(result, k, copy.copy(v))
+        return result
+
     """
     This is the base object for SYNED.
 

{syned-1.0.35 → syned-1.0.38}/syned/version.py

@@ -1,8 +1,8 @@
 
 # THIS FILE IS GENERATED FROM syned SETUP.PY
-short_version = '1.0.35'
-version = '1.0.35'
-full_version = '1.0.35'
+short_version = '1.0.38'
+version = '1.0.38'
+full_version = '1.0.38'
 git_revision = ''
 release = True
 

{syned-1.0.35 → syned-1.0.38/syned.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syned
-Version: 1.0.35
+Version: 1.0.38
 Summary: SYNED (SYNchrotron Elements Dictionary) kernel library
 Home-page: https://github.com/oasys-kit/syned
 Download-URL: https://github.com/oasys-kit/syned