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

412 Commits

Author SHA1 Message Date
Ferdi Franceschini
e27aea0169 SICS-709: Refresh the count status whenever the current counts are fetched (eg before saving data). 
This was broken as a side effect of SICS-664 (ie removing the unnecessary hmcontrol object).
 2014-01-15 16:31:13 +11:00
Ferdi Franceschini
03c00623ee Allow two LS336 and two LS340 temperature controllers to be selected. 2013-12-20 09:09:03 +11:00
Ferdi Franceschini
5d40914ee0 Fix typo to stop the scan command from checking thread0 on tclmot motors. 2013-12-20 09:09:02 +11:00
Ferdi Franceschini
37879b9144 The ID and TYPE were the wrong way around when calling add_oxford_mercury. 2013-12-20 09:08:58 +11:00
Ferdi Franceschini
216e2b3529 SICS-697 Make named links in data group for LS336 and Oxford Mercury. 
SICS-705 Fixed log file name bug in Mercury controller.
 2013-12-20 09:08:57 +11:00
Ferdi Franceschini
2cf513c4bb FIX: Create driver interface for each syringe pump on Platypus 2013-12-20 09:08:55 +11:00
Ferdi Franceschini
4643a1fd04 SICS-700 Enable region of interest configuration parameters for histogram memory 2013-12-20 09:08:53 +11:00
Ferdi Franceschini
472ca4f9d9 Updated from ics2-pelican. 2013-12-20 09:08:53 +11:00
Ferdi Franceschini
7b814089ff SICS-705 Fix mercury log file creation bug. 2013-12-20 09:08:52 +11:00
Ferdi Franceschini
99955b01da SICS-698 Make Bruker magnet driver setpoint driveable. 2013-12-20 09:08:51 +11:00
Ferdi Franceschini
093479f808 SICS-697 Make named links to data group using new typed naming system. 2013-12-20 09:08:49 +11:00
Ferdi Franceschini
6692a1a2bb SICS-699 Provide a hipadaba "control" group for special hdb nodes like environment setpoints and sensor readings 2013-12-20 09:08:48 +11:00
Ferdi Franceschini
58e35efba3 SICS-695 Save a named link for scan variables and other objects if required. 
If a SICS object has a "linkname" attribute then that name will be used when
making links in the data file.
 2013-12-20 09:08:47 +11:00
Ferdi Franceschini
5df895cc76 SICS-694 Save data with named links on hdb nodes decorated with named links. 
Note the use of the Tcl 8.5 {*} expand feature to expand a list into
separate arguments when calling a function.
 2013-12-20 09:08:47 +11:00
Ferdi Franceschini
650d1c0127 SICS-693 newfile BEAM_MONITOR fails. 
Make sure that the "axes" hdb property defaults to "run_number" for the BEAM_MONITOR filetype.
 2013-12-20 09:08:46 +11:00
Douglas Clowes
0266abbd94 Change the temperature factor from 10.0 to 20.0 
This refelcts the firmware update to the RVA ROM removing the factor
of 2.0 for the temperature reading and setting
 2013-12-16 13:36:35 +11:00
Ferdi Franceschini
fa9ba68146 SICS-684 Stop the 'ERROR: option fat_clock_scale n' messages when running the script_validator. 2013-10-29 09:14:41 +11:00
Ferdi Franceschini
95369d3454 Make naming scheme for west4100 temperature controller consistent with other drivers. 2013-10-28 15:33:44 +11:00
Ferdi Franceschini
4812644b66 Modify west4100 configuration to load the driver if it has been 
selected in a sics_config.ini file.
 2013-10-28 15:33:43 +11:00
Ferdi Franceschini
6d9c5173ec Make sure that the rank of the histmem dataset is always equal to the rank of the data + 1 
even when the hmm object is marked as immutable.
 2013-10-28 15:33:41 +11:00
Ferdi Franceschini
5914db28c3 Save the magnetic field value setpoint last set by SICS for the Oxford 12T magnet. 
TODO:We should save the setpoint from the Labview program.
 2013-10-18 18:11:35 +11:00
Ferdi Franceschini
ad3aa5cd3b Use sics_config.ini to configure LS370, oxford ITC, oxford Mercury, and oxford labview drivers. 2013-10-15 03:25:22 +11:00
Ferdi Franceschini
d4b782aae7 Remove hard coded magnet name from sensor path. 2013-10-15 03:23:10 +11:00
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