Skip to content

Commit

Permalink
ARI Beamline Simulation based on XRT (#16)
Browse files Browse the repository at this point in the history
* add xrt_sim.py

* Change the velocity of all FakeMotors from 0.1 to 1

* Update the motor range for baffle slit and diagnostic

* change the length of each line below 80 characters

* change the line length below 80 characters in Baffle Slit

* remove the xrt_sim.py

* add xrt_sim file

* update xrt simulation

* Initial XRT simulation

* update the AriModel() in ari_sim.py

* remove commented lines in xrt_sim.py and bl_initialization.py

* Remove the update method in AriModel
  • Loading branch information
Jiemin-Li authored Sep 23, 2024
1 parent a02205f commit 5d4bc2d
Show file tree
Hide file tree
Showing 19 changed files with 731 additions and 14 deletions.
Binary file modified src/.DS_Store
Binary file not shown.
Binary file modified src/ari_sxn_simbeamline/.DS_Store
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 5 additions & 4 deletions src/ari_sxn_simbeamline/caproto_servers/ari_m1.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # call the PVGroup __init__ function

# Add the mirror motor PVs.
Ry_coarse = SubGroup(FakeMotor, velocity=0.1, precision=3,

Ry_coarse = SubGroup(FakeMotor, velocity=1, precision=3,
user_limits=(-1, 20), prefix=':Ry_coarse')
Ry_fine = SubGroup(FakeMotor, velocity=0.1, precision=3,
user_limits=(-1, 20), prefix=':Ry_fine')
Rz = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-1, 20),
Rz = SubGroup(FakeMotor, velocity=1, precision=3, user_limits=(-1, 20),
prefix=':Rz')
x = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-1, 20),
x = SubGroup(FakeMotor, velocity=1, precision=3, user_limits=(-1, 20),
prefix=':x')
y = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-1, 20),
y = SubGroup(FakeMotor, velocity=1, precision=3, user_limits=(-1, 20),
prefix=':y')

# Add the mirror chamber vacuum PVs.
Expand Down
12 changes: 8 additions & 4 deletions src/ari_sxn_simbeamline/caproto_servers/baffle_slit.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # call the PVGroup __init__ function

# Add the baffle motor PVs.
top = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-1, 20), prefix=':Top')
bottom = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-20, 1), prefix=':Bottom')
inboard = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-20, 1), prefix=':Inboard')
outboard = SubGroup(FakeMotor, velocity=0.1, precision=3, user_limits=(-1, 20), prefix=':Outboard')
top = SubGroup(FakeMotor, velocity=1, precision=3,
user_limits=(-13, 40), prefix=':Top')
bottom = SubGroup(FakeMotor, velocity=1, precision=3,
user_limits=(-40, 13), prefix=':Bottom')
inboard = SubGroup(FakeMotor, velocity=1, precision=3,
user_limits=(-40, 13), prefix=':Inboard')
outboard = SubGroup(FakeMotor, velocity=1, precision=3,
user_limits=(-13, 40), prefix=':Outboard')

currents = SubGroup(QuadEM, prefix=':Currents')

Expand Down
10 changes: 4 additions & 6 deletions src/ari_sxn_simbeamline/caproto_servers/diagnostic.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,11 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) # call the PVGroup __init__ function

# Add the motor PVs
multi_trans = SubGroup(FakeMotor, velocity=0.1, acceleration=1.0,
user_limits=(-1, 20), tick_rate_hz=10.,
prefix=':multi_trans')
multi_trans = SubGroup(FakeMotor, velocity=5, precision = 3,
user_limits = (-125, 25), prefix=':multi_trans')

yag_trans = SubGroup(FakeMotor, velocity=0.1, acceleration=1.0,
user_limits=(-1, 20), tick_rate_hz=10.,
prefix=':yag_trans')
yag_trans = SubGroup(FakeMotor, velocity=5, precision = 3,
user_limits = (-25, 25), prefix=':yag_trans')

# Add the photodiode electrometer PVs
currents = SubGroup(QuadEM, prefix=':Currents')
Expand Down
Empty file.
Loading

0 comments on commit 5d4bc2d

Please sign in to comment.