Dhanya Maliakal 374b07a126 merge developer

2017-07-03 17:42:06 +02:00

..

gitInfoLib.h

merge developer

2017-07-03 17:42:06 +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

made updatereceiver to actually update client in parameters that it can

2017-07-03 17:37:24 +02:00

slsDetector.h

changed jungfrau temperature conversion but binary to follow

2017-07-03 14:45:44 +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

changes for setting threshold without trimbits for eiger

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

slsDetectorCommand.cpp

merge developer

2017-07-03 17:42:06 +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

ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring

2017-06-22 16:44:29 +02:00

slsDetectorUtils.h

changes for setting threshold without trimbits for eiger

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