linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All

Browse Source 
Added "STARTING" message to the histmem command status.
Can now make multiple script context positional motors
Added table and table entry IDs for posit motor lookup tables.
Fixed the runsics script so that the stop command sends an EndServer interrupt via the UDP port instead of killing SICS, this ensures that status is saved.

Platypus
Added chopper speed, phase and phase offsets for all choppers on hdb tree and in datafile

Quokka
Replace the sample/select command with the changer_position script context positional motor interface.
Fixed upper limit on apx motor
Added full sample changer and auto aperture positional motors

r2727 | ffr | 2008-10-31 15:37:32 +1100 (Fri, 31 Oct 2008) | 14 lines
This commit is contained in:
Ferdi Franceschini
2008-10-31 15:37:32 +11:00
committed by Douglas Clowes
parent b9e1b19252
commit 04e2e75d80
11 changed files with 233 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
site_ansto/instrument/reflectometer/config/chopper/chopper.tcl
View File

@@ -4,7 +4,12 @@ set CH1_MAXSPEED 1800
namespace eval ::chopper {}
if {$sim_mode == "true"} {
MakeChopper chopperController sim
ChopperAdapter chspeed chopperController speed 0 $CH1_MAXSPEED
ChopperAdapter ch1speed chopperController speed 0 $CH1_MAXSPEED
ChopperAdapter ch2speed chopperController speed 0 $CH1_MAXSPEED
ChopperAdapter ch3speed chopperController speed 0 $CH1_MAXSPEED
ChopperAdapter ch4speed chopperController speed 0 $CH1_MAXSPEED
ChopperAdapter ch1phase chopperController phase 0 180
ChopperAdapter ch2phase chopperController phase 0 180
ChopperAdapter ch3phase chopperController phase 0 180
ChopperAdapter ch4phase chopperController phase 0 180
@@ -33,7 +38,11 @@ if {$sim_mode == "true"} {
user $chopper_controller(user) \
password $chopper_controller(password) \
]
ChopperAdapter chspeed chopperController speed_1 0 $CH1_MAXSPEED
ChopperAdapter ch1speed chopperController speed_1 0 $CH1_MAXSPEED
ChopperAdapter ch2speed chopperController speed_2 0 $CH1_MAXSPEED
ChopperAdapter ch3speed chopperController speed_3 0 $CH1_MAXSPEED
ChopperAdapter ch4speed chopperController speed_4 0 $CH1_MAXSPEED
ChopperAdapter ch1phase chopperController phase_1 0 180
ChopperAdapter ch2phase chopperController phase_2 0 180
ChopperAdapter ch3phase chopperController phase_3 0 180
ChopperAdapter ch4phase chopperController phase_4 0 180
@@ -63,7 +72,11 @@ if {$sim_mode == "true"} {
}
}
sicslist setatt chspeed units "rpm"
sicslist setatt ch1speed units "rpm"
sicslist setatt ch2speed units "rpm"
sicslist setatt ch3speed units "rpm"
sicslist setatt ch4speed units "rpm"
sicslist setatt ch1phase units "degrees"
sicslist setatt ch2phase units "degrees"
sicslist setatt ch3phase units "degrees"
sicslist setatt ch4phase units "degrees"

4
site_ansto/instrument/reflectometer/config/parameters/parameters.tcl
View File

@@ -25,6 +25,10 @@ foreach vn {
chopper2_base
chopper1_distance
chopper1_base
chopper1_phase_offset
chopper2_phase_offset
chopper3_phase_offset
chopper4_phase_offset
slit1_distance
slit1_base
omega