Update tables for PAPU50 correctors

beaglebone/beaglebone-udc.txt

@@ -195,6 +195,7 @@ IA-19RaCtrl:CO-PSCtrl-SI4       IA-19RaPS02:PS-UDC-SI4      IA-19RaPS02:PS-UDC-S
 IA-20RaCtrl:CO-PSCtrl-SI4       IA-20RaPS02:PS-UDC-SI4      IA-20RaPS02:PS-UDC-SI5
 
 IA-10RaCtrl:CO-PSCtrl-SI5       IA-10RaPS02:PS-UDC-SI7      IA-10RaPS02:PS-UDC-SI8
+IA-17RaCtrl:CO-PSCtrl-SI5       IA-17RaPS01:PS-UDC-SI6
 
 # ______ IT ______
 

beaglebone/ip-list.txt

@@ -197,6 +197,7 @@ IA-19RaCtrl:CO-PSCtrl-SI4   10.128.119.132
 IA-20RaCtrl:CO-PSCtrl-SI4   10.128.120.132
 
 IA-10RaCtrl:CO-PSCtrl-SI5   10.128.110.133
+IA-17RaCtrl:CO-PSCtrl-SI5   10.128.117.133
 
 
 # Regatron DCLink IP Mapping

beaglebone/udc-bsmp.txt

@@ -279,6 +279,7 @@ IA-20RaPS01:PS-UDC-SI5      SI-20C2:PS-CH 5     SI-20C2:PS-CV-1 6   SI-20C2:PS-C
 
 IA-01RaPS01:PS-UDC-SI6      SI-01M1:PS-FFCH 8   SI-01M1:PS-FFCV 9   SI-01M2:PS-FFCH 10  SI-01M2:PS-FFCV 11
 IA-14RaPS01:PS-UDC-SI6      SI-14SB:PS-CH-1 9   SI-14SB:PS-CH-2 10
+IA-17RaPS01:PS-UDC-SI6      SI-17SA:PS-CH-1 1   SI-17SA:PS-CH-2 2   SI-17SA:PS-CV-1 3   SI-17SA:PS-CV-2 4
 
 IA-01RaPS02:PS-UDC-SI1      SI-01C1:PS-Q1 1     SI-01C1:PS-Q2 2     SI-01C2:PS-Q3 3     SI-01C2:PS-Q4 4
 IA-02RaPS02:PS-UDC-SI1      SI-02C1:PS-Q1 1     SI-02C1:PS-Q2 2     SI-02C2:PS-Q3 3     SI-02C2:PS-Q4 4

magnet/excitation-data/si-corrector-papu50-ch.txt

@@ -0,0 +1,84 @@
+# HEADER
+# ======
+# label             si-corrector-papu50-ch
+# harmonics         0 2 4
+# main_harmonic     0 normal
+# rescaling_factor  1.0
+# units             Ampere  T.m T.m  T/m T/m  T/m^3 T/m^3
+
+# EXCITATION DATA
+# ===============
+-0010.0000  -1.5683e-04 +6.6756e-07  +7.8353e-02 -1.8208e-03  -1.0092e+01 +8.8232e-01
+-0008.0000  -1.2550e-04 +5.3286e-07  +6.2918e-02 -1.4081e-03  -1.1486e+01 +2.0600e-01
+-0006.0000  -9.4128e-05 +4.0673e-07  +4.7243e-02 -1.0244e-03  -1.0029e+01 -1.0701e-01
+-0004.0000  -6.2746e-05 +2.7913e-07  +3.1473e-02 -6.6475e-04  -7.0325e+00 -1.7667e-01
+-0002.0000  -3.1367e-05 +1.4417e-07  +1.5707e-02 -3.2456e-04  -3.4744e+00 -1.0979e-01
++0000.0000  +0.0000e+00 +0.0000e+00  +0.0000e+00 +0.0000e+00  +0.0000e+00 +0.0000e+00
++0002.0000  +3.1353e-05 -1.5110e-07  -1.5641e-02 +3.1214e-04  +3.0785e+00 +7.2231e-02
++0004.0000  +6.2701e-05 -3.0276e-07  -3.1252e-02 +6.1447e-04  +5.7820e+00 +3.9600e-02
++0006.0000  +9.4058e-05 -4.4455e-07  -4.6915e-02 +9.0894e-04  +8.4643e+00 -1.5202e-01
++0008.0000  +1.2545e-04 -5.6190e-07  -6.2759e-02 +1.1969e-03  +1.1812e+01 -5.4361e-01
++0010.0000  +1.5690e-04 -6.3618e-07  -7.8956e-02 +1.4790e-03  +1.6846e+01 -1.1630e+00
+
+# COMMENTS
+# ========
+# 1. file generated automatically from rotating coil measurement data
+# 2. timestamp: 2023-06-01-16:39:32.265
+# 3. magnet_type_label: FFC
+# 4. magnet_serial_number: 1,2
+# 5. data_set: CH
+# 6. data was fit with a polynomial of order 4 and remanent/ambient field subtracted.
+# 7. data in https://github.com/lnls-ima/id-papu/tree/master/feedforward-correctors/model-01/measurement/magnetic/rotcoil
+# 8. script https://github.com/lnls-ima/id-papu/tree/master/feedforward-correctors/excdata/excdata.py
+
+# POLARITY TABLE
+# ==============
+#
+# Magnet function         | IntStrength(1) | IntField(2) | ConvSign(3) | Current(4)
+# ------------------------|----------------|-------------|-------------|-----------
+# dipole                  | Angle > 0      | BYL  < 0    | -1.0        | I > 0
+# corrector-horizontal    | HKick > 0      | BYL  > 0    | +1.0        | I > 0
+# corrector-vertical      | VKick > 0      | BXL  < 0    | -1.0        | I > 0
+# quadrupole (focusing)   | KL    > 0      | D1NL < 0    | -1.0        | I > 0
+# quadrupole (defocusing) | KL    < 0      | D1NL > 0    | -1.0        | I > 0
+# quadrupole (skew)       | KL    < 0      | D1SL > 0    | -1.0        | I > 0
+# sextupole  (focusing)   | SL    > 0      | D2NL < 0    | -1.0        | I > 0
+# sextupole  (defocusing) | SL    < 0      | D2NL > 0    | -1.0        | I > 0
+#
+# Defs:
+# ----
+# BYL   := \int{dz By|_{x=y=0}}.
+# BXL   := \int{dz Bx|_{x=y=0}}.
+# D1NL  := \int{dz \frac{dBy}{dx}_{x=y=0}}
+# D2NL  := (1/2!) \int{dz \frac{d^2By}{dx^2}_{x=y=0}}
+# D1SL  := \int{dz \frac{dBx}{dx}_{x=y=0}}
+# Brho  := magnetic rigidity.
+# Angle := ConvSign * BYL / abs(Brho)
+# HKick := ConvSign * BYL / abs(Brho)
+# VKick := ConvSign * BXL / abs(Brho)
+# KL    := ConvSign * D1NL / abs(Brho)
+# KL    := ConvSign * D1SL / abs(Brho)
+# SL    := ConvSign * D2NL / abs(Brho)
+#
+# Obs:
+# ---
+# (1) Parameter definition.
+#     IntStrength values correspond to integrated PolynomA and PolynomB parameters
+#     of usual beam tracking codes, with the exception that VKick has its sign
+#     reversed with respecto to its corresponding value in PolynomA.
+# (2) Sirius coordinate system and Lorentz force.
+# (3) Conversion sign for IntField <-> IntStrength
+# (4) Convention of magnet excitation polarity, so that when I > 0 the strength
+#     of the magnet has the expected conventional sign.
+
+# STATIC DATA FILE FORMAT
+# =======================
+#
+# These static data files should comply with the following formatting rules:
+# 1. If the first alphanumeric character of the line is not the pound sign
+#    then the lines is a comment.
+# 2. If the first alphanumeric character is "#" then if
+#    a) it is followed by "[<parameter>] <value>" a parameter names <parameter>
+#       is define with value <value>. if the string <value> has spaces in it
+#       it is split as a list of strings.
+#    b) otherwise the line is ignored as a comment line.

magnet/excitation-data/si-corrector-papu50-cv.txt

@@ -0,0 +1,84 @@
+# HEADER
+# ======
+# label             si-corrector-papu50-cv
+# harmonics         0 2 4
+# main_harmonic     0 skew
+# rescaling_factor  1.0
+# units             Ampere  T.m T.m  T/m T/m  T/m^3 T/m^3
+
+# EXCITATION DATA
+# ===============
+-0010.0000  -1.4743e-06 +3.1853e-04  +2.6527e-03 +2.0804e-01  -1.6769e+00 -4.7873e+01
+-0008.0000  -1.1323e-06 +2.5493e-04  +2.1268e-03 +1.6647e-01  +9.2838e-01 -3.9934e+01
+-0006.0000  -8.4204e-07 +1.9124e-04  +1.5655e-03 +1.2481e-01  +1.3511e+00 -3.1054e+01
+-0004.0000  -5.7070e-07 +1.2750e-04  +1.0101e-03 +8.3160e-02  +8.1251e-01 -2.1305e+01
+-0002.0000  -2.9472e-07 +6.3744e-05  +4.8560e-04 +4.1550e-02  +1.8663e-01 -1.0862e+01
++0000.0000  +0.0000e+00 +0.0000e+00  +0.0000e+00 +0.0000e+00  +0.0000e+00 +0.0000e+00
++0002.0000  +3.1818e-07 -6.3724e-05  -4.5536e-04 -4.1498e-02  +4.3180e-01 +1.0900e+01
++0004.0000  +6.5513e-07 -1.2742e-04  -9.0590e-04 -8.2980e-02  +1.3138e+00 +2.1356e+01
++0006.0000  +9.9673e-07 -1.9111e-04  -1.3938e-03 -1.2451e-01  +2.1305e+00 +3.0782e+01
++0008.0000  +1.3195e-06 -2.5480e-04  -1.9779e-03 -1.6617e-01  +2.0189e+00 +3.8491e+01
++0010.0000  +1.5904e-06 -3.1852e-04  -2.7339e-03 -2.0808e-01  -2.3127e-01 +4.3691e+01
+
+# COMMENTS
+# ========
+# 1. file generated automatically from rotating coil measurement data
+# 2. timestamp: 2023-06-01-16:39:34.327
+# 3. magnet_type_label: FFC
+# 4. magnet_serial_number: 1,2
+# 5. data_set: CV
+# 6. data was fit with a polynomial of order 4 and remanent/ambient field subtracted.
+# 7. data in https://github.com/lnls-ima/id-papu/tree/master/feedforward-correctors/model-01/measurement/magnetic/rotcoil
+# 8. script https://github.com/lnls-ima/id-papu/tree/master/feedforward-correctors/excdata/excdata.py
+
+# POLARITY TABLE
+# ==============
+#
+# Magnet function         | IntStrength(1) | IntField(2) | ConvSign(3) | Current(4)
+# ------------------------|----------------|-------------|-------------|-----------
+# dipole                  | Angle > 0      | BYL  < 0    | -1.0        | I > 0
+# corrector-horizontal    | HKick > 0      | BYL  > 0    | +1.0        | I > 0
+# corrector-vertical      | VKick > 0      | BXL  < 0    | -1.0        | I > 0
+# quadrupole (focusing)   | KL    > 0      | D1NL < 0    | -1.0        | I > 0
+# quadrupole (defocusing) | KL    < 0      | D1NL > 0    | -1.0        | I > 0
+# quadrupole (skew)       | KL    < 0      | D1SL > 0    | -1.0        | I > 0
+# sextupole  (focusing)   | SL    > 0      | D2NL < 0    | -1.0        | I > 0
+# sextupole  (defocusing) | SL    < 0      | D2NL > 0    | -1.0        | I > 0
+#
+# Defs:
+# ----
+# BYL   := \int{dz By|_{x=y=0}}.
+# BXL   := \int{dz Bx|_{x=y=0}}.
+# D1NL  := \int{dz \frac{dBy}{dx}_{x=y=0}}
+# D2NL  := (1/2!) \int{dz \frac{d^2By}{dx^2}_{x=y=0}}
+# D1SL  := \int{dz \frac{dBx}{dx}_{x=y=0}}
+# Brho  := magnetic rigidity.
+# Angle := ConvSign * BYL / abs(Brho)
+# HKick := ConvSign * BYL / abs(Brho)
+# VKick := ConvSign * BXL / abs(Brho)
+# KL    := ConvSign * D1NL / abs(Brho)
+# KL    := ConvSign * D1SL / abs(Brho)
+# SL    := ConvSign * D2NL / abs(Brho)
+#
+# Obs:
+# ---
+# (1) Parameter definition.
+#     IntStrength values correspond to integrated PolynomA and PolynomB parameters
+#     of usual beam tracking codes, with the exception that VKick has its sign
+#     reversed with respecto to its corresponding value in PolynomA.
+# (2) Sirius coordinate system and Lorentz force.
+# (3) Conversion sign for IntField <-> IntStrength
+# (4) Convention of magnet excitation polarity, so that when I > 0 the strength
+#     of the magnet has the expected conventional sign.
+
+# STATIC DATA FILE FORMAT
+# =======================
+#
+# These static data files should comply with the following formatting rules:
+# 1. If the first alphanumeric character of the line is not the pound sign
+#    then the lines is a comment.
+# 2. If the first alphanumeric character is "#" then if
+#    a) it is followed by "[<parameter>] <value>" a parameter names <parameter>
+#       is define with value <value>. if the string <value> has spaces in it
+#       it is split as a list of strings.
+#    b) otherwise the line is ignored as a comment line.

magnet/magnet-excitation-ps.txt

@@ -1021,6 +1021,10 @@ SI-10SB:MA-QS-1              SI-10SB:PS-QS-1
 SI-10SB:MA-QS-2              SI-10SB:PS-QS-2
 SI-14SB:MA-CH-1              SI-14SB:PS-CH-1
 SI-14SB:MA-CH-2              SI-14SB:PS-CH-2
+SI-17SA:MA-CH-1              SI-17SA:PS-CH-1
+SI-17SA:MA-CH-2              SI-17SA:PS-CH-2
+SI-17SA:MA-CV-1              SI-17SA:PS-CV-1
+SI-17SA:MA-CV-2              SI-17SA:PS-CV-2
 
 # --- Septa feedforward correctors ---
 SI-01M1:MA-FFCH              SI-01M1:PS-FFCH

magnet/magnets-model-data.txt

@@ -1035,6 +1035,10 @@ SI-17C4:MA-SDB1            434.0207
 SI-17C4:MA-SDB2            432.4907
 SI-17C4:MA-SFB1            433.2407
 SI-17BC:MA-BC              427.6767
+SI-17SA:MA-CH-1            412.6312
+SI-17SA:MA-CV-1            412.6312
+SI-17SA:MA-CH-2            416.7969
+SI-17SA:MA-CV-2            416.7969
 SI-18M1:MA-CH              437.0087
 SI-18M1:MA-CV              437.0087
 SI-18M1:MA-FCH             437.1747

pwrsupply/bsmp-dclink.txt

@@ -485,6 +485,9 @@ SI-14C3:PS-CV-2    IA-14RaPS02:PS-DCLink-SI
 SI-14C4:PS-CH      IA-14RaPS02:PS-DCLink-SI
 SI-14C4:PS-CV      IA-14RaPS02:PS-DCLink-SI
 
+SI-14SB:PS-CH-1    IA-14RaPS01:PS-DCLink-AS
+SI-14SB:PS-CH-2    IA-14RaPS01:PS-DCLink-AS
+
 SI-15M1:PS-CH      IA-15RaPS01:PS-DCLink-SI
 SI-15M1:PS-CV      IA-15RaPS01:PS-DCLink-SI
 SI-15M2:PS-CH      IA-15RaPS01:PS-DCLink-SI
@@ -533,6 +536,11 @@ SI-17C3:PS-CV-2    IA-17RaPS02:PS-DCLink-SI
 SI-17C4:PS-CH      IA-17RaPS02:PS-DCLink-SI
 SI-17C4:PS-CV      IA-17RaPS02:PS-DCLink-SI
 
+SI-17SA:PS-CH-1    IA-17RaPS01:PS-DCLink-AS
+SI-17SA:PS-CV-1    IA-17RaPS01:PS-DCLink-AS
+SI-17SA:PS-CH-2    IA-17RaPS01:PS-DCLink-AS
+SI-17SA:PS-CV-2    IA-17RaPS01:PS-DCLink-AS
+
 SI-18M1:PS-CH      IA-18RaPS01:PS-DCLink-SI
 SI-18M1:PS-CV      IA-18RaPS01:PS-DCLink-SI
 SI-18M2:PS-CH      IA-18RaPS01:PS-DCLink-SI
@@ -581,9 +589,6 @@ SI-20C3:PS-CV-2    IA-20RaPS02:PS-DCLink-SI
 SI-20C4:PS-CH      IA-20RaPS02:PS-DCLink-SI
 SI-20C4:PS-CV      IA-20RaPS02:PS-DCLink-SI
 
-SI-14SB:PS-CH-1    IA-14RaPS01:PS-DCLink-AS
-SI-14SB:PS-CH-2    IA-14RaPS01:PS-DCLink-AS
-
 SI-01M1:PS-FCH     None
 SI-01M1:PS-FCV     None
 SI-01M2:PS-FCH     None

pwrsupply/psmodels.txt

@@ -1109,6 +1109,10 @@ SI-10SB:PS-QS-1               FBP
 SI-10SB:PS-QS-2               FBP
 SI-14SB:PS-CH-1               FBP
 SI-14SB:PS-CH-2               FBP
+SI-17SA:PS-CH-1               FBP
+SI-17SA:PS-CV-1               FBP
+SI-17SA:PS-CH-2               FBP
+SI-17SA:PS-CV-2               FBP
 
 # --- SI Fast Correctors
 

pwrsupply/pstypes-data/si-corrector-papu50-ch.txt

@@ -0,0 +1,7 @@
+# List of power supplies of type si-corrector-papu50-ch
+# =====================================================
+
+# number of power supplies: 2
+
+SI-17SA:PS-CH-1
+SI-17SA:PS-CH-2

pwrsupply/pstypes-data/si-corrector-papu50-cv.txt

@@ -0,0 +1,7 @@
+# List of power supplies of type si-corrector-papu50-cv
+# =====================================================
+
+# number of power supplies: 2
+
+SI-17SA:PS-CV-1
+SI-17SA:PS-CV-2

pwrsupply/pstypes-names.txt

@@ -123,6 +123,8 @@ si-corrector-wig180          bipolar          corrector-horizontal
 si-corrector-epu50-ch        bipolar          corrector-horizontal
 si-corrector-epu50-cv        bipolar          corrector-vertical
 si-corrector-epu50-qs        bipolar          quadrupole-skew
+si-corrector-papu50-ch       bipolar          corrector-horizontal
+si-corrector-papu50-cv       bipolar          corrector-vertical
 si-hping                     bipolar          corrector-horizontal
 si-vping                     bipolar          corrector-vertical
 

pwrsupply/pstypes-setpoint-limits.txt

@@ -148,6 +148,8 @@ si-corrector-wig180          -0005.0   -0005.0   -0005.0   -0005.0   +0005.0   +
 si-corrector-epu50-ch        -0010.0   -0010.0   -0010.0   -0010.0   +0010.0   +0010.0   +0010.0   +0010.0   0.1       0.20      +0005.0   +0000.1
 si-corrector-epu50-cv        -0010.0   -0010.0   -0010.0   -0010.0   +0010.0   +0010.0   +0010.0   +0010.0   0.1       0.20      +0004.5   +0000.1
 si-corrector-epu50-qs        -0005.0   -0005.0   -0005.0   -0005.0   +0005.0   +0005.0   +0005.0   +0005.0   0.1       0.20      +0002.5   +0000.1
+si-corrector-papu50-ch       -0010.0   -0010.0   -0010.0   -0010.0   +0010.0   +0010.0   +0010.0   +0010.0   0.1       0.20      +0005.0   +0000.1
+si-corrector-papu50-cv       -0010.0   -0010.0   -0010.0   -0010.0   +0010.0   +0010.0   +0010.0   +0010.0   0.1       0.20      +0004.5   +0000.1
 # --- insertion devices ---
 si-id-apu22-1991a            +0000.0   +0000.0   +0000.0   +0000.0   +0011.0   +0011.0   +0011.0   +0011.0   0.1       0.00      +0000.0   +0000.0
 si-id-apu22-1991b            +0000.0   +0000.0   +0000.0   +0000.0   +0011.0   +0011.0   +0011.0   +0011.0   0.1       0.00      +0000.0   +0000.0

pwrsupply/siggen-configuration.txt

@@ -1042,6 +1042,10 @@ SI-10SB:PS-QS-1         DampedSine    7          0.1         5.0             0.0
 SI-10SB:PS-QS-2         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
 SI-14SB:PS-CH-1         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
 SI-14SB:PS-CH-2         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
+SI-17SA:PS-CH-1         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
+SI-17SA:PS-CV-1         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
+SI-17SA:PS-CH-2         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
+SI-17SA:PS-CV-2         DampedSine    7          0.1         5.0             0.0           0.0              0.0              10.0              0.0
 
 # === LI ===
 

timesys/high-level-triggers.py

@@ -166,6 +166,8 @@
             'SI-16C3:PS-CV-2:BCKPLN',
             'SI-16C4:PS-CH:BCKPLN', 'SI-16C4:PS-CV:BCKPLN',
 
+            'SI-17SA:PS-CH-1:BCKPLN', 'SI-17SA:PS-CH-2:BCKPLN',
+            'SI-17SA:PS-CV-1:BCKPLN', 'SI-17SA:PS-CV-2:BCKPLN',
             'SI-17M1:PS-CH:BCKPLN', 'SI-17M1:PS-CV:BCKPLN',
             'SI-17M2:PS-CH:BCKPLN', 'SI-17M2:PS-CV:BCKPLN',
             'SI-17C1:PS-CH:BCKPLN', 'SI-17C1:PS-CV:BCKPLN',

timesys/timing-devices-connection.txt

@@ -13,7 +13,7 @@
 
 
 
-# 558
+# 559
 AS-RaMO:TI-EVG:OUT0                 RA-RaMO:CO-DIO:P05
 AS-RaMO:TI-EVG:OUT1                 RA-RaMO:CO-DIO:P01
 AS-RaMO:TI-EVG:OUT2                 RA-RaMO:CO-DIO:P02
@@ -505,6 +505,7 @@ IA-15RaPS02:PS-UDC-SI1:SYNCOUT      IA-15RaPS02:PS-UDC-SI2:SYNCIN
 IA-15RaPS02:PS-UDC-SI4:SYNCOUT      IA-15RaPS02:PS-UDC-SI5:SYNCIN
 IA-16RaPS02:PS-UDC-SI1:SYNCOUT      IA-16RaPS02:PS-UDC-SI2:SYNCIN
 IA-16RaPS02:PS-UDC-SI4:SYNCOUT      IA-16RaPS02:PS-UDC-SI5:SYNCIN
+IA-17RaPS01:PS-UDC-SI5:SYNCOUT      IA-17RaPS01:PS-UDC-SI6:SYNCIN
 IA-17RaPS02:PS-UDC-SI1:SYNCOUT      IA-17RaPS02:PS-UDC-SI2:SYNCIN
 IA-17RaPS02:PS-UDC-SI4:SYNCOUT      IA-17RaPS02:PS-UDC-SI5:SYNCIN
 IA-18RaPS02:PS-UDC-SI1:SYNCOUT      IA-18RaPS02:PS-UDC-SI2:SYNCIN