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

316 Commits

Author SHA1 Message Date
Douglas Clowes
5970a05aaa Make the ls370 sct controller name consistent with ls336 and ls340 2013-06-19 12:35:46 +10:00
Ferdi Franceschini
2d8d4864ef Merge branch 'dingo' into merge-replace 2013-06-11 08:30:24 +10:00
Jing Chen
17e5c61d62 Integrate Dingo Camera Server Stuffs 2013-05-22 11:10:21 +10:00
Jing Chen
17d72343e7 Removed old error message 2013-05-17 07:34:29 +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
f82876356f Fix inconsistent HMSTAT keys in hostport configuration. 2013-05-08 11:22:47 +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
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
bdf1c24c57 SICS-587 (in progress) Get host and port from the HISTMEM_HOSTPORT 
dictionary.
 2013-04-23 16:54:09 +10:00
Ferdi Franceschini
b98ff24528 Added configuration file changes from ics1-pelican 2013-04-20 17:53: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
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
Ferdi Franceschini
e7a478489e Copied in-situ modifications from ics1-quokka. 2013-02-20 18:19:44 +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
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
Jing Chen
18a3a0b028 r3762 | jgn | 2012-10-09 13:42:17 +1100 (Tue, 09 Oct 2012) | 1 line 2012-11-15 17:40:11 +11:00
Jing Chen
a545823330 add He3 SICS controller 
r3760 | jgn | 2012-10-08 13:29:25 +1100 (Mon, 08 Oct 2012) | 1 line
 2012-11-15 17:40:01 +11:00
Ferdi Franceschini
350055ea57 common_instrument_dictionary.tcl and instdict_specification.tcl 
Provide fermi_chopper group for the chopper speed and phase motor
objects.

r3746 | ffr | 2012-09-26 09:46:38 +1000 (Wed, 26 Sep 2012) | 4 lines
 2012-11-15 17:38:54 +11:00
Jing Chen
5ceb583d26 update the driver 
r3743 | jgn | 2012-09-24 09:56:27 +1000 (Mon, 24 Sep 2012) | 1 line
 2012-11-15 17:38:39 +11:00
Jing Chen
5d5c6bed54 new SICS driver for Green Magnet 
r3742 | jgn | 2012-09-20 16:16:00 +1000 (Thu, 20 Sep 2012) | 1 line
 2012-11-15 17:38:35 +11:00
Douglas Clowes
a59f088761 Add instrument/name and rename program_branch and program_revision 
r3739 | dcl | 2012-09-19 12:18:20 +1000 (Wed, 19 Sep 2012) | 1 line
 2012-11-15 17:38:20 +11:00
Douglas Clowes
68edac83fc Add SICS_Site, SICS_Version and SICS_Revision 
r3735 | dcl | 2012-09-17 17:09:48 +1000 (Mon, 17 Sep 2012) | 1 line
 2012-11-15 17:38:01 +11:00
Douglas Clowes
62d894b9e7 First Working Version against "SCPI" protocol Mercury 
r3733 | dcl | 2012-09-11 11:40:48 +1000 (Tue, 11 Sep 2012) | 1 line
 2012-11-15 17:37:52 +11:00
Douglas Clowes
81605a11a1 Driver for the Oxford Mercury Temperature Controller (WIP) 
r3732 | dcl | 2012-09-03 13:37:30 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:47 +11:00
Douglas Clowes
84842c901f Add voltage, status and "end-of-driving" 
r3731 | dcl | 2012-09-03 09:03:12 +1000 (Mon, 03 Sep 2012) | 1 line
 2012-11-15 17:37:42 +11:00
Douglas Clowes
200d539adc Simple driver for the "Green Magnet" 
r3710 | dcl | 2012-08-28 15:06:20 +1000 (Tue, 28 Aug 2012) | 1 line
 2012-11-15 17:37:09 +11:00
Douglas Clowes
39735092d7 Update to drive the rest of the way 
r3696 | dcl | 2012-08-08 13:36:40 +1000 (Wed, 08 Aug 2012) | 1 line
 2012-11-15 17:36:02 +11:00
Jing Chen
a311f331cd add Dlition Sample temperautre contorl 
r3686 | jgn | 2012-08-01 09:50:08 +1000 (Wed, 01 Aug 2012) | 1 line
 2012-11-15 17:35:19 +11:00
Douglas Clowes
45549fddb5 Improve logging robustness 
r3680 | dcl | 2012-07-26 15:46:07 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:51 +11:00
Douglas Clowes
d6ad841174 Set auto by default on startup - as per Paolo 
r3679 | dcl | 2012-07-26 15:45:13 +1000 (Thu, 26 Jul 2012) | 1 line
 2012-11-15 17:34:46 +11:00
Ferdi Franceschini
a6fd5af72c Made the isobus address configurable for the Oxford Mercury ITC. 
NOTE: Address is option and defaults to @1
Eg Set tol=5.0 and isobus address= @8 for the Mercury ITC
add_itc500 tc1 localhost 7777 5.0 "@8"

r3642 | ffr | 2012-07-13 15:48:30 +1000 (Fri, 13 Jul 2012) | 5 lines
 2012-11-15 17:33:03 +11:00
Ferdi Franceschini
9ef0bb8afd Make sure bmon scans can save scratch files when the savetype is set to nosave. 
r3624 | ffr | 2012-06-29 16:12:30 +1000 (Fri, 29 Jun 2012) | 2 lines
 2012-11-15 17:31:53 +11:00
Ferdi Franceschini
a2a9eb6f72 Fixed typo. Although this didn't seem to cause any problems. 
r3623 | ffr | 2012-06-29 16:05:50 +1000 (Fri, 29 Jun 2012) | 2 lines
 2012-11-15 17:31:48 +11:00
Ferdi Franceschini
d99d9cc7ee SICS-435: Save setpoint in data file. 
r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines
 2012-11-15 17:31:11 +11:00
Ferdi Franceschini
a24df1fc78 SICS-477 In the runscan command restrict mode to 'time' and 'monitor' when the detector type is 
set to 'bmon'.  Also check that detector type is either 'bmon' or
'histmem'.

r3592 | ffr | 2012-06-05 08:21:33 +1000 (Tue, 05 Jun 2012) | 4 lines
 2012-11-15 17:30:06 +11:00
Ferdi Franceschini
d5da9eba15 SICS-477 Added the "detector" parameter to the "runscan" command tree 
with a default value of "histmem".  Also created a "detector"
convenience macro so that the detector type can be easily queried and
set from the command line.

r3590 | ffr | 2012-06-04 20:16:07 +1000 (Mon, 04 Jun 2012) | 5 lines
 2012-11-15 17:29:56 +11:00
Ferdi Franceschini
6b3f71cc6a SICS-477 Modified the runscan command to do bmon scans as well as 
hmscans.  The type of scan is determined by the new "detector" parameter
on the /commands/scan/runscan tree.  It is fixed to 'bmon' for Taipan
but is selectable on other instruments with default="histmem"

r3589 | ffr | 2012-06-04 20:11:51 +1000 (Mon, 04 Jun 2012) | 5 lines
 2012-11-15 17:29:52 +11:00
Jing Chen
66aa3f943c create initial SICS file for Dingo 
r3574 | jgn | 2012-06-01 16:07:14 +1000 (Fri, 01 Jun 2012) | 1 line
 2012-11-15 17:29:19 +11:00
Ferdi Franceschini
a5d64c28ab SICS-467 Catch the bm COUNTSTART and COUNTEND events to set the feedback 
status even if the counter is started via "bm count" or stopped by an
INT1712.

r3541 | ffr | 2012-05-03 17:28:34 +1000 (Thu, 03 May 2012) | 4 lines
 2012-11-15 17:28:01 +11:00
Douglas Clowes
17c5d43030 Brain-dead driver for Aerotech Soloist "driver" for 12T magnet sample rotation motor 
r3532 | dcl | 2012-04-10 11:16:36 +1000 (Tue, 10 Apr 2012) | 1 line
 2012-11-15 17:27:20 +11:00
Douglas Clowes
534459e51f Add a needed SplitReply tom the bmonscan noscanvar 
r3520 | dcl | 2012-04-02 12:56:40 +1000 (Mon, 02 Apr 2012) | 1 line
 2012-11-15 17:26:30 +11:00
Douglas Clowes
810788577b Set the link property to data_set for all of the bmonscan axes 
r3505 | dcl | 2012-03-29 10:42:57 +1100 (Thu, 29 Mar 2012) | 1 line
 2012-11-15 17:26:16 +11:00
Douglas Clowes
38c4ef833a This change sets the @axes property on the bmonscan data 
r3503 | dcl | 2012-03-29 07:57:33 +1100 (Thu, 29 Mar 2012) | 1 line
 2012-11-15 17:26:07 +11:00
Jing Chen
0ed6a9a9ef add kookaburra 
r3487 | jgn | 2012-03-27 15:19:40 +1100 (Tue, 27 Mar 2012) | 1 line
 2012-11-15 17:25:58 +11:00
Jing Chen
6d45b5d0ac add kookaburra 
r3465 | jgn | 2012-03-15 13:52:31 +1100 (Thu, 15 Mar 2012) | 1 line
 2012-11-15 17:25:40 +11:00