Commit Graph

1043 Commits

Author SHA1 Message Date
fb19bf9bf6 Harmonized status text codes between second generation objects and sctdriveadpater, sctdriveobj 2015-02-04 14:35:21 +01:00
e23dff2141 -Fixed a small bug in sicsdata copytonode where the start position was not honoured 2014-12-04 11:33:43 +01:00
f274f3bcdb - Fixed a sget bug which caused text wrongly to be identified as numbers
- Fixed a sput bug: SetHipadabaPar versus UpdateHipadabaPar
- Modified hdelcb to be able to remove callbacks from SICS objects
2014-11-18 09:24:27 +01:00
fd986402ff - Removed a trace message which flooded the trace whenever a Tcl task
executed.
2014-10-24 09:16:32 +02:00
be058abdef Fixed a sget bug from POLDI. Returns OK instead of number 2014-10-21 16:28:06 +02: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
8ea20b87f4 Added reflist relabel
This relabels all reflections in numeric order again. This is necessary for travelsort
2014-09-01 11:17:18 +02:00
9500b59f04 Fixed SICSType to recognize exponential numbers 2014-08-28 09:03:41 +02:00
c3fe7555db Fixed an incommensurate problem
No duplicate reflections are created with propagation vectors containing .5
2014-08-27 16:26:44 +02:00
8f704ebab9 Improvements for BOA
- Allowed write buffers to become very large in asynnet. Thus in order to allow for the transfer
  of large images. tested ub to 2kx2k, 16MB
- Handle lack of space in the write buffer more gracefully: just skip the image
2014-08-27 16:24:39 +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
1d1f102b08 - Fixed a serious bug in interface.c introduced while cleaning SetStatus 2014-07-18 15:50:04 +02:00
f5e797dd6a - Cleaned all old dtatus setting code 2014-07-18 14:02:57 +02:00
6a47bd9441 Merge branch 'master' into status 2014-07-15 16:46:22 +02:00
db6167bfa1 - Removed old stuff in conman
- Fixed a bug in processnode which hangs SICS when processnode is called from multiple
  clients on the same node
- Fixed a bug in multicountsersec which caused thrashing of the Tcl results which caused ugly
  error messages when calling the transfer script. Now a copy of the connection is made
  before calling the transfer script
2014-07-15 16:43:09 +02:00
709118c286 - Added isactive command to scan. Such that collect can test for another scan running before starting 2014-07-08 08:47:28 +02:00
4fb94efe9a This is the first version of the newly refactored status code handling.
Status codes are now determined by a special task which inspects SICS for what
is going on. Before this was a global variable which caused conflicts when
multiple instances in the code tried to set it.
2014-06-27 11:05:27 +02:00
d6faaa593a - Removed trim in sicsget: caused line breaks in text to disappear which was not desired 2014-06-25 08:46:54 +02:00
a27f0d9b94 - Cosmetic changes to sicsget and counter
- Fixed a bug when NETconnect would come back with errno EINPROGRESS which is no
  error really
2014-06-06 16:38:14 +02:00
98790ec9c5 Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics 2014-06-03 12:03:04 +02:00
f1e3ae7c0b Fixed a bug in sicshipadaba which would not cause bin transfer mode properly honoured on hget
Added a total feature to histmemsec
2014-06-03 12:01:52 +02:00
dc3a3c39c0 Added append to trace in support of the autotrace facility 2014-05-23 09:53:34 +02:00
005df1c200 - Made comment padding work 2014-05-22 11:47:35 +02:00
9172b70462 - Fixed a stack smashing bug in statemon.c. String was 1 short... 2014-05-22 10:47:39 +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
4f5bcaeb5e Assorted bug fixes
- In network.c and asynnet.c code was added to close the socket when a
  connect failed. Otherwise the socket would leak and the process
  runs out of file descriptors.
- Multicountserc now forcefully handles the counting status. Before I had
  the status flickering between counting and nobeam because the HM has no way to
  diagnose nobeam
- In motorsec.c the pDrivInt->iErrorCount was not reset to 0 properly. Leading to death.
- Removed the stack smashing test flag for the time being.
2014-05-21 09:58:23 +02:00
325fc6f313 Fixed a bug with restarting after mipositioning in motorsec.c 2014-05-09 16:48:23 +02:00
e89b640088 Bug fixes
- transfer of monitor values in mutlicountersec
- Permission denied mesage when restarting a second generation motor fixed
2014-05-07 14:24:44 +02:00
72f9e59150 Multiple bug fixes
- Arrayutil was not summing correctly
- Added interest to motorsec in order to support old status clients
- core dump because of bad free in devser
- fixed transferring of count time in multicounter
- added stack debugging to sllinux_def
- Modifications to tasdrive to wait for finish of monochromator properly
2014-05-05 13:52:00 +02:00
b466a2d427 Fixed another bug with sget mot softzero 2014-04-10 14:24:38 +02:00
8e1ac545ce Linked epics statically 2014-04-10 10:53:18 +02:00
722fab935e Fixed a task and a tasdrive issue
There is a rare condition when SICS has frehsly stared up and on the first call
to a coordinated driving, like in TAS, something fails. Then the group has ID 0,
the default and that one is always active. This has been fixed by starting valid
groups at 7, defining 0 ans IDUNDEFINED and checking in isTaskGroupRunning for
IDUNDEFINED

Then there is an issue in tasdrive. I added a call to CheckStatus when starting the
mono. This is necessary for the eiger monochromator as with that one starting is deferred
to the CheckSttaus function. The reason is that in other use cases, the looser might want
to drive a2 and a2w at the same time. This can only correctly be accomodated by deferring
the caclulations to the CheckStatus phase.
2014-04-07 14:02:07 +02:00
fc8798d012 Reenabled EPICS motor support in order to make the attoCube controller work 2014-02-26 17:17:08 +01:00
Markus Zolliker
a43e3838e3 test commit 2014-02-25 08:25:07 +01:00
f1c105085d Made SICS compile in the new git setup 2014-02-24 08:42:19 +01:00
810a3cbd94 Cleanup of the repository before pushing to gitorious
Refs #201
2014-02-18 16:41:37 +01: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
zolliker
95d37fea12 - inserted ANETProcess into "How are you" test 2014-01-31 14:53:44 +00: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
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
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
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
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
koennecke
255b83665c - Added restart status code
- Small fixes to make regression tests work at the same level as for first
  generation devices
2013-07-18 14:24:00 +00:00
zolliker
9a3607bd66 - make reconnectInterval changeable (0: no automatic reconnection) 2013-06-25 11:21:04 +00:00
zolliker
8ecedfe443 - allow HIPFUNC functions to be saved and restored with its arguments 2013-06-25 11:18:04 +00:00
zolliker
1edc042db1 - created stop and count function for sics crons 2013-06-25 11:16:20 +00:00