2d8d4864ef
Merge branch 'dingo' into merge-replace
2013-06-11 08:30:24 +10:00
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
357170a735
SICS-616 Removed obsolete setpos command from motor driver.
2013-05-31 09:55:10 +10:00
7e0e068ee2
differentiate forward/reverse limit switches in 'crashed' log message
2013-05-31 09:35:52 +10:00
ea28b7a78c
add code to create, clean and ignore *.d files
2013-05-31 09:35:52 +10:00
8f0ceac2ad
SICS-615 You can now update the start and step fields of scan parameters.
...
NOTE: This also fixes the bug that was crashing SICS. The n was missing in an snprintf().
2013-05-31 09:18:35 +10:00
0954c3bceb
Fixed compile error, ‘struct __MoDriv’ has no m ember named ‘errMsg’
2013-05-31 08:06:38 +10:00
4a363d0e95
SICS-614 reallocate errMsg buffer each time it's used
2013-05-28 16:22:44 +10:00
7036164640
SICS-613: Fixed voltage control for Ordela detector on Quokka.
2013-05-24 19:15:10 +10:00
3c3afb92c8
the send blocks if both rmask and wmask are set so only do it if rmask is not set
2013-05-24 13:05:07 +10:00
8e245ba4be
turn read interest back on once connect completes
2013-05-24 13:04:58 +10:00
4b510ffd05
replace the touch of site_ansto.c with the rm of site_ansto.o to force recompile (it's more git friendly)
2013-05-24 13:04:48 +10:00
17e5c61d62
Integrate Dingo Camera Server Stuffs
2013-05-22 11:10:21 +10:00
951f9f40ee
Integrate Dingo Camera Server Stuffs
2013-05-22 10:57:11 +10:00
9b35fc13ed
Integrate Dingo Camera Server Stuffs
2013-05-22 10:56:35 +10:00
fb7685ff8d
Integrate Dingo Camera Server Stuffs
2013-05-22 10:56:01 +10:00
7a4fc22351
Integrate Dingo Camera Server Stuffs
2013-05-22 10:55:16 +10:00
49c46dfcb0
Kookaburra Integration
2013-05-22 10:51:19 +10:00
b5989bdb50
Kookaburra Integration
2013-05-22 10:51:07 +10:00
3246278d3c
integrate Dingo Camera Server stuffs
2013-05-22 10:50:09 +10:00
403d7b9162
integrate Dingo Camera Server stuffs
2013-05-22 10:50:00 +10:00
0dbab4045b
integrate Dingo Camera Server stuffs
2013-05-22 10:49:28 +10:00
1b61b67a30
integrate Dingo Camera Server stuffs
2013-05-22 10:48:44 +10:00
f4d9affe7d
integrate Dingo Camera Server stuffs
2013-05-22 10:47:14 +10:00
a8e55caf9c
Adding updates from ics1-quokka
2013-05-21 16:21:47 +10:00
cd3bbe64e3
SICS-594 Check and update motor configuration for the monochromator motors.
2013-05-21 12:26:32 +10:00
55d3c34a24
restore RemoveCallback3 as RemoveCallbackUsr to get (un)interest working again
2013-05-20 13:47:34 +10:00
041735a969
Some cosmetic changes to runsics.py
2013-05-20 09:11:36 +10:00
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
d5b90fddbc
The runsics.py --dev option should launch SICS under the current user.
2013-05-19 15:17:25 +10:00
df5eec7d0e
Slave hdb paths which are chained to a master path were being updated twice.
...
The slaves were being updated with the master's reading as well as their reading.
2013-05-17 10:50:53 +10:00
f0c008c714
Use the right host address for counters on Taipan.
2013-05-17 07:36:30 +10:00
17d72343e7
Removed old error message
2013-05-17 07:34:29 +10:00
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
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
735b402655
SICS-606 Anticollision script for Pelican monochromator.
2013-05-17 03:25:27 +10:00
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
4873263714
SICS-607 Fix hipadaba chain callbacks. Reverted code commented out by PSI.
2013-05-17 03:16:55 +10:00
576f598e76
Saliya's fixes to the 'kill' commands for runsics.py
2013-05-16 14:12:41 +10:00
5baf09913c
Remove dependency on named ports for SICSserver ports.
2013-05-16 06:41:52 +10:00
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
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
bf3bd5342e
Use hostport_config for quokka detector addresses and ports.
2013-05-13 23:31:12 +10:00
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
40f979de8f
Fixed dumb typo.
2013-05-13 23:08:37 +10:00
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
b8d059c266
BUGFIX Forgot to actually send coil value when set.
...
Also cleared stale error messages.
2013-05-13 22:14:22 +10:00
b1597c96f3
Handle the idle_toggle command properly on the fake fermi chopper.
2013-05-13 22:00:37 +10:00
0f2df4a8fe
SICS-593: Return 0 from the AsconReading state to ensure that SICS
...
progresses through tasks.
2013-05-13 08:40:30 +10:00
0ab6b5f67f
Added HMSTAT hostports for pelican.
2013-05-08 11:26:02 +10:00
Ferdi Franceschini