Commit Graph

1345 Commits

Author SHA1 Message Date
Douglas Clowes
2b1e34202d implement fake lakeshore 336, 340 and 370 in Python with curses display 2013-06-21 14:27:37 +10:00
Douglas Clowes
3dce7feb8e Andrew Kerrigan's sct driver for the Pfeiffer pressure gauge and Oxford Mercury 2013-06-21 13:39:13 +10:00
Douglas Clowes
95d8a565e3 Andrew Kerrigan's script context driver for the Pfeiffer 261 pressure gauge 2013-06-21 13:37:31 +10:00
Douglas Clowes
5970a05aaa Make the ls370 sct controller name consistent with ls336 and ls340 2013-06-19 12:35:46 +10:00
Douglas Clowes
c240e54277 Create a deployment log in FILEMAP.TXT 2013-06-18 17:45:01 +10:00
Douglas Clowes
eb1579de7d The SRCDIR is already included in the INSTSRC variable 2013-06-18 17:18:07 +10:00
Douglas Clowes
bff8cc2c16 Implement limit switches and the SC and TS commands on fake Galil motors 2013-06-17 12:05:29 +10:00
Ferdi Franceschini
923f056b2c The voltage range for the repaired DENEX 250TN detector is now +2800 and -1000. 2013-06-17 08:28:45 +10:00
Ferdi Franceschini
40ecb8478d The env var field in the default SICS start string should be blank.
By default SICS is launched with no environment variables and sudo
doesn't allow 'None' on the ICS computers.
2013-06-16 10:54:19 +10:00
Ferdi Franceschini
2df9297a3f SICS-587 Setup hostport dictionary based configuration for dingo.
Also added simulated camera server and a camtest configuration file to
run test scans against a dummy motor.
2013-06-14 10:18:45 +10:00
Ferdi Franceschini
c71cbbc521 Added lyrebird and re-ordered server socket offsets.
The offsets were re-ordered to match the 3rd digit of the SIM_GALIL
baseports.
2013-06-14 10:13:15 +10:00
Ferdi Franceschini
0c49dc21f7 Add dingo, bilby and emu baseports. 2013-06-14 09:56:33 +10:00
Ferdi Franceschini
4f44b746ba Provide dummy histogram initialisation function. 2013-06-14 09:42:57 +10:00
Ferdi Franceschini
2d8d4864ef Merge branch 'dingo' into merge-replace 2013-06-11 08:30:24 +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
Jing Chen
17e5c61d62 Integrate Dingo Camera Server Stuffs 2013-05-22 11:10:21 +10:00
Jing Chen
951f9f40ee Integrate Dingo Camera Server Stuffs 2013-05-22 10:57:11 +10:00
Jing Chen
9b35fc13ed Integrate Dingo Camera Server Stuffs 2013-05-22 10:56:35 +10:00
Jing Chen
fb7685ff8d Integrate Dingo Camera Server Stuffs 2013-05-22 10:56:01 +10:00
Jing Chen
49c46dfcb0 Kookaburra Integration 2013-05-22 10:51:19 +10:00
Jing Chen
b5989bdb50 Kookaburra Integration 2013-05-22 10:51:07 +10:00
Jing Chen
3246278d3c integrate Dingo Camera Server stuffs 2013-05-22 10:50:09 +10:00
Jing Chen
403d7b9162 integrate Dingo Camera Server stuffs 2013-05-22 10:50:00 +10:00
Jing Chen
0dbab4045b integrate Dingo Camera Server stuffs 2013-05-22 10:49:28 +10:00
Jing Chen
1b61b67a30 integrate Dingo Camera Server stuffs 2013-05-22 10:48:44 +10:00
Ferdi Franceschini
a8e55caf9c Adding updates from ics1-quokka 2013-05-21 16:21:47 +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
041735a969 Some cosmetic changes to runsics.py 2013-05-20 09:11:36 +10:00
Ferdi Franceschini
36445471bf Execute netstat and kill as the right user in runsics.py.
Also reduced feedback whent start, stopping and checking SICS status.
2013-05-19 16:33:34 +10:00
Ferdi Franceschini
d5b90fddbc The runsics.py --dev option should launch SICS under the current user. 2013-05-19 15:17:25 +10:00
Ferdi Franceschini
f0c008c714 Use the right host address for counters on Taipan. 2013-05-17 07:36:30 +10:00
Jing Chen
17d72343e7 Removed old error message 2013-05-17 07:34:29 +10:00
Ferdi Franceschini
58caa19668 Bugfix, The value None was being set instead of an empty string when no
environment variables are defined.
2013-05-17 04:36:51 +10:00
Ferdi Franceschini
650ac39f35 Added --dev option for developers to runsics.py
Also eliminated problems with inheriting environment when running on
test and instrument hosts.
2013-05-17 03:43:16 +10:00
Ferdi Franceschini
735b402655 SICS-606 Anticollision script for Pelican monochromator. 2013-05-17 03:25:27 +10:00
Ferdi Franceschini
caa10de20e SICS-606 Allow defining multiple motors and ranges to forbid moves.
Added to support the anticollision requirements for the monochrommator
axes on Pelican.
2013-05-17 03:22:49 +10:00
Ferdi Franceschini
576f598e76 Saliya's fixes to the 'kill' commands for runsics.py 2013-05-16 14:12:41 +10:00
Ferdi Franceschini
5baf09913c Remove dependency on named ports for SICSserver ports. 2013-05-16 06:41:52 +10:00
Ferdi Franceschini
fc9f6f6152 Modified runsics.py so that status checking works with Python 2.6.6 on SL6
This was done by replacing subprocess.check_output() with
subprocess.Popen().communicate().
2013-05-16 06:30:37 +10:00
Ferdi Franceschini
3f75de6357 Added Dan's changes to motor acceleration. Axes now drive more smoothly.
Also set creep control on focussing motors.  This has improved precision
of the monochromator focussing from 0.5 to 0.1 degrees.
2013-05-15 20:40:41 +10:00
Ferdi Franceschini
bf3bd5342e Use hostport_config for quokka detector addresses and ports. 2013-05-13 23:31:12 +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
b1597c96f3 Handle the idle_toggle command properly on the fake fermi chopper. 2013-05-13 22:00:37 +10:00
Ferdi Franceschini
0ab6b5f67f Added HMSTAT hostports for pelican. 2013-05-08 11:26:02 +10:00
Ferdi Franceschini
f82876356f Fix inconsistent HMSTAT keys in hostport configuration. 2013-05-08 11:22:47 +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
3a18a61479 Fixed fake fermi chopper direction and initialised speed to zero. 2013-05-08 07:59:34 +10:00