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

3130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ferdi Franceschini
68a746d46a SICS-710: Make the watlow_rm driveable block until a drive has finished. 
Also clear the geterror property to make sure that the driver recovers from Modbus error messages.
 2014-01-15 16:31:13 +11:00
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
fc02a71882 Make display window optional for SIM_GALIL.py 2013-12-20 09:09:01 +11:00
Ferdi Franceschini
d2ac198251 Updates from ics1-wombat 2013-12-20 09:09:00 +11:00
Ferdi Franceschini
6ce3f8bd45 SICS-706 Create sics_config.ini for SICS upgrade on Wombat. 2013-12-20 09:08:59 +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
d60710a3e1 Updated configuration from ics1-kookaburra. 2013-12-20 09:08:57 +11:00
Ferdi Franceschini
315d51541e Updated scan configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
Ferdi Franceschini
48edc7322a Updated motor configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
Ferdi Franceschini
2d96d3de69 Updated histmem configuration from ics1-kookaburra. 2013-12-20 09:08:56 +11:00
Ferdi Franceschini
0bf0af0847 Updated detector voltage range and OAT_TABLE configuration from ics1-platypus 2013-12-20 09:08:55 +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
52f28117ef Updated from ics2-quokka 2013-12-20 09:08:54 +11:00
Ferdi Franceschini
852bc7462b Updated from ics2-pelican 2013-12-20 09:08:54 +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
5b4d044835 Make SIM_RFGen.tcl executable. 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
e9399b6990 SICS-687 Add 'nxscript makenamedlink' command. 2013-12-20 09:08:46 +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
Ferdi Franceschini
83670b3d04 SICS-690 SICS fails to initialise the hmm object on Kookaburra. 2013-12-20 09:08:45 +11:00
Douglas Clowes
57475b623e initialize match to zero on connect 2013-12-17 16:53:28 +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
Nick Hauser
b2660cd135 Merge branch 'RELEASE-3_0' of ics2-dev.nbi.ansto.gov.au:/opt/sicsdev_git into RELEASE-3_0 2013-11-13 16:33:34 +11:00
Nick Hauser
39b841aee3 db5SICSUserGuideQuokka.xml is Katy Wood's document that has been manually 
converted from a Word document to docbook, for integration into Gumtree
help, and to have under source control.
 2013-11-13 16:28:36 +11:00
Ferdi Franceschini
d35e7079a2 Copied modifications from ics1-platypus. 2013-10-29 09:06:57 +11:00
Ferdi Franceschini
7bb1763da9 SICS-684 Add 'hmm astop' command to simulated hmm in script validator. 
See SICS-638 for justification.
 2013-10-29 09:16:54 +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
090d80e166 SICS-683 Add x_pixels_per_mm and y_pixels_per_mm parameters for Platypus. 2013-10-28 15:33:43 +11:00
Ferdi Franceschini
c3fd00c079 Add west4100 to Taipan's sics_config.ini 2013-10-28 15:33:43 +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
296ddc9331 SICS-617 west4100 driver gets comms error in new version of SICS. 
Revert change made by PSI in 7caade8
 2013-10-28 15:33:42 +11:00
Ferdi Franceschini
7a17be14ce SICS-673 PLC: eValue must be used to set values in the TCL interpreter. 2013-10-28 15:33:42 +11:00
Ferdi Franceschini
713ae0b263 SICS-504 Quokka beamstops:Try to get within 0.05 degrees of the target without raising an error. 2013-10-28 15:33:42 +11:00
Ferdi Franceschini
b1ab4f8b1a SICS-675: Change lens configuration for Quokka 2013-10-28 15:33:41 +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
e666d980fd Don't use the SICS telnet port for the fake velocity selector. 2013-10-28 15:33:41 +11:00
Nick Hauser
cbcd98c10c Manual copied from ANSTO branch and committed to RELEASE-3_0 branch. 
This directory was accidentally omitted from the merge-release branch during the PSI code merge.
 2013-10-28 11:22:59 +11:00
Ferdi Franceschini
c1f724c246 Taipan: Enable the plc/SIS feedback in SICS 2013-10-18 18:13:51 +11:00
Ferdi Franceschini
6277d3f7ad Taipan: Reduce stepsperx on sample stage rotation to avoid overdriving it. 2013-10-18 18:13:01 +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