4195 Commits

Author SHA1 Message Date
852bc7462b Updated from ics2-pelican 2013-12-20 09:08:54 +11:00
4643a1fd04 SICS-700 Enable region of interest configuration parameters for histogram memory 2013-12-20 09:08:53 +11:00
472ca4f9d9 Updated from ics2-pelican. 2013-12-20 09:08:53 +11:00
7b814089ff SICS-705 Fix mercury log file creation bug. 2013-12-20 09:08:52 +11:00
99955b01da SICS-698 Make Bruker magnet driver setpoint driveable. 2013-12-20 09:08:51 +11:00
5b4d044835 Make SIM_RFGen.tcl executable. 2013-12-20 09:08:51 +11:00
093479f808 SICS-697 Make named links to data group using new typed naming system. 2013-12-20 09:08:49 +11:00
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
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
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
e9399b6990 SICS-687 Add 'nxscript makenamedlink' command. 2013-12-20 09:08:46 +11:00
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
83670b3d04 SICS-690 SICS fails to initialise the hmm object on Kookaburra. 2013-12-20 09:08:45 +11:00
dc85708451 - Added a AsconReadDoneReconnect to ascon. This handles the case better when
a server hangs up diretcly after a message.
- Some output was suppressed while tracing, fixed
- Make ready to compile both with Ubuntu 32 and 64 or /usr/local
  based ON in general. Just in psi/makefile_linux the top include has
  to be adapted
- Removed epics drivers from SICS. Still in source to be reenabled when
  needed
- Added FindMotor
- Added sput, sappend and slab to nxscript using the new sicsget module
- Fix to sget to fix the "mot softzero" problem


SKIPPED:
	psi/make_gen
	psi/psi.c
	psi/sinqhttpopt.c
	psi/spss7.c
2013-12-19 10:24:54 +00:00
57475b623e initialize match to zero on connect 2013-12-17 16:53:28 +11:00
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
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
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
57b6dce6bf - Added messagepipe.c
- Added initial version of sicsget. This is a more generalised way of
  reading and writing SICS data wherever it is. The thing is extendable if
  reading something the current way is to slow. This has both a C interface
  and an interpreter interface.
2013-11-07 08:42:32 +00:00
d7311c6f68 - Added missing file epicscounter.c
SKIPPED:
	psi/epicscounter.c
2013-11-04 15:03:03 +00:00
ad241bd99e - Added a protocol driver for the munich sputter machine
- Added a multicountsersec to teplace hmcontrol and multicounter
- Fixed a case sensitivity bug in haddcheck
- Made oscillate work with second generation motors for POLDI
- Added a time stamper to trace. Now there will be time stamps in trace files which allow
  to correlate things from the master log with the trace.
- Updated polterwrite.
- Updated testprot to work with the behave test


SKIPPED:
	psi/make_gen
	psi/polterwrite.c
	psi/psi.c
	psi/sputterprot.c
2013-11-04 12:55:15 +00:00
d35e7079a2 Copied modifications from ics1-platypus. 2013-10-29 09:06:57 +11:00
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
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
95369d3454 Make naming scheme for west4100 temperature controller consistent with other drivers. 2013-10-28 15:33:44 +11:00
090d80e166 SICS-683 Add x_pixels_per_mm and y_pixels_per_mm parameters for Platypus. 2013-10-28 15:33:43 +11:00
c3fd00c079 Add west4100 to Taipan's sics_config.ini 2013-10-28 15:33:43 +11:00
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
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
7a17be14ce SICS-673 PLC: eValue must be used to set values in the TCL interpreter. 2013-10-28 15:33:42 +11:00
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
b1ab4f8b1a SICS-675: Change lens configuration for Quokka 2013-10-28 15:33:41 +11:00
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
e666d980fd Don't use the SICS telnet port for the fake velocity selector. 2013-10-28 15:33:41 +11:00
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
c1f724c246 Taipan: Enable the plc/SIS feedback in SICS 2013-10-18 18:13:51 +11:00
6277d3f7ad Taipan: Reduce stepsperx on sample stage rotation to avoid overdriving it. 2013-10-18 18:13:01 +11:00
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
8ecf2f37a5 - inserted comments
SKIPPED:
	psi/arrobj.c
2013-10-16 12:46:37 +00:00
131f06367f - modified error message when offline 2013-10-16 12:46:21 +00:00
3366f21421 Taipan: Add LS370 and Mercury to sics_config.ini 2013-10-15 03:26:52 +11:00
ad3aa5cd3b Use sics_config.ini to configure LS370, oxford ITC, oxford Mercury, and oxford labview drivers. 2013-10-15 03:25:22 +11:00
d4b782aae7 Remove hard coded magnet name from sensor path. 2013-10-15 03:23:10 +11:00
55e93c8386 Set a convenient default path for config ini file on ICS and ICS TEST hosts. 2013-10-15 03:08:23 +11:00
79cdd71a78 Taipan: set absencHome and limits for 12T magnet sample motor. 2013-10-15 03:06:52 +11:00
ffdd508bc8 Make sure that scans only save scratch files if called with 'savetype nosave' 2013-10-15 02:56:43 +11:00
653f113ecc Quokka performance enhancements made by Dan Bartlett 12/09/13. 2013-10-15 02:24:00 +11:00
7c99ed7948 Configure 12T magnet motor as specified in Dan's email 18/9/13. 2013-09-24 07:57:20 +10:00
fd1e8a9737 Allow clients logged in with user rights to run the autosave command. 2013-09-23 23:43:40 +10:00
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