linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,075 Commits 1 Branch 0 Tags
ffdd508bc8395027ead54b4e25c7d6159c85b134
Commit Graph

339 Commits

Author SHA1 Message Date
Ferdi Franceschini
ffdd508bc8 Make sure that scans only save scratch files if called with 'savetype nosave' 2013-10-15 02:56:43 +11:00
Ferdi Franceschini
edf2ca93a3 Force updates of sicsvariables if the save command is called when counting in blocking mode. 
This is needed to make autosave work during scans.
 2013-09-23 23:43:05 +10:00
Ferdi Franceschini
311a95d3c2 Create frame frequency parameter on simulated hmm. 2013-09-23 23:40:12 +10:00
Ferdi Franceschini
7bacc4dc7f Use sics_config.ini to generate 12T magnet setup on Taipan. 2013-09-18 16:16:06 +10:00
Ferdi Franceschini
9758aaee6b SICS-664 Remove unnecessary histogram memory controller hmc 2013-09-10 21:17:39 +10:00
Ferdi Franceschini
39497e2810 SICS-638 Send a pause to the histmem when SICS receives an INT1712 interrupt. 
This is done by mapping AnstoHttpPauseNoCon() to Halt in the histmem interface.
An ANSTO stop command astop has been added to send a Stop to the histmem which
is needed when uploading a new configuration.
 2013-09-10 14:39:03 +10:00
Ferdi Franceschini
6c6f100c0f Make sure that a posit motor transitions back to IDLE if the motor it depends on has been first driven directly. 2013-09-10 14:23:14 +10:00
Ferdi Franceschini
6e2917db78 Don't poll histogram server for textstatus in simulation and script validator mode. 2013-08-26 14:56:09 +10:00
Ferdi Franceschini
82567c7394 Rename mvrunscan to mscan 2013-08-22 07:55:47 +10:00
Douglas Clowes
f5dd71f4fb Get sct_lakeshore_370.tcl saving data to nexus files 2013-08-21 15:26:02 +10:00
Ferdi Franceschini
ca1e34856a Speed up histmem config when SICS starts up. 
Clock scale, frame freq and source should be set in the instrument specific
hmm_configuration.tcl file, not in hmm_configuration_common_1.tcl.
 2013-08-15 13:56:50 +10:00
Ferdi Franceschini
cafbd02b68 Make sure that the command status transitions to IDLE if it was set to BUSY 2013-08-15 08:04:15 +10:00
Ferdi Franceschini
564b7c9bd5 Use the selected sensor (external or bath) to report temperature from a Julabo 2013-08-15 08:03:34 +10:00
Ferdi Franceschini
5acb398b42 Provide add_oxmag command to instantiate an oxford magnet driver. 2013-08-15 07:59:02 +10:00
Ferdi Franceschini
0de5ee41e2 SICS-656 Make a multivariable runscan command. 
SICS-649 Return to initial position after a scan for Platypus
 2013-08-09 05:30:58 +10:00
Ferdi Franceschini
38d915cc6a SICS-646: Restore histogram command to hdb tree. 
Instruments which don't have a histogram should add
"set no_histmem true"
to the top of their instrument config file before the commands_common
file is sourced.
 2013-08-09 05:30:54 +10:00
Douglas Clowes
40c0bf7d9e Remove LS370 logging to stdout 2013-07-15 13:01:35 +10:00
Ferdi Franceschini
1486481a4c Revert scan config changes made for Dingo. They broke the bmonscan and hmscan objects. 2013-07-08 11:42:25 +10:00
Douglas Clowes
d73cf4278d Add Kiethley serial port configuration from Echidna 2013-07-05 14:27:35 +10:00
Douglas Clowes
73536234fe Add a new sct driver for the Watlow RM, based on the Watlow PM driver 2013-07-04 15:39:24 +10:00
Douglas Clowes
7d35ca4cf9 Allow 'aqadapter' as the IP and the AsyncQueue name as the port for Lakeshores 2013-06-27 16:36:06 +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
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