Merge pull request #86 from T-Nicholls/latticeDevices

Add ability to have fields to the lattice
DiamondLightSource · Sep 11, 2018 · 77eddb5 · 77eddb5
2 parents 71329dd + 605b972
commit 77eddb5
Show file tree

Hide file tree

Showing 22 changed files with 8,076 additions and 7,967 deletions.
diff --git a/pytac/__init__.py b/pytac/__init__.py
@@ -14,4 +14,5 @@
 """Error 402 is suppressed as we cannot import these modules at the top of the
 file as the strings above must be set first or the imports will fail.
 """
-__all__ = ["data_source", "element", "epics", "exceptions", "lattice", "load_csv", "units", "utils"]
+__all__ = ["data_source", "element", "epics", "exceptions", "lattice",
+           "load_csv", "units", "utils"]
diff --git a/pytac/data/DIAD/devices.csv b/pytac/data/DIAD/devices.csv
@@ -1,4 +1,9 @@
 id,name,field,get_pv,set_pv
+0,SR-DI-DCCT-01,beam_current,SR-DI-DCCT-01:SIGNAL,
+0,SR-DI-EMIT-01,emittance_x,SR-DI-EMIT-01:HEMIT,
+0,SR-DI-EMIT-01,emittance_y,SR-DI-EMIT-01:VEMIT,
+0,SR23C-DI-TMBF-01,tune_x,SR23C-DI-TMBF-01:X:TUNE:TUNE,
+0,SR23C-DI-TMBF-01,tune_y,SR23C-DI-TMBF-01:Y:TUNE:TUNE,
 3,SR01C-DI-EBPM-01,x,SR01C-DI-EBPM-01:SA:X,
 3,SR01C-DI-EBPM-01,y,SR01C-DI-EBPM-01:SA:Y,
 3,SR01C-DI-EBPM-01,enabled,SR01C-DI-EBPM-01:CF:ENABLED_S,
@@ -2813,4 +2818,3 @@ id,name,field,get_pv,set_pv
 189,SR02A-PC-DTRIM-04,db0,SR02A-PC-DTRIM-04:I,SR02A-PC-DTRIM-04:SETI
 136,SR02A-PC-DTRIM-02,db0,SR02A-PC-DTRIM-02:I,SR02A-PC-DTRIM-02:SETI
 164,SR02A-PC-DTRIM-03,db0,SR02A-PC-DTRIM-03:I,SR02A-PC-DTRIM-03:SETI
-2145,SR-DI-DCCT-01,I,SR-DI-DCCT-01:SIGNAL,
diff --git a/pytac/data/DIAD/elements.csv b/pytac/data/DIAD/elements.csv
@@ -2143,4 +2143,3 @@ id,name,type,length,cell
 2142,2142,DRIFT,1.288300,
 2143,2143,BPM,0.000000,24
 2144,2144,DRIFT,4.380000,
-2145,2145,DCCT,0.000000,
diff --git a/pytac/data/DIAD/families.csv b/pytac/data/DIAD/families.csv
@@ -2573,4 +2573,3 @@ id,family
 2142,KD1
 2143,BPM
 2144,D1D2
-2145,DCCT
diff --git a/pytac/data/VMX/devices.csv b/pytac/data/VMX/devices.csv
@@ -1,4 +1,9 @@
 id,name,field,get_pv,set_pv
+0,SR-DI-DCCT-01,beam_current,SR-DI-DCCT-01:SIGNAL,
+0,SR-DI-EMIT-01,emittance_x,SR-DI-EMIT-01:HEMIT,
+0,SR-DI-EMIT-01,emittance_y,SR-DI-EMIT-01:VEMIT,
+0,SR23C-DI-TMBF-01,tune_x,SR23C-DI-TMBF-01:X:TUNE:TUNE,
+0,SR23C-DI-TMBF-01,tune_y,SR23C-DI-TMBF-01:Y:TUNE:TUNE,
 3,SR01C-DI-EBPM-01,x,SR01C-DI-EBPM-01:SA:X,
 3,SR01C-DI-EBPM-01,y,SR01C-DI-EBPM-01:SA:Y,
 3,SR01C-DI-EBPM-01,enabled,SR01C-DI-EBPM-01:CF:ENABLED_S,
@@ -2820,4 +2825,3 @@ id,name,field,get_pv,set_pv
 189,SR02A-PC-DTRIM-04,db0,SR02A-PC-DTRIM-04:I,SR02A-PC-DTRIM-04:SETI
 136,SR02A-PC-DTRIM-02,db0,SR02A-PC-DTRIM-02:I,SR02A-PC-DTRIM-02:SETI
 164,SR02A-PC-DTRIM-03,db0,SR02A-PC-DTRIM-03:I,SR02A-PC-DTRIM-03:SETI
-2143,SR-DI-DCCT-01,I,SR-DI-DCCT-01:SIGNAL,
diff --git a/pytac/data/VMX/elements.csv b/pytac/data/VMX/elements.csv
@@ -2141,4 +2141,3 @@ id,name,type,length,cell
 2140,2140,DRIFT,1.288300,
 2141,2141,BPM,0.000000,24
 2142,2142,DRIFT,4.380000,
-2143,2143,DCCT,0.000000,
diff --git a/pytac/data/VMX/families.csv b/pytac/data/VMX/families.csv
@@ -2573,4 +2573,3 @@ id,family
 2140,KD1
 2141,BPM
 2142,D1D2
-2143,DCCT
diff --git a/pytac/data/VMXSP/devices.csv b/pytac/data/VMXSP/devices.csv