Anna Bergamaschi ca865a6636 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer

2017-08-16 09:27:48 +02:00

..

gitInfoLib.h

high voltage reflects the master only, if 2 masters reflects -1

2017-08-10 11:09:44 +02:00

gitInfoLibTmp.h

git version history

2014-06-03 12:26:45 +02:00

remove_shm.sh

some debugging at the beamline (fnames)

2013-05-14 10:26:28 +00:00

slsDetector.cpp

Anna's modifications

2017-08-11 15:55:07 +02:00

slsDetector.h

moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix

2017-08-10 18:46:10 +02:00

slsDetectorActions.cpp

resolved warnings, also from esrf: todo: include changes in zmq

2017-05-01 13:11:10 +02:00

slsDetectorActions.h

changes for setting threshold without trimbits for eiger

2017-06-28 10:24:07 +02:00

slsDetectorBase.h

sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa

2017-08-10 17:25:18 +02:00

slsDetectorCommand.cpp

more changes to client docu. more coming up

2017-08-15 18:42:41 +02:00

slsDetectorCommand.h

fixed jungfrau configure bug by getting rid of gb10reset at configure

2016-11-08 09:35:34 +01:00

slsDetectorUsers.cpp

moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable

2017-02-03 12:29:44 +01:00

slsDetectorUsers.h

moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable

2017-02-03 12:29:44 +01:00

slsDetectorUtils.cpp

added busy command, converted get frames etc to an integer output

2017-08-08 19:15:20 +02:00

slsDetectorUtils.h

changes to gotthard server to include write adc, and also changes to fix the dma=dma+1

2017-07-11 10:54:21 +02:00