Commit Graph

49 Commits

Author SHA1 Message Date
b60ce746d4 Merge commit 'refs/merge-requests/1' of ssh://gitorious.psi.ch/sinqdev/sics into merge-requests/1
First merge with ANSTO which compiles

Conflicts:
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	exebuf.c
	hipadaba.c
	interface.h
	make_gen
	motor.c
	nserver.c
	nwatch.c
	ofac.c
	protocol.c
	sicshipadaba.c
2015-04-23 17:00:33 +02:00
Ferdi Franceschini
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
b319461531 Fixed a minor memory leak in count and drive task handling
Reformatted multicountser to become clearer
Minor fixes
Added more tracing output to sort the SANSLI problem
2014-10-13 13:36:37 +02:00
boa
9e898d1476 Fixed addauxref for the triple axis code
Added a writing state to status
2014-08-15 13:36:36 +02:00
005df1c200 - Made comment padding work 2014-05-22 11:47:35 +02:00
d1060a3368 - Added and commented out padding handling in nxscript puts. Now HDF5 shortens my strings.... 2014-05-22 09:02:33 +02:00
koennecke
33e122ea9e - Modified collective drive operations to run motors in individual tasks
- Added a processnode methos to scriptcontext. processnode waits for the
  scriptchain of a node to finish.
- Fixed a bug in sicsget
- Made histmemsec dim and rank manager privilege. To allow chnage at runtime.
  Is required for SANS
- Fixed some issues with multicountersec, mostly relating to passing things through
  in a sensible way.
- Updated motorsec.c to work with a client based driver


SKIPPED:
	psi/polterwrite.c
	psi/tabledrive.c
	psi/tabledrive.h
2014-02-18 13:25:32 +00:00
Ferdi Franceschini
e9399b6990 SICS-687 Add 'nxscript makenamedlink' command. 2013-12-20 09:08:46 +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
koennecke
5a06bb9b90 - Removed napi from SICS
- Added error fields to hwardware objects: motor, counter, histmem
- Optimised sinqhttpopt
- Added haddcheck which adds checks to hipadaba nodes. The current implementation
  only checks for selctions agaisnt the values property. Expand when more checks are
  required.


SKIPPED:
	psi/polterwrite.c
	psi/sinqhttpopt.c
	psi/tasinit.c
2013-08-14 09:50:22 +00:00
Douglas Clowes
6473498cb2 SICS-648: memory leak in nxscript.c:putslab
fix memory leak (but only on malloc path)
Originally committed on SVN as,
r2428 | dcl | 2008-04-14 09:47:50 +1000 (Mon, 14 Apr 2008)
2013-08-09 05:30:55 +10:00
Douglas Clowes
78fed168ec histogram data 2012-11-29 12:17:00 +11:00
Douglas Clowes
ce8fa3a694 histogram data 2012-11-29 12:15:21 +11:00
koennecke
9eca96b064 - Fixes to make SL6 work
- New NeXus libraries
- Added new raw binary transfer mode for mass data
- Added a check script option to configurable virtual motor


SKIPPED:
	psi/dumprot.c
	psi/make_gen
	psi/psi.c
	psi/rebin.c
	psi/sanslirebin.c
2012-03-29 08:41:05 +00:00
koennecke
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
koennecke
446b05d6a2 - Added some hipadab array math
- Added missing cnvrt files, stolen from Markus
- Debugged the new sinqhttpopt driver for SINQ HTTP HM
- Debugged the driver for the new S7 Siemens SPS
- Added handling of hexadecimal terminators to ascon.c
- Increased the write buffer size in asynnet again
- Fixed  a core dump in lld.c
- Added writing of second gen HM to nxscript.c
- Added doubletime command to SICS
- Fixed a core dump issue in sicshdbadapter.c on dimension changes
- Modified sicsobj to look for lower case keys too


SKIPPED:
	psi/cnvrt.c
	psi/cnvrt.h
	psi/el734hp.c
	psi/make_gen
	psi/sinqhttpopt.c
	psi/sinqhttpprot.c
	psi/spss7.c
	psi/swmotor.c
2011-04-08 14:18:42 +00:00
koennecke
2b9df3d05a - Final fix for FOCUS problem 2010-06-04 14:38:00 +00:00
koennecke
1ae7c0c2e2 - Introduced a command history log for statistical and
syntax checking input purposes
- Rectified an error message in fourmess.c
- HMcontrol did not check for the HM to stop before returning. This
  caused weird data files at AMOR as the data had not yet been downloaded
  from the HM.
- Fixed an issue about parameters in multicounter
- Temporary fix in nxscript.c to always read the Hm from the HM and not
  a buffer. This is prior to rethinking caching strategies for old style
  HM's.
- Synchronize now copies fixed motors correctly. This used to cause
  irritation with users. This now requires a script syncdrive to exist
  in the sync server which takes care of handling the fixed flag when
  this is desired.
- Added initify to sicsdata in order to copy large value timebins over
  properly at AMOR


SKIPPED:
	psi/amorstat.c
	psi/make_gen
	psi/makefile_linux
	psi/polterwrite.c
	psi/sinq.c
	psi/sinqhttp.c
	psi/sinqhttpprot.c
	psi/sps.c
	psi/tdchm.c
2010-06-01 10:01:00 +00:00
koennecke
b26b8fc735 - Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS
- Added a driver for the POLDI power supplies


SKIPPED:
	psi/A1931.c
	psi/autowin.c
	psi/bruker.c
	psi/docho.c
	psi/dornier2.c
	psi/dspcode.c
	psi/ease.c
	psi/ecb.c
	psi/ecbcounter.c
	psi/ecbdriv.c
	psi/el734dc.c
	psi/el734driv.c
	psi/el734hp.c
	psi/el737driv.c
	psi/el737hpdriv.c
	psi/el737hpdrivsps.c
	psi/el737hpv2driv.c
	psi/el755driv.c
	psi/eurodriv.c
	psi/haakedriv.c
	psi/itc4driv.c
	psi/julcho.c
	psi/linadriv.c
	psi/lmd200.c
	psi/lscsupport.c
	psi/ltc11.c
	psi/make_gen
	psi/oicom.c
	psi/oxinst.c
	psi/pimotor.c
	psi/pipiezo.c
	psi/polterwrite.c
	psi/psi.c
	psi/sanscook.c
	psi/sanslirebin.c
	psi/sanswave.c
	psi/sinqhmdriv.c
	psi/sinqhttp.c
	psi/slsecho.c
	psi/slsmagnet.c
	psi/slsvme.c
	psi/sps.c
	psi/swmotor.c
	psi/swmotor2.c
	psi/tabledrive.c
	psi/tasscan.c
	psi/tdchm.c
	psi/velodorn.c
	psi/velodornier.c
2010-04-13 15:08:38 +00:00
koennecke
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
koennecke
8cc5474334 - After a bug at TRICS I replaced all occurrences of strcpy, strcat, sprintf
by length limited versions wherever appropriate.


SKIPPED:
	psi/el755driv.c
	psi/faverage.c
	psi/frame.c
	psi/lmd200.c
	psi/polterwrite.c
	psi/psi.c
	psi/sanswave.c
	psi/sinqhmdriv.c
	psi/termprot.c
2009-12-04 12:58:31 +00:00
koennecke
91d4af0541 - Adapted indenation to new agreed upon system
- Added support for second generation scriptcontext based counter
2009-02-13 09:00:03 +00:00
koennecke
361ee9ebea - Reworked the connection object and the IO system
- Reworked the support for TRICS
- Added a second generation motor
2009-02-03 08:05:39 +00:00
zolliker
1b1a29ad2b - printf("%d",strlen(...)) gives a warning on SL5
hope that this version gives no warning on Mac OS X
2008-08-29 12:18:00 +00:00
koennecke
af3461c774 Compiles and runs under Mac OS X
VS: ----------------------------------------------------------------------


SKIPPED:
	psi/arrobj.c
	psi/pardef.c
	psi/polterwrite.c
	psi/tecs/tecs_cli.c
2008-07-23 12:15:06 +00:00
koennecke
9737722b8c - Added hmslave.c
- Tasub only drives required motors
- Tasub handles fixed motors more gracefully
2007-05-30 11:57:50 +00:00
koennecke
007f06d3e6 - Updated RITA-2 data files to new NeXus standard
- New HM driver for Delcam CCD camera
2007-03-06 10:07:44 +00:00
koennecke
6eb387654e - Removed automatic loading of status file on startup
- make soft motor values the default all over
- Introduced nxscript putSlab
- Fixed a bug in polldriv
2007-02-23 14:31:43 +00:00
koennecke
0825c48986 - Added support for accessing the exe file management functions from scripts
- Fixed a bug in hmdata.c
- Fixed an issue with tempoerature writing through RemObjects in mesure
- Added auxiliary reflections to tasub
- Make maximize use soft motor positions
2006-11-24 15:51:19 +00:00
koennecke
cb3bf30bbf - Fixes to hkl code
- Fixes to make RITA work
- tasub extended to calculate UB from cell alone, support for elastic mode
- New MultiCounter as abstraction for counting on HM's
- regression test driver for counters
2006-09-13 07:12:00 +00:00
koennecke
a5c2da6acf - Switched motor to hdb
- Changes to Hipadaba
- Added project to histogram memory code
- Started regression testing code
- Added hill climbing as optimization method to optimise
2006-08-16 14:13:05 +00:00
koennecke
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
koennecke
39877fc11a - Changes to SLS magnet controller
- Added nxscript putsicsdata to nxscript
2005-10-20 12:40:58 +00:00
koennecke
1247dcdb82 - Switched to NAPI-3.0 with XML support
- Fixed exeman to write files by default into the first directory in batchpath
- Fixed a bug in nxdict which prevented it from handling attributes
  containing :/ properly
- Removed junk files
- Fixed a bug in hklscan.c which made it dump core
- Added XML support to nxscript.c
- Added support for writing NeXus-XML data files to tasub
2005-05-27 11:58:05 +00:00
koennecke
b8fea0bc38 - Reworked mesure for four circle to new specifications
* reworked table
  * added psd mode
- exe now allows absolute paths
- added getRS232Timeout to rs232controller
- Fixed a couple of "guessed" return values
2005-03-16 07:58:52 +00:00
zolliker
9a94b6dca7 made code proper to avoid warning/fixed some small potential bugs 2005-03-04 12:53:07 +00:00
koennecke
28ddbc420d - Added separate drivable motors for four circle H, K, L
- Added a listen mode to commandlog in order to support the batchEditor
- Some small fixes to exe* for BatchEditor
2005-02-23 10:11:18 +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
a55d2f0f7f - Fixed a bug in conman.c which could cause a core dump when terminating
a connection during an active run.
- Added an additional output mode for the connection in order to
  support the batch run editor.
- Made clientput send everything with eWarning mode in order to support
  the batch run editor.
- Added a better NetReadTillTerm
- Fixed a problem in synchronize.c
- Fixed an issue with reading empty line on normal connection sockets.
- Added a psi scan mode to mesure.c for TRICS
- Made motor print warnings when trying to reposition.
- Fixed abug in hkl.c which cause wrong signs.


SKIPPED:
	psi/el734driv.c
	psi/el734hp.c
	psi/el737driv.c
	psi/el737hpdriv.c
	psi/nextrics.c
	psi/nxamor.c
	psi/psi.c
	psi/slsmagnet.c
	psi/swmotor2.c
	psi/tasscan.c
	psi/tasutil.c
2004-07-21 12:03:06 +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
7780648e8a - New napi5.c with fix for deep group linking problem
- New file name scheme implemented


SKIPPED:
	psi/amorscan.c
2004-01-14 15:01:10 +00:00
cvs
0fb0458341 - Fixes to NXscript
- Added Pause and Continue commands
- Fixed simulation counter to deal properly with pause
- Fixed nxdict HDF5 problem


SKIPPED:
	psi/makefile_alpha
	psi/nextrics.c
	psi/nxsans.c
2004-01-09 14:45:36 +00:00
cvs
fcfb569518 - Dokumentation updates
- Fixed bad file generated through nuweb
- fixed problems in synchronize.c
- New file writing scheme implemented
- Changes to hkl
2003-12-23 15:54:50 +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
f3853c20f0 - Fixed bug with ECB not stopping when no beam
- Fixed synchronisation issues
- Fixed hsitogram memory writing from nxscript
- Started module for writing SICS interfaces in Tcl
- Fixed a bug in scan, which allowed to corrupt files
- Fixed memory problems in napi5
2003-05-23 15:06:47 +00:00
cvs
cb4bbbc93c - A few fixes to the hsitogram memory codes
- Many fixes for the triple axis code
2003-04-10 11:41:22 +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
45a07c9ddc - Driver for the Risoe Temperature controller
- HM is now working
- display code added
2003-02-14 13:00:28 +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