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

1278 Commits

Author SHA1 Message Date
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
b3a2c5c976 Merge in changes from taipan branch. 2013-04-28 17:15:45 +10:00
Ferdi Franceschini
c6f1dd6591 Load test IP and PORT numbers when SICS_SIMULATION is set. 2013-04-25 11:16:25 +10:00
Ferdi Franceschini
d8b48728b4 SICS-587 (in progress) IP and PORT configurations DONE for Quokka. 
TODO Environment controllers etc.
 2013-04-24 16:54:22 +10:00
Ferdi Franceschini
20a3dff71e New Neutron Velocity Selector simulatin for Quokka. 2013-04-24 16:49:06 +10:00
Ferdi Franceschini
bdf1c24c57 SICS-587 (in progress) Get host and port from the HISTMEM_HOSTPORT 
dictionary.
 2013-04-23 16:54:09 +10:00
Ferdi Franceschini
e28ef59bd0 Added fake disk chopper controller. 2013-04-23 14:32:24 +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
34f22ea669 Use real chopper drivers when env var SICS_SIMULATION=fakedev 2013-04-23 10:23:27 +10:00
Ferdi Franceschini
b5ff1e82f5 Fix sics_simulation check. 2013-04-23 10:22:20 +10:00
Ferdi Franceschini
99a4ccc2ee Deploy the fake controllers with SICS. 2013-04-23 10:05:17 +10:00
Ferdi Franceschini
579ad59ebf Simple simulation of Fermi chopper control. 
Currently it lets you set coils and registers for three controllers.
It will also set the up_to_speed, lev_complete, and run flags for the
system status.
TODO Phase control and locking.
 2013-04-23 09:56:44 +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
e5d6d44d8d Code cleanup. 2013-04-21 14:55:41 +10:00
Ferdi Franceschini
49e6a584c0 SICS-587 (in progress) Put IP and PORT configuration in one file. 
Platypus TODO hmm, environment, and devices like multimeters and the
sylvac.
 2013-04-21 11:14:10 +10:00
Ferdi Franceschini
73ba1b0dba Merge branch 'merge-replace' of /home/ferdi/workspace/GIT/sicsdev_git into merge-replace 2013-04-20 18:57:53 +10:00
Ferdi Franceschini
a22d403c87 Added sicsdebug flag to control verbosity of log files. 
If sicsdebug == 0 log output from commands executed in macros is
suppressed.
 2013-04-20 18:55:38 +10:00
Ferdi Franceschini
cdafe4d650 Set default "movecount" to 500 ms. 2013-04-20 18:43:41 +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
98cf4d5dc4 SICS-572: Reverted fix. This was actually a job for GumTree and has been fixed by Norman. 2013-04-19 08:31:32 +10:00
Ferdi Franceschini
1edad9fa2f SICS-586: Set sicspoll interval to one second on max_binrate and total_maprate hdb nodes. 2013-04-19 07:55:09 +10:00
Ferdi Franceschini
afd7b3879d Generic fake Galil derived from Taipan version. 
Added instrument name as a command line argument.
 2013-04-18 12:40:56 +10:00
Ferdi Franceschini
47a1d0aa4e Added configuration file modifications from ics1-platypus 2013-04-18 07:00:17 +10:00
Ferdi Franceschini
278c64b377 Set scan=1ms and scans per sample=10 on the counters when SICS starts up. 2013-04-10 17:03:30 +10:00
Ferdi Franceschini
2dc1657d66 Reversed configuration tables for the autosample changers. 
Because the load side was changed to the opposite side.
 2013-04-09 14:38:39 +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
Ferdi Franceschini
94f21f832e SICS-561: Wait for the hmm COUNTEND event in blocking mode. 
Also allow veto when scanning.
 2013-03-04 18:03:55 +11:00
Douglas Clowes
a00ca3872f Addpython motor simulation for taipan 2013-02-21 14:26:26 +11:00
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +11:00
Douglas Clowes
b5b4d7a747 Add some comments to deploySICS.sh 2013-02-15 13:27:55 +11:00
Ferdi Franceschini
9e30a158fb server_config.tcl 
Remove call to obsolete ::utility::set_sctobj_attributes because it
returns an error and aborts the server_set_sobj_attributes proc.
This bug meant that script context objects weren't being linked into the
hdb tree.

util/utility.tcl
Removed obselete ::utility::set_sctobj_attributes proc because
sctcontrollers are no longer being added to the root of the hdb tree.
 2013-02-14 11:32:36 +11:00
Douglas Clowes
43346d6ea5 add hostnam and portnum commands 2012-12-13 14:07:38 +11:00
Douglas Clowes
dfb9db5e5c add das servers to test host list 2012-12-13 14:07:08 +11:00
Douglas Clowes
c8bf2a71ed Remove InstallHdb from barebones 2012-12-13 14:06:32 +11:00
Douglas Clowes
fa18677fca add cybaman default port 
r3789 | dcl | 2012-11-13 12:43:34 +1100 (Tue, 13 Nov 2012) | 1 line
 2012-11-15 17:41:34 +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
731c83786b change magneticFieldCurernt to magneticFieldCurrent 
r3771 | jgn | 2012-10-24 15:12:20 +1100 (Wed, 24 Oct 2012) | 1 line
 2012-11-15 17:40:55 +11:00
Jing Chen
39a3e0ab19 add HDB nodes 
r3770 | jgn | 2012-10-18 14:54:11 +1100 (Thu, 18 Oct 2012) | 1 line
 2012-11-15 17:40:51 +11:00
Jing Chen
12c6a9c0a8 r3769 | jgn | 2012-10-18 14:50:30 +1100 (Thu, 18 Oct 2012) | 1 line 2012-11-15 17:40:46 +11:00
Jing Chen
bc5ca10804 comment our main driver call 
r3768 | jgn | 2012-10-18 14:15:12 +1100 (Thu, 18 Oct 2012) | 1 line
 2012-11-15 17:40:41 +11:00
Jing Chen
3a1bd2192c comment out the driver line 
r3767 | jgn | 2012-10-15 14:11:04 +1100 (Mon, 15 Oct 2012) | 1 line
 2012-11-15 17:40:36 +11:00
Jing Chen
935a45cbf5 update formats of displayed strings 
r3766 | jgn | 2012-10-15 12:01:50 +1100 (Mon, 15 Oct 2012) | 1 line
 2012-11-15 17:40:31 +11:00