Add Quad Trims in IDFF

siriuspy/siriuspy/clientconfigdb/types/si_idff.py

@@ -22,7 +22,7 @@ def get_dict():
 #
 # 1st-level keys:
 #   - 'pvnames': its value is a dict with
-#       ('pparameter', 'kparameter', 'ch1', 'ch2', ... 'qs1', 'qs2') as
+#       ('pparameter', 'kparameter', 'ch_1', 'ch_2', ... 'qs_1', 'qs_2') as
 #       keys and corresponding pvname values for
 #       ID k-variation parameter readout and correctors setpoints.
 #   - 'polarizations': its value is a dict with
@@ -35,69 +35,75 @@ def get_dict():
 #   2) kparameter: pvname that varies k (photon energy) configurations
 #   3) 'none' polarization configuration should always be in the config.
 #       it is a transition configuration between polarization configs.
+#
+# See siriuspy.search.IDSearch for more details
 
 _template_dict = {
     'description': 'description of the IDFF particularities.',
     'pvnames': {
         'pparameter': 'SI-10SB:ID-EPU50:Phase-Mon',
         'kparameter': 'SI-10SB:ID-EPU50:Gap-Mon',
-        'ch1': 'SI-10SB:PS-CH-1:Current-SP',
-        'ch2': 'SI-10SB:PS-CH-2:Current-SP',
-        'cv1': 'SI-10SB:PS-CV-1:Current-SP',
-        'cv2': 'SI-10SB:PS-CV-2:Current-SP',
-        'qs1': 'SI-10SB:PS-QS-1:Current-SP',
-        'qs2': 'SI-10SB:PS-QS-2:Current-SP',
+        'ch_1': 'SI-10SB:PS-CH-1:Current-SP',
+        'ch_2': 'SI-10SB:PS-CH-2:Current-SP',
+        'cv_1': 'SI-10SB:PS-CV-1:Current-SP',
+        'cv_2': 'SI-10SB:PS-CV-2:Current-SP',
+        'qs_1': 'SI-10SB:PS-QS-1:Current-SP',
+        'qs_2': 'SI-10SB:PS-QS-2:Current-SP',
+    },
+    'offsets': {
+        'qs_1': 0.0,
+        'qs_2': 0.0,
     },
     'polarizations': {
         'none': {
             'pparameter': [-16.39, 0.0, 16.39, 25.0],
             'kparameter': 300,
-            'ch1': 4*[0],
-            'ch2': 4*[0],
-            'cv1': 4*[0],
-            'cv2': 4*[0],
-            'qs1': 4*[0],
-            'qs2': 4*[0],
+            'ch_1': 4*[0],
+            'ch_2': 4*[0],
+            'cv_1': 4*[0],
+            'cv_2': 4*[0],
+            'qs_1': 4*[0],
+            'qs_2': 4*[0],
             },
         'circularn': {
             'pparameter': -16.39,
             'kparameter': [22.0, 300.0],
-            'ch1': 2*[0],
-            'ch2': 2*[0],
-            'cv1': 2*[0],
-            'cv2': 2*[0],
-            'qs1': 2*[0],
-            'qs2': 2*[0],
+            'ch_1': 2*[0],
+            'ch_2': 2*[0],
+            'cv_1': 2*[0],
+            'cv_2': 2*[0],
+            'qs_1': 2*[0],
+            'qs_2': 2*[0],
             },
         'horizontal': {
             'pparameter': 0,
             'kparameter': [22.0, 100.0, 300.0],
-            'ch1': 3*[0],
-            'ch2': 3*[0],
-            'cv1': 3*[0],
-            'cv2': 3*[0],
-            'qs1': 3*[0],
-            'qs2': 3*[0],
+            'ch_1': 3*[0],
+            'ch_2': 3*[0],
+            'cv_1': 3*[0],
+            'cv_2': 3*[0],
+            'qs_1': 3*[0],
+            'qs_2': 3*[0],
             },
         'circularp': {
             'pparameter': 16.39,
             'kparameter': [22.0, 300.0],
-            'ch1': 2*[0],
-            'ch2': 2*[0],
-            'cv1': 2*[0],
-            'cv2': 2*[0],
-            'qs1': 2*[0],
-            'qs2': 2*[0],
+            'ch_1': 2*[0],
+            'ch_2': 2*[0],
+            'cv_1': 2*[0],
+            'cv_2': 2*[0],
+            'qs_1': 2*[0],
+            'qs_2': 2*[0],
             },
         'vertical': {
             'pparameter': 25,
             'kparameter': [22.0, 60, 100.0, 200, 300.0],
-            'ch1': 5*[0],
-            'ch2': 5*[0],
-            'cv1': 5*[0],
-            'cv2': 5*[0],
-            'qs1': 5*[0],
-            'qs2': 5*[0],
+            'ch_1': 5*[0],
+            'ch_2': 5*[0],
+            'cv_1': 5*[0],
+            'cv_2': 5*[0],
+            'qs_1': 5*[0],
+            'qs_2': 5*[0],
             },
     },
 }