linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,888 Commits 1 Branch 0 Tags
8e245ba4be1b4b51db56876bc2133e0167f9795d
Commit Graph

2888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Clowes
8e245ba4be turn read interest back on once connect completes 2013-05-24 13:04:58 +10:00
Douglas Clowes
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
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
Douglas Clowes
55d3c34a24 restore RemoveCallback3 as RemoveCallbackUsr to get (un)interest working again 2013-05-20 13:47:34 +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
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
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
4873263714 SICS-607 Fix hipadaba chain callbacks. Reverted code commented out by PSI. 2013-05-17 03:16:55 +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
40f979de8f Fixed dumb typo. 2013-05-13 23:08:37 +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
0f2df4a8fe SICS-593: Return 0 from the AsconReading state to ensure that SICS 
progresses through tasks.
 2013-05-13 08:40:30 +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
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
da0b00c938 Load environment configuration file taipan_setup.txt if it exists. 2013-05-06 21:23:41 +10:00
Ferdi Franceschini
5c76f7a243 SICS-587 (in progress) Put IP and PORT configurations in a single file. 
TODO environment
 2013-05-06 20:41:37 +10:00
Ferdi Franceschini
3e33a7b8b2 Merged in-situ modifications from ics1-taipan. 2013-05-06 20:13:36 +10:00
Ferdi Franceschini
33059d6493 ID of velocity selector currently used on Quokka 
TODO This should be at the /usr/local/sics level.
 2013-05-05 23:03:17 +10:00
Ferdi Franceschini
7c2796aa4f Added MIRROTRON's ammendments to Quokka's guide configuration. 2013-05-05 23:01:26 +10:00
Ferdi Franceschini
f11612bc5b SICS-601: Provide a command to get the textstatus list from the histogram server. 2013-05-05 23:00:05 +10:00
Ferdi Franceschini
c09968b72e Attempt a reconnect for astvels protocol if a command times out. 
This lets us re-use the astvel protovol to support SICS-601 so that HTTP
connections will reconnect after the connection times out.
 2013-05-05 21:19:05 +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
ce78ec9b87 Add idle toggle to Fermi chopper sim and control verbosity. 2013-05-02 14:07:05 +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
82afa86fa0 Cosmetic changes to the simulated fermi chopper controller. 2013-04-29 20:45:50 +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