Skip to content

Commit dd4b534

Browse files
T-NichollsT-Nicholls
committed
Actually get the drive high & low limits this time
1 parent cb820a1 commit dd4b534

File tree

5 files changed

+1544
-1548
lines changed

5 files changed

+1544
-1548
lines changed

‎virtac/create_csv.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ def generate_pv_limits(lattice):
8787
ctrl.upper_ctrl_limit,
8888
ctrl.lower_ctrl_limit,
8989
ctrl.precision,
90-
#ctrl.upper_disp_limit,
91-
#ctrl.lower_disp_limit,
92-
ctrl.upper_ctrl_limit,
93-
ctrl.lower_ctrl_limit,
90+
ctrl.upper_disp_limit,
91+
ctrl.lower_disp_limit,
9492
)
9593
)
9694
try:
@@ -105,10 +103,8 @@ def generate_pv_limits(lattice):
105103
ctrl.upper_ctrl_limit,
106104
ctrl.lower_ctrl_limit,
107105
ctrl.precision,
108-
#ctrl.upper_disp_limit,
109-
#ctrl.lower_disp_limit,
110-
ctrl.upper_ctrl_limit,
111-
ctrl.lower_ctrl_limit,
106+
ctrl.upper_disp_limit,
107+
ctrl.lower_disp_limit,
112108
)
113109
)
114110
return data

‎virtac/data/DIAD/feedback.csv‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -864,144 +864,144 @@ index,field,pv,value,read-only
864864
2122,enabled,SR24C-DI-EBPM-05:CF:ENABLED_S,1,True
865865
2133,enabled,SR24C-DI-EBPM-06:CF:ENABLED_S,1,True
866866
2143,enabled,SR24C-DI-EBPM-07:CF:ENABLED_S,1,True
867-
11,offset,SR01A-PC-Q2D-02:OFFSET1,0,True
868-
1319,offset,SR14A-PC-Q3B-08:OFFSET1,0,True
869-
1706,offset,SR19A-PC-Q3B-08:OFFSET1,0,True
870-
614,offset,SR07A-PC-Q2B-02:OFFSET1,0,True
871-
967,offset,SR10A-PC-Q3B-08:OFFSET1,0,True
872-
1488,offset,SR16A-PC-Q1D-10:OFFSET1,0,True
873-
1825,offset,SR20A-PC-Q1D-10:OFFSET1,0,True
874-
292,offset,SR03A-PC-Q3B-08:OFFSET1,0,True
875-
431,offset,SR05A-PC-Q2D-02:OFFSET1,0,True
867+
923,offset,SR10A-PC-Q2B-02:OFFSET1,0,True
868+
1427,offset,SR16A-PC-Q1B-01:OFFSET1,0,True
876869
352,offset,SR04A-PC-Q3B-03:OFFSET1,0,True
877-
616,offset,SR07A-PC-Q3B-03:OFFSET1,0,True
878-
1977,offset,SR22A-PC-Q2B-09:OFFSET1,0,True
879-
398,offset,SR04A-PC-Q2D-09:OFFSET1,0,True
880-
566,offset,SR06A-PC-Q3B-08:OFFSET1,0,True
881-
250,offset,SR03A-PC-Q3B-03:OFFSET1,0,True
882-
1894,offset,SR21A-PC-Q3B-08:OFFSET1,0,True
883-
1323,offset,SR14A-PC-Q2B-09:OFFSET1,0,True
884-
1407,offset,SR15A-PC-Q1B-10:OFFSET1,0,True
885-
433,offset,SR05A-PC-Q3D-03:OFFSET1,0,True
886-
1710,offset,SR19A-PC-Q2B-09:OFFSET1,0,True
887-
803,offset,SR09A-PC-Q1D-01:OFFSET1,0,True
888-
971,offset,SR10A-PC-Q2B-09:OFFSET1,0,True
889-
669,offset,SR07A-PC-Q1B-10:OFFSET1,0,True
890-
350,offset,SR04A-PC-Q2B-02:OFFSET1,0,True
891-
302,offset,SR03A-PC-Q1B-10:OFFSET1,0,True
892-
737,offset,SR08A-PC-Q3D-08:OFFSET1,0,True
893-
13,offset,SR01A-PC-Q3D-03:OFFSET1,0,True
894-
65,offset,SR01A-PC-Q1B-10:OFFSET1,0,True
895-
570,offset,SR06A-PC-Q2B-09:OFFSET1,0,True
896870
1478,offset,SR16A-PC-Q3D-08:OFFSET1,0,True
897871
1898,offset,SR21A-PC-Q2B-09:OFFSET1,0,True
872+
1075,offset,SR12A-PC-Q1B-01:OFFSET1,0,True
873+
1277,offset,SR14A-PC-Q3B-03:OFFSET1,0,True
874+
857,offset,SR09A-PC-Q2B-09:OFFSET1,0,True
898875
1815,offset,SR20A-PC-Q3D-08:OFFSET1,0,True
899876
1983,offset,SR22A-PC-Q1B-10:OFFSET1,0,True
900-
404,offset,SR04A-PC-Q1D-10:OFFSET1,0,True
901-
1765,offset,SR20A-PC-Q1B-01:OFFSET1,0,True
902-
248,offset,SR03A-PC-Q2B-02:OFFSET1,0,True
877+
55,offset,SR01A-PC-Q3B-08:OFFSET1,0,True
878+
925,offset,SR10A-PC-Q3B-03:OFFSET1,0,True
879+
350,offset,SR04A-PC-Q2B-02:OFFSET1,0,True
880+
522,offset,SR06A-PC-Q2B-02:OFFSET1,0,True
881+
1547,offset,SR17A-PC-Q3B-08:OFFSET1,0,True
903882
1497,offset,SR17A-PC-Q1D-01:OFFSET1,0,True
904-
741,offset,SR08A-PC-Q2D-09:OFFSET1,0,True
905-
1329,offset,SR14A-PC-Q1B-10:OFFSET1,0,True
906883
2001,offset,SR23A-PC-Q1B-01:OFFSET1,0,True
907884
2052,offset,SR23A-PC-Q3B-08:OFFSET1,0,True
908885
1716,offset,SR19A-PC-Q1B-10:OFFSET1,0,True
909886
809,offset,SR09A-PC-Q2D-02:OFFSET1,0,True
910887
1397,offset,SR15A-PC-Q3B-08:OFFSET1,0,True
911888
977,offset,SR10A-PC-Q1B-10:OFFSET1,0,True
912-
608,offset,SR07A-PC-Q1B-01:OFFSET1,0,True
913-
296,offset,SR03A-PC-Q2B-09:OFFSET1,0,True
889+
2086,offset,SR24A-PC-Q2B-02:OFFSET1,0,True
890+
524,offset,SR06A-PC-Q3B-03:OFFSET1,0,True
914891
1482,offset,SR16A-PC-Q2D-09:OFFSET1,0,True
892+
13,offset,SR01A-PC-Q3D-03:OFFSET1,0,True
893+
1583,offset,SR18A-PC-Q2B-02:OFFSET1,0,True
915894
995,offset,SR11A-PC-Q1B-01:OFFSET1,0,True
895+
687,offset,SR08A-PC-Q1B-01:OFFSET1,0,True
896+
1197,offset,SR13A-PC-Q2D-02:OFFSET1,0,True
897+
693,offset,SR08A-PC-Q2B-02:OFFSET1,0,True
916898
1819,offset,SR20A-PC-Q2D-09:OFFSET1,0,True
917899
811,offset,SR09A-PC-Q3D-03:OFFSET1,0,True
918900
475,offset,SR05A-PC-Q3B-08:OFFSET1,0,True
919-
576,offset,SR06A-PC-Q1B-10:OFFSET1,0,True
901+
2088,offset,SR24A-PC-Q3B-03:OFFSET1,0,True
902+
425,offset,SR05A-PC-Q1D-01:OFFSET1,0,True
903+
11,offset,SR01A-PC-Q2D-02:OFFSET1,0,True
904+
1433,offset,SR16A-PC-Q2B-02:OFFSET1,0,True
905+
1047,offset,SR11A-PC-Q3B-08:OFFSET1,0,True
906+
1551,offset,SR17A-PC-Q2B-09:OFFSET1,0,True
920907
1904,offset,SR21A-PC-Q1B-10:OFFSET1,0,True
908+
1585,offset,SR18A-PC-Q3B-03:OFFSET1,0,True
909+
1081,offset,SR12A-PC-Q2B-02:OFFSET1,0,True
910+
5,offset,SR01A-PC-Q1D-01:OFFSET1,0,True
911+
1199,offset,SR13A-PC-Q3D-03:OFFSET1,0,True
912+
695,offset,SR08A-PC-Q3B-03:OFFSET1,0,True
921913
2056,offset,SR23A-PC-Q2B-09:OFFSET1,0,True
914+
863,offset,SR09A-PC-Q1B-10:OFFSET1,0,True
922915
1401,offset,SR15A-PC-Q2B-09:OFFSET1,0,True
923916
1922,offset,SR22A-PC-Q1B-01:OFFSET1,0,True
924-
1771,offset,SR20A-PC-Q2B-02:OFFSET1,0,True
925-
1251,offset,SR13A-PC-Q1B-10:OFFSET1,0,True
917+
1435,offset,SR16A-PC-Q3B-03:OFFSET1,0,True
918+
250,offset,SR03A-PC-Q3B-03:OFFSET1,0,True
926919
1503,offset,SR17A-PC-Q2D-02:OFFSET1,0,True
927-
747,offset,SR08A-PC-Q1D-10:OFFSET1,0,True
920+
1083,offset,SR12A-PC-Q3B-03:OFFSET1,0,True
928921
2007,offset,SR23A-PC-Q2B-02:OFFSET1,0,True
929-
5,offset,SR01A-PC-Q1D-01:OFFSET1,0,True
930-
1638,offset,SR18A-PC-Q1B-10:OFFSET1,0,True
922+
65,offset,SR01A-PC-Q1B-10:OFFSET1,0,True
923+
1319,offset,SR14A-PC-Q3B-08:OFFSET1,0,True
931924
479,offset,SR05A-PC-Q2B-09:OFFSET1,0,True
932-
1773,offset,SR20A-PC-Q3B-03:OFFSET1,0,True
933-
59,offset,SR01A-PC-Q2B-09:OFFSET1,0,True
934-
1353,offset,SR15A-PC-Q2B-02:OFFSET1,0,True
935925
1269,offset,SR14A-PC-Q1B-01:OFFSET1,0,True
936-
1135,offset,SR12A-PC-Q1D-10:OFFSET1,0,True
926+
1706,offset,SR19A-PC-Q3B-08:OFFSET1,0,True
927+
248,offset,SR03A-PC-Q2B-02:OFFSET1,0,True
937928
1051,offset,SR11A-PC-Q2B-09:OFFSET1,0,True
938-
1656,offset,SR19A-PC-Q1B-01:OFFSET1,0,True
929+
1488,offset,SR16A-PC-Q1D-10:OFFSET1,0,True
939930
1505,offset,SR17A-PC-Q3D-03:OFFSET1,0,True
940931
2009,offset,SR23A-PC-Q3B-03:OFFSET1,0,True
941932
1001,offset,SR11A-PC-Q2B-02:OFFSET1,0,True
942933
917,offset,SR10A-PC-Q1B-01:OFFSET1,0,True
943-
1355,offset,SR15A-PC-Q3B-03:OFFSET1,0,True
944-
663,offset,SR07A-PC-Q2B-09:OFFSET1,0,True
934+
1825,offset,SR20A-PC-Q1D-10:OFFSET1,0,True
935+
431,offset,SR05A-PC-Q2D-02:OFFSET1,0,True
945936
1557,offset,SR17A-PC-Q1B-10:OFFSET1,0,True
946-
1843,offset,SR21A-PC-Q1D-01:OFFSET1,0,True
947937
1003,offset,SR11A-PC-Q3B-03:OFFSET1,0,True
948-
516,offset,SR06A-PC-Q1B-01:OFFSET1,0,True
938+
1894,offset,SR21A-PC-Q3B-08:OFFSET1,0,True
949939
2062,offset,SR23A-PC-Q1B-10:OFFSET1,0,True
940+
1323,offset,SR14A-PC-Q2B-09:OFFSET1,0,True
941+
1407,offset,SR15A-PC-Q1B-10:OFFSET1,0,True
950942
1928,offset,SR22A-PC-Q2B-02:OFFSET1,0,True
951-
55,offset,SR01A-PC-Q3B-08:OFFSET1,0,True
943+
433,offset,SR05A-PC-Q3D-03:OFFSET1,0,True
952944
853,offset,SR09A-PC-Q3B-08:OFFSET1,0,True
945+
1710,offset,SR19A-PC-Q2B-09:OFFSET1,0,True
953946
2080,offset,SR24A-PC-Q1B-01:OFFSET1,0,True
954-
344,offset,SR04A-PC-Q1B-01:OFFSET1,0,True
955947
2131,offset,SR24A-PC-Q3D-08:OFFSET1,0,True
956-
1241,offset,SR13A-PC-Q3B-08:OFFSET1,0,True
948+
59,offset,SR01A-PC-Q2B-09:OFFSET1,0,True
957949
485,offset,SR05A-PC-Q1B-10:OFFSET1,0,True
958-
1577,offset,SR18A-PC-Q1B-01:OFFSET1,0,True
959950
1930,offset,SR22A-PC-Q3B-03:OFFSET1,0,True
960-
1191,offset,SR13A-PC-Q1D-01:OFFSET1,0,True
961951
1275,offset,SR14A-PC-Q2B-02:OFFSET1,0,True
962-
687,offset,SR08A-PC-Q1B-01:OFFSET1,0,True
963-
1628,offset,SR18A-PC-Q3B-08:OFFSET1,0,True
964-
394,offset,SR04A-PC-Q3D-08:OFFSET1,0,True
965952
1057,offset,SR11A-PC-Q1B-10:OFFSET1,0,True
953+
570,offset,SR06A-PC-Q2B-09:OFFSET1,0,True
966954
1662,offset,SR19A-PC-Q2B-02:OFFSET1,0,True
967-
923,offset,SR10A-PC-Q2B-02:OFFSET1,0,True
968-
1427,offset,SR16A-PC-Q1B-01:OFFSET1,0,True
955+
296,offset,SR03A-PC-Q2B-09:OFFSET1,0,True
956+
242,offset,SR03A-PC-Q1B-01:OFFSET1,0,True
969957
1125,offset,SR12A-PC-Q3D-08:OFFSET1,0,True
970-
1075,offset,SR12A-PC-Q1B-01:OFFSET1,0,True
971-
1277,offset,SR14A-PC-Q3B-03:OFFSET1,0,True
972-
857,offset,SR09A-PC-Q2B-09:OFFSET1,0,True
973958
1664,offset,SR19A-PC-Q3B-03:OFFSET1,0,True
974959
1849,offset,SR21A-PC-Q2D-02:OFFSET1,0,True
975-
925,offset,SR10A-PC-Q3B-03:OFFSET1,0,True
976-
522,offset,SR06A-PC-Q2B-02:OFFSET1,0,True
960+
1765,offset,SR20A-PC-Q1B-01:OFFSET1,0,True
977961
2135,offset,SR24A-PC-Q2D-09:OFFSET1,0,True
978-
1547,offset,SR17A-PC-Q3B-08:OFFSET1,0,True
962+
292,offset,SR03A-PC-Q3B-08:OFFSET1,0,True
963+
741,offset,SR08A-PC-Q2D-09:OFFSET1,0,True
979964
1245,offset,SR13A-PC-Q2B-09:OFFSET1,0,True
965+
1329,offset,SR14A-PC-Q1B-10:OFFSET1,0,True
980966
1632,offset,SR18A-PC-Q2B-09:OFFSET1,0,True
981-
2086,offset,SR24A-PC-Q2B-02:OFFSET1,0,True
982967
1851,offset,SR21A-PC-Q3D-03:OFFSET1,0,True
983968
1347,offset,SR15A-PC-Q1B-01:OFFSET1,0,True
984-
524,offset,SR06A-PC-Q3B-03:OFFSET1,0,True
969+
608,offset,SR07A-PC-Q1B-01:OFFSET1,0,True
985970
1129,offset,SR12A-PC-Q2D-09:OFFSET1,0,True
986971
659,offset,SR07A-PC-Q3B-08:OFFSET1,0,True
987-
1583,offset,SR18A-PC-Q2B-02:OFFSET1,0,True
988-
1197,offset,SR13A-PC-Q2D-02:OFFSET1,0,True
989-
693,offset,SR08A-PC-Q2B-02:OFFSET1,0,True
990-
2088,offset,SR24A-PC-Q3B-03:OFFSET1,0,True
991-
425,offset,SR05A-PC-Q1D-01:OFFSET1,0,True
992-
1433,offset,SR16A-PC-Q2B-02:OFFSET1,0,True
993-
242,offset,SR03A-PC-Q1B-01:OFFSET1,0,True
994-
1047,offset,SR11A-PC-Q3B-08:OFFSET1,0,True
995-
1551,offset,SR17A-PC-Q2B-09:OFFSET1,0,True
996-
1585,offset,SR18A-PC-Q3B-03:OFFSET1,0,True
997-
1081,offset,SR12A-PC-Q2B-02:OFFSET1,0,True
998-
1199,offset,SR13A-PC-Q3D-03:OFFSET1,0,True
999-
695,offset,SR08A-PC-Q3B-03:OFFSET1,0,True
1000-
863,offset,SR09A-PC-Q1B-10:OFFSET1,0,True
1001-
1435,offset,SR16A-PC-Q3B-03:OFFSET1,0,True
972+
404,offset,SR04A-PC-Q1D-10:OFFSET1,0,True
973+
398,offset,SR04A-PC-Q2D-09:OFFSET1,0,True
974+
576,offset,SR06A-PC-Q1B-10:OFFSET1,0,True
975+
1771,offset,SR20A-PC-Q2B-02:OFFSET1,0,True
1002976
2141,offset,SR24A-PC-Q1D-10:OFFSET1,0,True
1003977
1973,offset,SR22A-PC-Q3B-08:OFFSET1,0,True
1004-
1083,offset,SR12A-PC-Q3B-03:OFFSET1,0,True
978+
747,offset,SR08A-PC-Q1D-10:OFFSET1,0,True
979+
663,offset,SR07A-PC-Q2B-09:OFFSET1,0,True
980+
1251,offset,SR13A-PC-Q1B-10:OFFSET1,0,True
981+
1638,offset,SR18A-PC-Q1B-10:OFFSET1,0,True
982+
1773,offset,SR20A-PC-Q3B-03:OFFSET1,0,True
983+
1353,offset,SR15A-PC-Q2B-02:OFFSET1,0,True
984+
614,offset,SR07A-PC-Q2B-02:OFFSET1,0,True
985+
1135,offset,SR12A-PC-Q1D-10:OFFSET1,0,True
986+
967,offset,SR10A-PC-Q3B-08:OFFSET1,0,True
987+
1656,offset,SR19A-PC-Q1B-01:OFFSET1,0,True
988+
1355,offset,SR15A-PC-Q3B-03:OFFSET1,0,True
989+
616,offset,SR07A-PC-Q3B-03:OFFSET1,0,True
990+
1977,offset,SR22A-PC-Q2B-09:OFFSET1,0,True
991+
566,offset,SR06A-PC-Q3B-08:OFFSET1,0,True
992+
1843,offset,SR21A-PC-Q1D-01:OFFSET1,0,True
993+
302,offset,SR03A-PC-Q1B-10:OFFSET1,0,True
994+
516,offset,SR06A-PC-Q1B-01:OFFSET1,0,True
995+
803,offset,SR09A-PC-Q1D-01:OFFSET1,0,True
996+
394,offset,SR04A-PC-Q3D-08:OFFSET1,0,True
997+
971,offset,SR10A-PC-Q2B-09:OFFSET1,0,True
998+
669,offset,SR07A-PC-Q1B-10:OFFSET1,0,True
999+
344,offset,SR04A-PC-Q1B-01:OFFSET1,0,True
1000+
737,offset,SR08A-PC-Q3D-08:OFFSET1,0,True
1001+
1241,offset,SR13A-PC-Q3B-08:OFFSET1,0,True
1002+
1577,offset,SR18A-PC-Q1B-01:OFFSET1,0,True
1003+
1191,offset,SR13A-PC-Q1D-01:OFFSET1,0,True
1004+
1628,offset,SR18A-PC-Q3B-08:OFFSET1,0,True
10051005
3,golden_offset_x,SR01C-DI-EBPM-01:CF:GOLDEN_X_S,0,False
10061006
3,golden_offset_y,SR01C-DI-EBPM-01:CF:GOLDEN_Y_S,0,False
10071007
3,bcd_offset_x,SR01C-DI-EBPM-01:CF:BCD_X_S,0,False

0 commit comments

Comments
 (0)