Dhanya Maliakal 7ace569daf resolved conflicts in merging with release

2016-02-25 14:32:56 +01:00

..

gitInfoLib.h

git rev in

2015-06-29 16:56:34 +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

resolved conflicts in merging with release

2016-02-25 14:32:56 +01:00

slsDetector.h

added iodelay with setttings

2016-02-24 18:05:17 +01:00

slsDetectorActions.cpp

vtrimbit size and vthreshold common for eiger

2014-09-09 17:00:26 +02:00

slsDetectorActions.h

supports frames with many samples for jctb - obtained by faking number of chips in case of many samples

2015-01-30 12:58:53 +01:00

slsDetectorBase.h

Merge branch 'release' into jungfrauv1.0

2016-02-03 15:05:50 +01:00

slsDetectorCommand.cpp

added iodelay with setttings

2016-02-24 18:05:17 +01:00

slsDetectorCommand.h

pulsing client side, and bug fix server side for reset partially

2015-11-19 16:15:59 +01:00

slsDetectorUsers.cpp

Revert "trying to fix for 2D detector(eiger)"

2015-12-15 16:29:47 +01:00

slsDetectorUsers.h

including subframe index from receiver to client and also sending this to gui

2015-09-23 11:50:02 +02:00

slsDetectorUtils.cpp

fixed measurement progress bar bug that kepts getting reset for each measurement

2016-02-05 11:29:02 +01:00

slsDetectorUtils.h

data call back form receiver includes both x and y dimensions

2015-12-16 15:01:00 +01:00