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
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
c2f08097da
Nxdict attribute writing failed at "0,1,0" style strings, FIXED
2015-04-17 11:44:50 +02:00
e9399b6990
SICS-687 Add 'nxscript makenamedlink' command.
2013-12-20 09:08:46 +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
f72891a626
bigger buffers
2012-11-29 11:47:23 +11:00
bd50b19178
- Fixed sicsprompt bug. Sicsprompt caused a core dump
...
- Removed generation of incommenurate reflections for 0,0,0 in fourmess.c
- Implemented a Poch command for heartbeats
- Fixed 64 bit dimension issues in nxdict
- Fixed different calling conventions for NXReportError deep stack in nxdict
- Stopped ei motor driving when not necessary
- Added yet another monitor for POLDI
- Added a protocoll driver for the JVL motor RS-485 binary protocoll
- Fixed some reporting issues
SKIPPED:
psi/jvlprot.c
psi/make_gen
psi/polterwrite.c
psi/psi.c
psi/spss7.c
2012-06-05 09:09:20 +00:00
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
91d4af0541
- Adapted indenation to new agreed upon system
...
- Added support for second generation scriptcontext based counter
2009-02-13 09:00:03 +00:00
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
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
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
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
f603985860
- cleaned up makefiles
...
- polished code to avoid warnings
SKIPPED:
psi/amorscan.c
psi/amorstat.c
psi/buffer.c
psi/dornier2.c
psi/ecb.c
psi/ecbdriv.c
psi/el737hpdriv.c
psi/el737hpv2driv.c
psi/eve.c
psi/faverage.c
psi/fowrite.c
psi/ipsdriv.c
psi/logger.c
psi/make_gen
psi/makefile
psi/makefile_alpha
psi/makefile_linux
psi/oicom.c
psi/psi.c
psi/remob.c
psi/ruli.c
psi/tasinit.c
psi/tasscan.c
psi/tasutil.c
psi/tricssupport.c
psi/hardsup/itc4util.c
psi/hardsup/make_gen
psi/hardsup/makefile
psi/hardsup/makefile_alpha
psi/hardsup/makefile_linux
psi/hardsup/makeprint.c
psi/hardsup/serialsinq.c
psi/tecs/coc_client.c
psi/tecs/coc_logfile.c
psi/tecs/coc_server.c
psi/tecs/coc_server.h
psi/tecs/didi
psi/tecs/keep_running.c
psi/tecs/macosx_def
psi/tecs/make_crv.tcsh
psi/tecs/make_gen
psi/tecs/makefile
psi/tecs/makefile_linux
psi/tecs/makefile_macosx
psi/tecs/myc_buf.c
psi/tecs/myc_time.c
psi/tecs/six.c
psi/tecs/sys_select.c
psi/tecs/tecs.c
psi/tecs/tecs_cli.c
psi/tecs/tecs_data.c
psi/tecs/tecs_lsc.c
psi/tecs/tecs_serial.c
psi/tecs/term.c
psi/utils/SerPortServer.c
psi/utils/el734.c
psi/utils/make_gen
psi/utils/makefile
psi/utils/makefile_alpha
psi/utils/makefile_linux
2005-03-08 11:11:51 +00:00
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
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
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
e3cd728ecb
- Rearranged directory structure for forking out ANSTO
...
- Refactored site specific stuff into a site module
- PSI specific stuff is now in the PSI directory.
- The old version has been tagged with pre-ansto
SKIPPED:
psi/A1931.c
psi/A1931.h
psi/amor2t.c
psi/amor2t.h
psi/amor2t.i
psi/amor2t.tex
psi/amor2t.w
psi/amorscan.c
psi/amorscan.h
psi/amorscan.w
psi/amorstat.c
psi/amorstat.h
psi/amorstat.i
psi/amorstat.tex
psi/amorstat.w
psi/bruker.c
psi/bruker.h
psi/bruker.w
psi/buffer.c
psi/buffer.h
psi/dilludriv.c
psi/dilludriv.h
psi/dmc.c
psi/dmc.h
psi/dmc.w
psi/docho.c
psi/ecb.c
psi/ecb.h
psi/ecb.i
psi/ecb.w
psi/ecbdriv.c
psi/ecbdriv.h
psi/el734dc.c
psi/el734driv.c
psi/el755driv.c
psi/el755driv.h
psi/faverage.c
psi/faverage.h
psi/faverage.tex
psi/faverage.w
psi/fowrite.c
psi/fowrite.h
psi/itc4.c
psi/itc4.h
psi/itc4.w
psi/itc4driv.c
psi/ltc11.c
psi/ltc11.h
psi/nextrics.c
psi/nextrics.h
psi/nxamor.c
psi/nxamor.h
psi/nxamor.tex
psi/nxamor.w
psi/pimotor.c
psi/pimotor.h
psi/pimotor.tex
psi/pimotor.w
psi/pipiezo.c
psi/polterwrite.c
psi/polterwrite.h
psi/psi.c
psi/ruli.c
psi/ruli.h
psi/sanscook.c
psi/sanswave.c
psi/sanswave.h
psi/sanswave.tex
psi/sanswave.w
psi/serial.c
psi/serial.h
psi/serial.w
psi/sinqhmdriv.c
psi/sinqhmdriv.i
psi/sinqhmdriv.w
psi/slsmagnet.c
psi/sps.c
psi/sps.h
psi/sps.i
psi/sps.tex
psi/sps.w
psi/swmotor.c
psi/swmotor.h
psi/swmotor.i
psi/tas.c
psi/tas.h
psi/tas.tex
psi/tas.w
psi/tasdrive.c
psi/tasinit.c
psi/tasscan.c
psi/tasu.h
psi/tasutil.c
psi/tdchm.c
psi/tdchm.h
psi/tecsdriv.c
psi/tecsdriv.h
psi/velodorn.c
psi/velodorn.h
psi/velodorn.w
psi/velodornier.c
psi/hardsup/README
psi/hardsup/StrMatch.c
psi/hardsup/asynsrv_def.h
psi/hardsup/asynsrv_errcodes.h
psi/hardsup/asynsrv_mark.c
psi/hardsup/asynsrv_utility.c
psi/hardsup/c_interfaces.c
psi/hardsup/dillutil.c
psi/hardsup/dillutil.h
psi/hardsup/el734_def.h
psi/hardsup/el734_errcodes.h
psi/hardsup/el734_utility.c
psi/hardsup/el734fix.h
psi/hardsup/el734tcl.c
psi/hardsup/el737_def.h
psi/hardsup/el737_errcodes.h
psi/hardsup/el737_utility.c
psi/hardsup/el737fix.h
psi/hardsup/el737tcl.c
psi/hardsup/el755_def.h
psi/hardsup/el755_errcodes.h
psi/hardsup/el755_errorlog.c
psi/hardsup/el755_utility.c
psi/hardsup/err.c
psi/hardsup/failinet.c
psi/hardsup/geterrno.c
psi/hardsup/itc4util.c
psi/hardsup/itc4util.h
psi/hardsup/make_gen
psi/hardsup/makefile_alpha
psi/hardsup/makefile_linux
psi/hardsup/makeprint.c
psi/hardsup/rs232c_def.h
psi/hardsup/serialsinq.c
psi/hardsup/serialsinq.h
psi/hardsup/sinq_defs.h
psi/hardsup/sinq_prototypes.h
psi/hardsup/sinqhm.c
psi/hardsup/sinqhm.h
psi/hardsup/sinqhm_def.h
psi/hardsup/stredit.c
psi/hardsup/strjoin.c
psi/hardsup/table.c
psi/hardsup/table.h
psi/hardsup/velsel_def.h
psi/hardsup/velsel_utility.c
psi/motor/Makefile
psi/motor/el734_test
psi/motor/el734_test.c
psi/motor/makeprint.c
psi/sinqhm/FOCUS_gbl.h
psi/sinqhm/FOCUS_srv_main.c
psi/sinqhm/Makefile
psi/sinqhm/SinqHM_bootParamsConfig.c
psi/sinqhm/SinqHM_bootUtil.c
psi/sinqhm/SinqHM_def.h
psi/sinqhm/SinqHM_gbl.h
psi/sinqhm/SinqHM_srv_filler.c
psi/sinqhm/SinqHM_srv_main.c
psi/sinqhm/SinqHM_srv_routines.c
psi/sinqhm/SinqHM_srv_server.c
psi/sinqhm/bld
psi/sinqhm/bld2
psi/sinqhm/bldmen
psi/sinqhm/hist_mem_notes.tex
psi/sinqhm/hist_mem_spec.tex
psi/sinqhm/hist_mem_spec_fig1.ps
psi/sinqhm/hist_mem_spec_fig2.ps
psi/sinqhm/hist_mem_spec_fig3.ps
psi/sinqhm/hist_mem_spec_fig4.ps
psi/sinqhm/lwl_client.c
psi/sinqhm/lwl_server.c
psi/sinqhm/make_sinqhm.com
psi/sinqhm/monitor.c
psi/sinqhm/psi_logo.ps
psi/sinqhm/sinq_logo.ps
psi/sinqhm/sinqhm_bootutil_client.c
psi/sinqhm/sinqhm_client.c
psi/sinqhm/sinqhm_ctrl.c
psi/sinqhm/usrConfig.c
psi/sinqhm/usrConfig.c_diffs
psi/sinqhm/usrConfig2604.c
psi/sinqhm/vmio10_def.h
psi/sinqhm/vmio_utility.c
psi/tecs/coc_client.c
psi/tecs/coc_client.h
psi/tecs/coc_logfile.c
psi/tecs/coc_logfile.h
psi/tecs/coc_server.c
psi/tecs/coc_server.h
psi/tecs/coc_util.c
psi/tecs/coc_util.h
psi/tecs/fortify1.c
psi/tecs/instr_hosts.c
psi/tecs/instr_hosts.h
psi/tecs/keep_running.c
psi/tecs/make_gen
psi/tecs/make_opt
psi/tecs/make_opt_alpha
psi/tecs/make_opt_llc
psi/tecs/makefile
psi/tecs/makefile_alpha
psi/tecs/makefile_linux
psi/tecs/myc_buf.c
psi/tecs/myc_buf.h
psi/tecs/myc_err.c
psi/tecs/myc_err.h
psi/tecs/myc_fortran.h
psi/tecs/myc_mem.h
psi/tecs/myc_str.c
psi/tecs/myc_str.h
psi/tecs/myc_time.c
psi/tecs/myc_time.h
psi/tecs/myc_tmp.c
psi/tecs/myc_tmp.h
psi/tecs/rstart.c
psi/tecs/six.c
psi/tecs/str.f
psi/tecs/sys_cmdpar.f
psi/tecs/sys_date.f
psi/tecs/sys_env.c
psi/tecs/sys_get_key.f
psi/tecs/sys_getenv.f
psi/tecs/sys_lun.f
psi/tecs/sys_open.f
psi/tecs/sys_open_alpha.f
psi/tecs/sys_rdline.c
psi/tecs/sys_select.c
psi/tecs/sys_select.h
psi/tecs/sys_unix.c
psi/tecs/sys_wait.f
psi/tecs/tecs.bld
psi/tecs/tecs.c
psi/tecs/tecs.tcl
psi/tecs/tecs_c.c
psi/tecs/tecs_c.h
psi/tecs/tecs_cli.c
psi/tecs/tecs_cli.h
psi/tecs/tecs_client.f
psi/tecs/tecs_data.c
psi/tecs/tecs_data.h
psi/tecs/tecs_dlog.inc
psi/tecs/tecs_for.f
psi/tecs/tecs_lsc.c
psi/tecs/tecs_lsc.h
psi/tecs/tecs_plot.f
psi/tecs/tecs_serial.c
psi/tecs/tecs_serial.h
psi/tecs/term.c
psi/tecs/term.h
psi/utils/Makefile
psi/utils/SerPortServer.c
psi/utils/asynsrv_test.c
psi/utils/ecb-load.c
psi/utils/el734.c
psi/utils/el734_test.c
psi/utils/el737.c
psi/utils/make.ecb
psi/utils/check/amorcheck
psi/utils/check/dmccheck
psi/utils/check/focuscheck
psi/utils/check/focusstatus.tcl
psi/utils/check/hrptcheck
psi/utils/check/sanscheck
psi/utils/check/sicssyntax.tex
psi/utils/check/sicssyntaxlib.tcl
psi/utils/check/test.tcl
psi/utils/check/topsicheck
psi/utils/check/tricscheck
psi/utils/check/tst
2003-06-20 10:17:44 +00:00
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
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
0daef05b2e
- Poldi data file writing with automatic update
...
- many fixes to TAS
- Changed HM code for ILL PSD to account for Christoph's offset to
positive.
2002-04-25 09:39:51 +00:00
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
8f84d45dd6
- Added a multiple histogram memory control module. This required a
...
tiny change in the countable interface which in turn required updating
of header file includes in a lot of files.
- Some small fixes to TRICS writing as well.
2001-06-08 15:18:35 +00:00
876396bb7e
- Added triple axis scan command.
...
- Introduced simulation mode to simdriv and simcter, i.e they never fail and
finish at once.
- Started defining MAD compatibility commands in Tcl
- Fixed a bug in FOCUS_src which caused it to leak sockets.
- Introduced setsockopt SO_REUSEADDR to all new sockets in sinqhm in order
to loose the next sinqhm error.
2000-12-05 09:05:03 +00:00
fc6c4acd79
D.Maden. 11-Sep-2000.
...
Makefiles modified to generate a Linux SICServer.
Other files modified to get rid of irritating compiler warning messages.
2000-09-11 09:17:43 +00:00
9a7084ed23
Cleaned up Makefiles after port to Linux, updated nxdict and napi
2000-02-21 08:11:15 +00:00
fdc6b051c9
Initial revision
2000-02-07 10:38:55 +00:00
