linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,019 Commits 1 Branch 0 Tags
5acb398b4266747b3d16afddfc89e1aab0dcdbd7
Commit Graph

127 Commits

Author SHA1 Message Date
Ferdi Franceschini
05f17515cf SICS-645: Setting mtype attribute to stop scan from checking thread0 2013-08-09 05:30:57 +10:00
Ferdi Franceschini
2c36a8f466 SICS-644: Set precision to 50ns on Pelican fermi chopper phase motors. 2013-08-09 05:30:54 +10:00
Ferdi Franceschini
d872aedbec Don't create Pelican fermichopper motors when loading the configuration file. 
This should be done in the local extraconfig.tcl
 2013-05-31 11:13:10 +10:00
Ferdi Franceschini
cd3bbe64e3 SICS-594 Check and update motor configuration for the monochromator motors. 2013-05-21 12:26:32 +10:00
Ferdi Franceschini
735b402655 SICS-606 Anticollision script for Pelican monochromator. 2013-05-17 03:25:27 +10:00
Ferdi Franceschini
babc5fe17e A new runsics script has been implemented in python (runsics.py). 
It supports the new "fakedev" simulation mode which runs SICS with real
drivers for devices which have simulated controllers.
There are advance options which allow multiple instances of SICS to be
launched on development and test environments.
Also we no longer depend on having serverport numbers in /etc/services.
 2013-05-13 23:11:15 +10:00
Ferdi Franceschini
ea3c8b7821 BUGFIX Set 50ns veto window parameter correctly on the Fermi chopper. 
Also disable the idle setting in the 'run' command.
And check that the 'run' command actually succeeded.
 2013-05-13 22:15:43 +10:00
Ferdi Franceschini
b8d059c266 BUGFIX Forgot to actually send coil value when set. 
Also cleared stale error messages.
 2013-05-13 22:14:22 +10:00
Ferdi Franceschini
0ab6b5f67f Added HMSTAT hostports for pelican. 2013-05-08 11:26:02 +10:00
Ferdi Franceschini
a192276023 Don't send a start when driving the phase-control fermi-motors. 
We don't want to start a chopper before the speed is set if the
following command is issued,
  drive mchp 1.3e6 mchs 4000
 2013-05-08 10:54:02 +10:00
Ferdi Franceschini
59eb6d2b0d Catch the fermi chopper setspeed error and pass it up to motor.c 2013-05-08 08:00:40 +10:00
Ferdi Franceschini
50dbadc811 Set both fermi choppers to phase mode. 
You can set both speed and phase delay in phase mode.
 2013-05-08 07:15:55 +10:00
Ferdi Franceschini
c50d73740b Added phase motors for fermi master and slave choppers. 2013-05-07 18:51:03 +10:00
Ferdi Franceschini
7e1e4e2d45 Don't allow change of direction if the fermimotor speed != 0. 
Added an "idle" subcommand so the speed can be set to zero without
delevitating.  Also added alarm reset command.
 2013-05-03 00:36:53 +10:00
Ferdi Franceschini
90d05682e2 Fix x_pixel_angular_offset spacing in hdf file. 2013-05-02 19:17:00 +10:00
Ferdi Franceschini
68c45ff183 Add 'idle' subcommand to fermi motors. 2013-05-02 14:08:59 +10:00
Ferdi Franceschini
7be5d2f326 Set correct IP address for Pelican beam monitors. 2013-05-01 07:40:43 +10:00
Ferdi Franceschini
ecd9707eb2 Set fermi chopper direction when setting speed. 2013-05-01 07:32:31 +10:00
Ferdi Franceschini
c452e8982b Fermi chopper motors should ignore INT1712 interrupts. 
Don't halt choppers just because someone tried to interrupt a scan.
Also make slave chopper optional in mkFermiMotors.
 2013-04-29 20:44:46 +10:00
Ferdi Franceschini
961f581bf2 Fixed parsing of intlck_status. It's 16 bits not 8 bits! 2013-04-29 20:41:06 +10:00
Ferdi Franceschini
2ea0e042ee Implements run and drive wrappers which set allowed target values when 
driving the fermi motors.
 2013-04-23 10:29:41 +10:00
Ferdi Franceschini
b15014bfd5 The mchs and schs motors can now be driven via run and drive command 
wrappers.
Running mchs and schs sets the motor gain parameters.
Uses new ANSTO tclmotor implementation.
 2013-04-23 10:26:28 +10:00
Ferdi Franceschini
bda409da04 Fix host names and port numbers. 2013-04-23 10:25:09 +10:00
Ferdi Franceschini
b5ff1e82f5 Fix sics_simulation check. 2013-04-23 10:22:20 +10:00
Ferdi Franceschini
013398d0da Use a port number which normal users have permission to access. 2013-04-21 17:51:48 +10:00
Ferdi Franceschini
a9bd5cc5da SICS-587 (in progress) Put IP and PORT configurations in a single file. 
Pelican DONE motor, counter, chopper. TODO hmm, environment.
 2013-04-21 14:57:57 +10:00
Ferdi Franceschini
91d6e52a41 SICS-580 Pom precision was too high. 
The encoder resolution is 0.044 degrees so made precisoin = 0.05
 2013-04-20 18:37:55 +10:00
Ferdi Franceschini
b98ff24528 Added configuration file changes from ics1-pelican 2013-04-20 17:53:17 +10:00
Ferdi Franceschini
16e744be12 Moved MakeDrive to instrument specific configuration. 
This lets us make run and drive wrappers for the fermi motors on pelican
by renaming the SICS run and drive.
 2013-04-09 14:15:55 +10:00
Ferdi Franceschini
191e3719b7 Use ns instead of micro-seconds for veto-windows. 2013-03-14 15:29:31 +11:00
Jing Chen
e9f7c0547d r3784 | jgn | 2012-11-02 13:46:19 +1100 (Fri, 02 Nov 2012) | 1 line 2012-11-15 17:41:10 +11:00
Jing Chen
4e2ba8c458 change unit from dW to W 
r3783 | jgn | 2012-11-02 13:30:02 +1100 (Fri, 02 Nov 2012) | 1 line
 2012-11-15 17:41:05 +11:00
Jing Chen
e21b3eb135 r3772 | jgn | 2012-10-24 16:26:47 +1100 (Wed, 24 Oct 2012) | 1 line 2012-11-15 17:41:00 +11:00
Jing Chen
c85cd9f081 r3765 | jgn | 2012-10-10 11:23:52 +1100 (Wed, 10 Oct 2012) | 1 line 2012-11-15 17:40:27 +11:00
Jing Chen
d4784a5ec1 r3764 | jgn | 2012-10-10 10:12:07 +1100 (Wed, 10 Oct 2012) | 1 line 2012-11-15 17:40:22 +11:00
Jing Chen
dd885c3a13 r3763 | jgn | 2012-10-10 10:12:00 +1100 (Wed, 10 Oct 2012) | 1 line 2012-11-15 17:40:17 +11:00
Jing Chen
a3214236a8 add ls218 controller 
r3761 | jgn | 2012-10-09 13:38:21 +1100 (Tue, 09 Oct 2012) | 1 line
 2012-11-15 17:40:06 +11:00
Ferdi Franceschini
e1ad82ca76 Set time of flight channel width. 
r3754 | ffr | 2012-09-26 12:03:01 +1000 (Wed, 26 Sep 2012) | 2 lines
 2012-11-15 17:39:33 +11:00
Ferdi Franceschini
2ab1abb95c Oat table was defined twice. Removed the wrong definition. 
r3753 | ffr | 2012-09-26 12:00:45 +1000 (Wed, 26 Sep 2012) | 2 lines
 2012-11-15 17:39:28 +11:00
Ferdi Franceschini
b1de99869e motor_configuration.tcl 
Set attributes on vwi motor which are required to save it in the data
file.

r3751 | ffr | 2012-09-26 10:06:23 +1000 (Wed, 26 Sep 2012) | 4 lines
 2012-11-15 17:39:18 +11:00
Ferdi Franceschini
a0eee42022 hmm_configuration.tcl 
Added time of flight channel width (tofw) and elastic peak index (elpk)

r3750 | ffr | 2012-09-26 10:05:40 +1000 (Wed, 26 Sep 2012) | 3 lines
 2012-11-15 17:39:13 +11:00
Ferdi Franceschini
99c3c397d3 sct_fermichopper.tcl 
Refactored to enable creation master and slave chopper objects and added
a mkChoppers command.

r3749 | ffr | 2012-09-26 10:02:12 +1000 (Wed, 26 Sep 2012) | 4 lines
 2012-11-15 17:39:08 +11:00
Ferdi Franceschini
b887636684 fermimot.tcl 
Create tclmot motors for the master chopper speed (mchs), slave chopper
speed (schs) and slave chopper phase (schp). Currently mchs and schs
just read rotation speed.
TODO: Read phase and set speed and phase.

r3748 | ffr | 2012-09-26 09:55:08 +1000 (Wed, 26 Sep 2012) | 6 lines
 2012-11-15 17:39:03 +11:00
Ferdi Franceschini
0b9580f334 pelican_configuration.tcl 
Enabled the sct_fermichopper scrip context controller and object.
Added fermimot.tcl configuration for the chopper speed and phase motor
objects.

r3747 | ffr | 2012-09-26 09:54:28 +1000 (Wed, 26 Sep 2012) | 5 lines
 2012-11-15 17:38:59 +11:00
Jing Chen
9afb90b311 add hdb structure 
r3745 | jgn | 2012-09-24 14:02:21 +1000 (Mon, 24 Sep 2012) | 1 line
 2012-11-15 17:38:49 +11:00
Jing Chen
58b74c6f45 add hdb structure 
r3744 | jgn | 2012-09-24 10:05:39 +1000 (Mon, 24 Sep 2012) | 1 line
 2012-11-15 17:38:44 +11:00
Douglas Clowes
d287611f03 Add virtual motors (e.g. for wavelength) 
r3729 | dcl | 2012-08-30 11:16:06 +1000 (Thu, 30 Aug 2012) | 1 line
 2012-11-15 17:37:33 +11:00
Jing Chen
acf91f494d r3728 | jgn | 2012-08-30 09:21:58 +1000 (Thu, 30 Aug 2012) | 1 line 2012-11-15 17:37:28 +11:00
Douglas Clowes
2ea516d84b Add virtual motors for initial energy (vei) and wavelength (vwi) and for elastic_time 
r3713 | dcl | 2012-08-28 16:00:32 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:23 +11:00
Douglas Clowes
eb3b71b532 enable the dummy motor for testing purposes 
r3711 | dcl | 2012-08-28 15:08:32 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:14 +11:00