Skip to content

Add ability to have fields to the lattice #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willrogers merged 16 commits into from
Sep 11, 2018
Merged

Add ability to have fields to the lattice #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
20d0198
Add lattice device loading in load_csv.
T-Nicholls Sep 7, 2018
0e00fee
Add insertion on idex 0 of lattice fields, and remove old DDCT loading.
T-Nicholls Sep 7, 2018
7cc8d02
Minor Corrections.
T-Nicholls Sep 7, 2018
94bf442
Add set lattice data source in load_csv.
T-Nicholls Sep 7, 2018
c178ad2
Correct device index comparison in load.
T-Nicholls Sep 7, 2018
fd21c32
Update field names and add pvs for emittance.
T-Nicholls Sep 7, 2018
3e34d31
Remove lattice pv adding template accidentally left in.
T-Nicholls Sep 7, 2018
7147d2f
Update all csv files for all modes with new changes.
T-Nicholls Sep 7, 2018
bd45cca
Update the lattice lengths in test_machine to new lengths after changes.
T-Nicholls Sep 7, 2018
f3fcdda
Add a code for a BasicDevice class.
T-Nicholls Sep 10, 2018
77c51e2
Load basic devices onto lattice in load_csv.
T-Nicholls Sep 10, 2018
51757f2
Make basic devices work when passed a handle.
T-Nicholls Sep 10, 2018
34cc252
Clean up epics device tests ready for new basic device tests.
T-Nicholls Sep 10, 2018
9610245
Update epics device tests and add basic device tests.
T-Nicholls Sep 10, 2018
c7d4513
Make a few minor style changes to code.
T-Nicholls Sep 11, 2018
605b972
Change lattice energy to 3000Mev update old refernces to it, includin…
T-Nicholls Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pytac/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 5 additions & 1 deletion pytac/data/DIAD/devices.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
1 change: 0 additions & 1 deletion pytac/data/DIAD/elements.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
1 change: 0 additions & 1 deletion pytac/data/DIAD/families.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,4 +2573,3 @@ id,family
2142,KD1
2143,BPM
2144,D1D2
2145,DCCT
6 changes: 5 additions & 1 deletion pytac/data/VMX/devices.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
1 change: 0 additions & 1 deletion pytac/data/VMX/elements.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
1 change: 0 additions & 1 deletion pytac/data/VMX/families.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,4 +2573,3 @@ id,family
2140,KD1
2141,BPM
2142,D1D2
2143,DCCT
5,310 changes: 2,657 additions & 2,653 deletions pytac/data/VMXSP/devices.csv
View file
Open in desktop

Large diffs are not rendered by default.

Loading