Commit Graph

4134 Commits

Author SHA1 Message Date
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
koennecke
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
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
koennecke
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
koennecke
d7311c6f68 - Added missing file epicscounter.c
SKIPPED:
	psi/epicscounter.c
2013-11-04 15:03:03 +00:00
koennecke
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
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
zolliker
8ecf2f37a5 - inserted comments
SKIPPED:
	psi/arrobj.c
2013-10-16 12:46:37 +00:00
zolliker
131f06367f - modified error message when offline 2013-10-16 12:46:21 +00:00
Ferdi Franceschini
3366f21421 Taipan: Add LS370 and Mercury to sics_config.ini 2013-10-15 03:26:52 +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
55e93c8386 Set a convenient default path for config ini file on ICS and ICS TEST hosts. 2013-10-15 03:08:23 +11:00
Ferdi Franceschini
79cdd71a78 Taipan: set absencHome and limits for 12T magnet sample motor. 2013-10-15 03:06:52 +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
653f113ecc Quokka performance enhancements made by Dan Bartlett 12/09/13. 2013-10-15 02:24:00 +11:00
Ferdi Franceschini
7c99ed7948 Configure 12T magnet motor as specified in Dan's email 18/9/13. 2013-09-24 07:57:20 +10:00
Ferdi Franceschini
fd1e8a9737 Allow clients logged in with user rights to run the autosave command. 2013-09-23 23:43:40 +10: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
bcd9f89b85 Get new st4vt lower limit from Platypus 2013-09-18 16:12:23 +10:00
koennecke
3e6501d806 - Fixed documentation typos
- In support of HMsec, allow the count command in countsec to run without a
  preset parameter. If this is missing the old, stored preset is used.
- Removed a check which causes initialisation of the HM from a batch file fail
  for POLDI
- fixed @nl@ encoding of \n problem with certain kinds of batch files generated by GTSE
- Fixed a bug with summing on hitsmemsec. nxdataset now uses 64 bit int for dimensions.
- Fixed motorsec to remove itself properly from a parent when linked. Please note
  that there is still the limitation that a second generation motor can only be linked
  once in a Hipadaba tree
- Extended subsampling a HM for second generation HM
- Added a hscriptnotify. This calls a script on the update of a node
- POLDI has been rebuilt, chnages to data file writing
- For testing, sinqhttopt now understands a special command, byteswapoff,
  which switches off byte swapping. Required when the HM ius run on an Intel box.


SKIPPED:
	psi/polterwrite.c
	psi/sinqhttpopt.c
2013-09-16 09:27:50 +00:00
Ferdi Franceschini
4558e50ff8 SICS-664: statemon reports STARTED = histmem but doesn't report FINISH.
Removed the started message, we get enough feedback from the HistogramMemory.
2013-09-11 19:47:26 +10:00
Ferdi Franceschini
9c1bb2c809 SICS-405: Reverted fix of 1/6/2010 to remove sleep() function call. 2013-09-11 19:45:44 +10:00
Ferdi Franceschini
4db6412146 SICS-666 SICS returns the raw message from the spin flippers instead of a parsed field separated string. 2013-09-11 16:09:27 +10:00
Ferdi Franceschini
1af24fcb0a _histmem proc isn't created if the common hmm config file is loaded with the "source" command. 2013-09-10 21:44:45 +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