syned 1.0.34__tar.gz → 1.0.35__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syned
-Version: 1.0.34
+Version: 1.0.35
 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.34 → syned-1.0.35}/setup.py

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

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: syned
-Version: 1.0.34
+Version: 1.0.35
 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.34 → syned-1.0.35}/syned.egg-info/SOURCES.txt

@@ -53,20 +53,6 @@ syned/storage_ring/magnetic_structures/bending_magnet.py
 syned/storage_ring/magnetic_structures/insertion_device.py
 syned/storage_ring/magnetic_structures/undulator.py
 syned/storage_ring/magnetic_structures/wiggler.py
-syned/tools/__init__.py
-syned/tools/benders/__init__.py
-syned/tools/benders/bender_io.py
-syned/tools/benders/bender_manager.py
-syned/tools/benders/fixed_rods_bender_manager.py
-syned/tools/benders/flexural_hinge_bender_manager.py
-syned/tools/diaboloid/__init__.py
-syned/tools/diaboloid/diaboloid_calculator.py
-syned/tools/diaboloid/fqs.py
-syned/tools/error_profile/__init__.py
-syned/tools/error_profile/error_profile_calculator.py
-syned/tools/hybrid_beam/__init__.py
-syned/tools/hybrid_undulator/__init__.py
-syned/tools/thermal_load/__init__.py
 syned/util/__init__.py
 syned/util/json_tools.py
 syned/widget/__init__.py

syned-1.0.34/syned/tools/__init__.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# ----------------------------------------------------------------------- #
-# Copyright (c) 2023, UChicago Argonne, LLC. All rights reserved.         #
-#                                                                         #
-# Copyright 2023. UChicago Argonne, LLC. This software was produced       #
-# under U.S. Government contract DE-AC02-06CH11357 for Argonne National   #
-# Laboratory (ANL), which is operated by UChicago Argonne, LLC for the    #
-# U.S. Department of Energy. The U.S. Government has rights to use,       #
-# reproduce, and distribute this software.  NEITHER THE GOVERNMENT NOR    #
-# UChicago Argonne, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR        #
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is     #
-# modified to produce derivative works, such modified software should     #
-# be clearly marked, so as not to confuse it with the version available   #
-# from ANL.                                                               #
-#                                                                         #
-# Additionally, redistribution and use in source and binary forms, with   #
-# or without modification, are permitted provided that the following      #
-# conditions are met:                                                     #
-#                                                                         #
-#     * Redistributions of source code must retain the above copyright    #
-#       notice, this list of conditions and the following disclaimer.     #
-#                                                                         #
-#     * Redistributions in binary form must reproduce the above copyright #
-#       notice, this list of conditions and the following disclaimer in   #
-#       the documentation and/or other materials provided with the        #
-#       distribution.                                                     #
-#                                                                         #
-#     * Neither the name of UChicago Argonne, LLC, Argonne National       #
-#       Laboratory, ANL, the U.S. Government, nor the names of its        #
-#       contributors may be used to endorse or promote products derived   #
-#       from this software without specific prior written permission.     #
-#                                                                         #
-# THIS SOFTWARE IS PROVIDED BY UChicago Argonne, LLC AND CONTRIBUTORS     #
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       #
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS       #
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UChicago     #
-# Argonne, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,        #
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,    #
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;        #
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER        #
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT      #
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN       #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE         #
-# POSSIBILITY OF SUCH DAMAGE.                                             #
-# ----------------------------------------------------------------------- #

syned-1.0.34/syned/tools/benders/__init__.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# ----------------------------------------------------------------------- #
-# Copyright (c) 2023, UChicago Argonne, LLC. All rights reserved.         #
-#                                                                         #
-# Copyright 2023. UChicago Argonne, LLC. This software was produced       #
-# under U.S. Government contract DE-AC02-06CH11357 for Argonne National   #
-# Laboratory (ANL), which is operated by UChicago Argonne, LLC for the    #
-# U.S. Department of Energy. The U.S. Government has rights to use,       #
-# reproduce, and distribute this software.  NEITHER THE GOVERNMENT NOR    #
-# UChicago Argonne, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR        #
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is     #
-# modified to produce derivative works, such modified software should     #
-# be clearly marked, so as not to confuse it with the version available   #
-# from ANL.                                                               #
-#                                                                         #
-# Additionally, redistribution and use in source and binary forms, with   #
-# or without modification, are permitted provided that the following      #
-# conditions are met:                                                     #
-#                                                                         #
-#     * Redistributions of source code must retain the above copyright    #
-#       notice, this list of conditions and the following disclaimer.     #
-#                                                                         #
-#     * Redistributions in binary form must reproduce the above copyright #
-#       notice, this list of conditions and the following disclaimer in   #
-#       the documentation and/or other materials provided with the        #
-#       distribution.                                                     #
-#                                                                         #
-#     * Neither the name of UChicago Argonne, LLC, Argonne National       #
-#       Laboratory, ANL, the U.S. Government, nor the names of its        #
-#       contributors may be used to endorse or promote products derived   #
-#       from this software without specific prior written permission.     #
-#                                                                         #
-# THIS SOFTWARE IS PROVIDED BY UChicago Argonne, LLC AND CONTRIBUTORS     #
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       #
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS       #
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UChicago     #
-# Argonne, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,        #
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,    #
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;        #
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER        #
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT      #
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN       #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE         #
-# POSSIBILITY OF SUCH DAMAGE.                                             #
-# ----------------------------------------------------------------------- #

syned-1.0.34/syned/tools/benders/bender_io.py

@@ -1,123 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# ----------------------------------------------------------------------- #
-# Copyright (c) 2021, UChicago Argonne, LLC. All rights reserved.         #
-#                                                                         #
-# Copyright 2021. UChicago Argonne, LLC. This software was produced       #
-# under U.S. Government contract DE-AC02-06CH11357 for Argonne National   #
-# Laboratory (ANL), which is operated by UChicago Argonne, LLC for the    #
-# U.S. Department of Energy. The U.S. Government has rights to use,       #
-# reproduce, and distribute this software.  NEITHER THE GOVERNMENT NOR    #
-# UChicago Argonne, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR        #
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is     #
-# modified to produce derivative works, such modified software should     #
-# be clearly marked, so as not to confuse it with the version available   #
-# from ANL.                                                               #
-#                                                                         #
-# Additionally, redistribution and use in source and binary forms, with   #
-# or without modification, are permitted provided that the following      #
-# conditions are met:                                                     #
-#                                                                         #
-#     * Redistributions of source code must retain the above copyright    #
-#       notice, this list of conditions and the following disclaimer.     #
-#                                                                         #
-#     * Redistributions in binary form must reproduce the above copyright #
-#       notice, this list of conditions and the following disclaimer in   #
-#       the documentation and/or other materials provided with the        #
-#       distribution.                                                     #
-#                                                                         #
-#     * Neither the name of UChicago Argonne, LLC, Argonne National       #
-#       Laboratory, ANL, the U.S. Government, nor the names of its        #
-#       contributors may be used to endorse or promote products derived   #
-#       from this software without specific prior written permission.     #
-#                                                                         #
-# THIS SOFTWARE IS PROVIDED BY UChicago Argonne, LLC AND CONTRIBUTORS     #
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       #
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS       #
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UChicago     #
-# Argonne, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,        #
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,    #
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;        #
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER        #
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT      #
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN       #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE         #
-# POSSIBILITY OF SUCH DAMAGE.                                             #
-# ----------------------------------------------------------------------- #
-
-class BenderStructuralParameters:
-    def __init__(self,
-                 dim_x_minus=None,
-                 dim_x_plus=None,
-                 bender_bin_x=None,
-                 dim_y_minus=None,
-                 dim_y_plus=None,
-                 bender_bin_y=None,
-                 p=None,
-                 q=None,
-                 grazing_angle=None,
-                 E=None,
-                 h=None,
-                 figure_error_mesh=None,
-                 workspace_units_to_m=None,
-                 workspace_units_to_mm=None):
-        self.dim_x_minus = dim_x_minus 
-        self.dim_x_plus = dim_x_plus 
-        self.bender_bin_x = bender_bin_x 
-        self.dim_y_minus = dim_y_minus 
-        self.dim_y_plus = dim_y_plus 
-        self.bender_bin_y = bender_bin_y
-        self.p                = p
-        self.q                = q
-        self.grazing_angle    = grazing_angle
-        self.E = E
-        self.h = h 
-        self.figure_error_mesh = figure_error_mesh
-        self.workspace_units_to_m = workspace_units_to_m
-        self.workspace_units_to_mm = workspace_units_to_mm
-
-# ----------------------------------------------------------------------
-# Bender FIT
-# ----------------------------------------------------------------------
-
-class BenderFitParameters():
-    def __init__(self,
-                 optimized_length = None,
-                 n_fit_steps=None):
-        self.optimized_length = optimized_length
-        self.n_fit_steps      = n_fit_steps
-
-class BenderOuputData:
-    def __init__(self,
-                 x=None,
-                 y=None,
-                 ideal_profile=None,
-                 bender_profile=None,
-                 correction_profile=None,
-                 titles=None,
-                 z_bender_correction=None,
-                 z_figure_error=None,
-                 z_bender_correction_no_figure_error=None):
-        self.x = x
-        self.y = y
-        self.ideal_profile       = ideal_profile
-        self.bender_profile      = bender_profile
-        self.correction_profile  = correction_profile
-        self.titles              = titles
-        self.z_bender_correction = z_bender_correction
-        self.z_figure_error      = z_figure_error
-        self.z_bender_correction_no_figure_error=z_bender_correction_no_figure_error
-
-# ----------------------------------------------------------------------
-# Bender Movements
-# ----------------------------------------------------------------------
-
-class BenderMovement():
-    def __init__(self, position_upstream=None, position_downstream=None):
-        self.__position_upstream   = position_upstream
-        self.__position_downstream = position_downstream
-
-    @property
-    def position_upstream(self): return self.__position_upstream
-    @property
-    def position_downstream(self): return self.__position_downstream

syned-1.0.34/syned/tools/benders/bender_manager.py

@@ -1,170 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# ----------------------------------------------------------------------- #
-# Copyright (c) 2023, UChicago Argonne, LLC. All rights reserved.         #
-#                                                                         #
-# Copyright 2023. UChicago Argonne, LLC. This software was produced       #
-# under U.S. Government contract DE-AC02-06CH11357 for Argonne National   #
-# Laboratory (ANL), which is operated by UChicago Argonne, LLC for the    #
-# U.S. Department of Energy. The U.S. Government has rights to use,       #
-# reproduce, and distribute this software.  NEITHER THE GOVERNMENT NOR    #
-# UChicago Argonne, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR        #
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is     #
-# modified to produce derivative works, such modified software should     #
-# be clearly marked, so as not to confuse it with the version available   #
-# from ANL.                                                               #
-#                                                                         #
-# Additionally, redistribution and use in source and binary forms, with   #
-# or without modification, are permitted provided that the following      #
-# conditions are met:                                                     #
-#                                                                         #
-#     * Redistributions of source code must retain the above copyright    #
-#       notice, this list of conditions and the following disclaimer.     #
-#                                                                         #
-#     * Redistributions in binary form must reproduce the above copyright #
-#       notice, this list of conditions and the following disclaimer in   #
-#       the documentation and/or other materials provided with the        #
-#       distribution.                                                     #
-#                                                                         #
-#     * Neither the name of UChicago Argonne, LLC, Argonne National       #
-#       Laboratory, ANL, the U.S. Government, nor the names of its        #
-#       contributors may be used to endorse or promote products derived   #
-#       from this software without specific prior written permission.     #
-#                                                                         #
-# THIS SOFTWARE IS PROVIDED BY UChicago Argonne, LLC AND CONTRIBUTORS     #
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT       #
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS       #
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL UChicago     #
-# Argonne, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,        #
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,    #
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;        #
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER        #
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT      #
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN       #
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE         #
-# POSSIBILITY OF SUCH DAMAGE.                                             #
-# ----------------------------------------------------------------------- #
-
-import numpy
-
-from syned.tools.benders.bender_io import BenderOuputData, BenderFitParameters, BenderStructuralParameters, BenderMovement
-
-class AbstractBenderManager:
-    def __init__(self, bender_structural_parameters : BenderStructuralParameters):
-        self._bender_structural_parameters = bender_structural_parameters
-
-    @property
-    def bender_structural_parameters(self): return self._bender_structural_parameters
-
-    def fit_bender_at_focus_position(self, bender_fit_parameters: BenderFitParameters) -> BenderOuputData: raise NotImplementedError
-    def get_bender_shape_from_movement(self, bender_movement: BenderMovement) ->  BenderOuputData: raise NotImplementedError
-
-    def get_q_upstream(self, bender_movement : BenderMovement):   raise NotImplementedError
-    def get_q_downstream(self, bender_movement : BenderMovement): raise NotImplementedError
-
-    def calculate_ideal_surface(self, q=None, sign=-1):
-        c1, c2, c3, c4, c5, c6, c7, c8, c9, c10 = self.get_conic_coefficients(q)
-
-        x = numpy.linspace(-self.bender_structural_parameters.dim_x_minus, self.bender_structural_parameters.dim_x_plus, self.bender_structural_parameters.bender_bin_x + 1)
-        y = numpy.linspace(-self.bender_structural_parameters.dim_y_minus, self.bender_structural_parameters.dim_y_plus, self.bender_structural_parameters.bender_bin_y + 1)
-
-        xx, yy = numpy.meshgrid(x, y)
-
-        c = c1 * (xx ** 2) + c2 * (yy ** 2) + c4 * xx * yy + c7 * xx + c8 * yy + c10
-        b = c5 * yy + c6 * xx + c9
-        a = c3
-
-        z = (-b + sign * numpy.sqrt(b ** 2 - 4 * a * c)) / (2 * a)
-        z[b ** 2 - 4 * a * c < 0] = numpy.nan
-
-        return x, y, z.T
-
-    def get_conic_coefficients(self, q=None):
-        theta_grazing = self.bender_structural_parameters.grazing_angle
-        ssour         = self.bender_structural_parameters.p
-        simag         = q if not q is None else self.bender_structural_parameters.q
-
-        theta = (numpy.pi / 2) - theta_grazing
-
-        ax_maj = (ssour + simag) / 2
-        ax_min = numpy.sqrt(simag * ssour) * numpy.cos(theta)
-        eccentricity = numpy.sqrt(ax_maj ** 2 - ax_min ** 2) / ax_maj
-        #
-        # The center is computed on the basis of the object and image positions
-        #
-        y_center = (ssour - simag) * 0.5 / eccentricity
-        z_center = -numpy.sqrt(1 - y_center ** 2 / ax_maj ** 2) * ax_min
-        #
-        # Computes now the normal in the mirror center.
-        #
-        rn_center = numpy.zeros(3)
-        rn_center[0] = 0.0
-        rn_center[1] = -2 * y_center / ax_maj ** 2
-        rn_center[2] = -2 * z_center / ax_min ** 2
-        rn_center /= numpy.sqrt((rn_center ** 2).sum())
-        #
-        # Computes the tangent versor in the mirror center.
-        #
-        rt_center = numpy.zeros(3)
-        rt_center[0] = 0.0
-        rt_center[1] = rn_center[2]
-        rt_center[2] = -rn_center[1]
-
-        # Computes now the quadric coefficient with the mirror center
-        # located at (0,0,0) and normal along (0,0,1)
-
-        A = 1 / ax_min ** 2
-        B = 1 / ax_maj ** 2
-        C = A
-
-        c1 = 0.0  # A if ellipsoid and 0 if cylinder -> managed benders are only cylinders
-        c2 = B * rt_center[1] ** 2 + C * rt_center[2] ** 2
-        c3 = B * rn_center[1] ** 2 + C * rn_center[2] ** 2
-        c4 = 0.0
-        c5 = 2 * (B * rn_center[1] * rt_center[1] + C * rn_center[2] * rt_center[2])
-        c6 = 0.0
-        c7 = 0.0
-        c8 = 0.0
-        c9 = 2 * (B * y_center * rn_center[1] + C * z_center * rn_center[2])
-        c10 = 0.0
-
-        return c1, c2, c3, c4, c5, c6, c7, c8, c9, c10
-
-class CalibrationParameters:
-    __parameters_upstream   = [0.0, 0.0]
-    __parameters_downstream = [0.0, 0.0]
-
-    def __init__(self, parameters_upstream, parameters_downstream):
-        self.__parameters_upstream   = parameters_upstream
-        self.__parameters_downstream = parameters_downstream
-
-    @property
-    def upstream(self):   return self.__parameters_upstream
-    @property
-    def downstream(self): return self.__parameters_downstream
-
-class StandardBenderManager(AbstractBenderManager):
-    def __init__(self, bender_structural_parameters : BenderStructuralParameters):
-        super(StandardBenderManager, self).__init__(bender_structural_parameters=bender_structural_parameters)
-
-    def get_q_upstream(self, bender_movement : BenderMovement):   return bender_movement.position_upstream # position coincides with q -> direct calculation
-    def get_q_downstream(self, bender_movement : BenderMovement): return bender_movement.position_downstream
-
-class CalibratedBenderManager(AbstractBenderManager):
-    def __init__(self, bender_structural_parameters : BenderStructuralParameters, calibration_parameters : CalibrationParameters):
-        super(CalibrationParameters, self).__init__(bender_structural_parameters=bender_structural_parameters)
-        self._calibration_parameters       = calibration_parameters
-
-
-    def get_q_upstream(self, bender_movement : BenderMovement):
-        if bender_movement.position_upstream is None: return None
-        return CalibratedBenderManager.__get_q_from_calibration(bender_movement.position_upstream,
-                                                                self._calibration_parameters.upstream)
-
-    def get_q_downstream(self, bender_movement : BenderMovement):
-        if bender_movement.position_downstream is None: return None
-        return CalibratedBenderManager.__get_q_from_calibration(bender_movement.position_downstream,
-                                                                self._calibration_parameters.downstream)
-
-    @classmethod # 1/q = p0*pos + p1
-    def __get_q_from_calibration(cls, position, parameters):  return 1 / (parameters[0] * position + parameters[1])