39 Commits

Author SHA1 Message Date
10d29d597c Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h
2015-04-23 20:49:26 +10:00
9a1be5a80b merge and replace with PSI+site_ansto 2012-11-26 11:33:14 +11:00
c791fc65c7 Don't remove MakeAsyncQueue and MakeAsyncProtocol commands in ofac.c, we need them for the kowari/sylvac.tcl and for the robot.
Save positmotor indexed positions for Quokka

r2730 | ffr | 2008-11-03 18:20:34 +1100 (Mon, 03 Nov 2008) | 4 lines
2012-11-15 16:56:13 +11:00
6921d0426c PSI UPDATE
r1724 | ffr | 2007-03-27 07:56:13 +1000 (Tue, 27 Mar 2007) | 2 lines
2012-11-15 13:10:21 +11:00
3168325921 PSI update
r1464 | ffr | 2007-02-12 12:20:21 +1100 (Mon, 12 Feb 2007) | 2 lines
2012-11-15 12:58:05 +11:00
6e926b813f PSI sics-cvs-psi-2006 2012-11-15 12:39:51 +11:00
ae77364de2 PSI sics-cvs-psi-complete-tree-post-site-support 2012-11-15 12:39:49 +11:00
3ffd0d8af4 PSI sics-cvs-psi_pre-ansto 2012-11-15 12:39:48 +11:00
ce565b4d50 - Fixed a normalisation problem in diffscan when the first value
did not have enough counts
- Reduced polling frequency in emon
- Fixed a scriptcontext bug which would cause it to dump core in SctTransact
  on interrupts
- Fixed an issue with missing <nl> at the end of batch files
- Added a feature which does not call halt when counting stops in hmcontrol.c
  This is necessary for the BOA CCD
- Initalized doNotFree properly in hipadaba.c
- Added the travelling salesman reflection measurement algorithm
- Added another component to amorset
- Removed old SicsWait from nserver.c
- Added a means to nxscript to write 16 bit data for BOA
- Modified tasub to accept a drivabel as a motor and not only a motor.
  This became necessary to make EIGER work as A2 on EIGER is a virtual
  motor


SKIPPED:
	psi/amorcomp.h
	psi/amordrive.h
	psi/amorset.c
	psi/amorset.h
	psi/amorset.tex
	psi/amorset.w
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/pardef.c
	psi/polterwrite.c
	psi/psi.c
	psi/sinqhttpopt.c
2011-09-23 07:55:49 +00:00
09cc25ec5b - Implemented tcl: prefix which allows to execute a command in Tcl directly
- Fixed a stack overrun bug in macro.c
- Fixed a killing bug in devser.c
- Added node writing with offset to nxscript.c
- Wrote a simulation driver for second generation HM's
- Readded devexec commands to  SICS
- Readded Hipadaba initialisation to SICS
- Fixed a bug in sinqhttprot.c which is triggered when a reconnect happens
  during a node based download of data.


SKIPPED:
	psi/sinqhttpprot.c
2010-02-02 12:38:10 +00:00
25b3a27b52 - Updated gencom documentation 2009-10-30 13:49:59 +00:00
2103dadd22 - Added documentation to nxscript.htm 2009-02-03 08:06:23 +00:00
3810cb65a2 - Introduced nxscript putSlab 2007-02-23 14:31:56 +00:00
fa58bc5165 - Updatex nxscipt documentation 2006-08-16 14:13:27 +00:00
47e38eba5a - Added log instrumentation to devexe
- Added a hill climbing option to optimise
- Added hrpt files


SKIPPED:
	psi/libpsi.a
	psi/sinqhmdriv.c
	psi/tabledrive.c
2006-07-13 07:24:44 +00:00
7d8ad7392c - Fixed a couple of small things with the TAS code
- Fixed new AMOR settings module
- Initial implementation of the new SICS hierarchical parameter database


SKIPPED:
	psi/amorset.c
	psi/libpsi.a
	psi/sps.c
2006-06-23 13:04:52 +00:00
bd533e6131 - Fixes for FOCUS 2D
- Mapped fileeval to exe manager
- Updates for TRICS file formats


SKIPPED:
	psi/libpsi.a
	psi/sinqhmdriv.c
	psi/sinqhttp.c
	psi/tabledrive.c
	psi/tasscan.c
	psi/hardsup/asynsrv_utility.c
	psi/hardsup/sinqhm.c
2006-05-23 15:05:28 +00:00
c30d34f5dc - Added a log facility to scan which includes a variable which is logged but
not driven during a scan.
2006-01-27 11:33:22 +00:00
39877fc11a - Changes to SLS magnet controller
- Added nxscript putsicsdata to nxscript
2005-10-20 12:40:58 +00:00
ca69fe5101 - Committing first working version of new AMOR settings module 2005-10-05 07:20:17 +00:00
76abbe1042 - Added tabledrive: table driven path for MARS
- Initial MARS development
- Upgraded Manager Manual


SKIPPED:
	psi/make_gen
	psi/psi.c
	psi/tabledrive.c
	psi/tabledrive.h
	psi/tabledrive.w
	psi/utils/SerPortServer.c
2005-07-22 14:56:18 +00:00
96e8cdb2d5 - DMC McStas simulation working
SKIPPED:
	psi/amorstat.c
	psi/nxamor.c
	psi/pimotor.c
	psi/polterwrite.c
2005-07-05 07:06:15 +00:00
ef6c04e6b8 - Adding first working version of the McStas SICS connection to cvs
SKIPPED:
	psi/polterwrite.c
2005-06-22 07:09:59 +00:00
02bc002881 fix html tag </h2> 2005-04-27 04:25:27 +00:00
ef1de4589c - A couple of small fixes for memory and initialization problems.
This is to make valgrind happy


SKIPPED:
	psi/amorscan.c
	psi/el734hp.c
	psi/psi.c
	psi/tasscan.c
2005-01-12 08:42:39 +00:00
cvs
0f4e959e22 - New batch file management module
- New oscillator module
- Bug fixes


SKIPPED:
	psi/buffer.c
	psi/el734hp.c
	psi/el737hpdriv.c
	psi/make_gen
	psi/nextrics.c
	psi/nxamor.c
	psi/pimotor.c
	psi/polterwrite.c
	psi/psi.c
	psi/swmotor2.c
	psi/tasscan.c
	psi/tricssupport.c
	psi/tricssupport.h
	psi/tecs/make_gen
	psi/utils/ecb_load_new/ecb_load.c
	psi/utils/ecb_load_new/ecb_load.h
	psi/utils/ecb_load_new/ecbdriv_els.c
	psi/utils/ecb_load_new/gpib_els.c
	psi/utils/ecb_load_new/makefile
	psi/utils/ecb_load_new/makefile_EGPIB
	psi/utils/ecb_load_new/makefile_GPIB
2004-11-17 10:50:15 +00:00
cvs
0df15975dc - Changed FOCUS to writing data files through nxscript
SKIPPED:
	psi/faverage.c
	psi/fowrite.c
	psi/psi.c
	psi/swmotor2.c
2004-05-04 14:06:16 +00:00
cvs
f109d9a8c9 - Fixed problems at ANSTO
- Some missing files


SKIPPED:
	psi/amor2t.w
2004-03-09 12:10:00 +00:00
cvs
abb48f4b10 - Added missing issing doc files 2004-01-22 13:39:18 +00:00
cvs
bc02cb79e7 - made fixes to hkl
- Introduced a help system
- introduced a module for handling automatic updates of files during
  long measurements
- Added a circular buffer and handling facilities to varlog
- Upgraded documentation


SKIPPED:
	psi/faverage.h
	psi/nxamor.tex
	psi/pimotor.h
	psi/pimotor.tex
2003-12-10 13:50:44 +00:00
cvs
9305bb0f33 Updated alias and samenv docs (M.Z.) 2003-10-17 13:22:08 +00:00
cvs
98cfb3ddda - Implemented defpos for multiple motors
- Implemented automatic backup on parameter change
- Implemented silent restore
- Cleaned a couple of unused flags from connection object
2003-02-19 08:29:46 +00:00
cvs
ac10723d74 - TDC histogram memory driver sort of working
- New class for scripting datafiles
- SANS-II almost complete initialization file
2003-02-07 15:20:19 +00:00
cvs
3c916c9a7d - Fixed a bug fix with Fixed motor in TAS code
- Made AMOR write HDF-5 data in chunks
- Added  driver for a PSI-DSP magnet controller as used at SLS
- Added code for directly accessing RS232 controllers connected to a
  terminal server, thereby bypassing the SerPortServer
- A rounding problem in the PSD histogram memory was resolved.
2001-10-25 13:57:59 +00:00
cvs
db6c355f44 - Enhanced and debugged histogram memory for AMOR
* added PROJECT both in HM and driver code
  * added single detector support.
- Removed several bugs in the AMOR data bit.
- Updated documentation
2001-08-17 14:33:05 +00:00
cvs
0fac95ea9b - Updated the managers documentation a little
- The  crystal settings calculation in hkl now tried to put omega into
  the limts by calculating a delta omega.
- TRICS data files now include HKL and the UB
- The scan module has been expanded to support user defined scans which
  run a script at any scan point.
- A small fix to the PSD code in SinqHM_srv_filler
2001-07-20 08:05:25 +00:00
cvs
b1036fdde7 Add some POLDI stuff 2000-10-24 08:35:50 +00:00
cvs
af97d16309 Updated user documentation. MK 2000-02-11 15:21:07 +00:00
cvs
fdc6b051c9 Initial revision 2000-02-07 10:38:55 +00:00