Dhanya Thattil 70a1b87603 merge conflict resolved

2018-10-30 14:31:20 +01:00

..

detectorData.h

client: removed slsDetectorutils and postprocessing. yet to compile, yet to add detpos index for every multi sls detector command and call from command interface, removed multiple threading, yet to interface with eriks single template for multiple threading

2018-10-03 11:15:39 +02:00

gitInfoLib.h

detector servers moved out of slsdetector software, eiger server compiles with new headers

2018-10-11 14:20:50 +02:00

gitInfoLibTmp.h

changed all variables from svn to git, included --version for receiver binary

2017-12-06 10:29:57 +01:00

remove_shm.sh

some debugging at the beamline (fnames)

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

slsDetector.cpp

merge conflict resolved

2018-10-30 14:31:20 +01:00

slsDetector.h

merge conflict resolved

2018-10-30 14:31:20 +01:00

slsDetectorCommand.cpp

merge conflict resolved

2018-10-30 14:31:20 +01:00

slsDetectorCommand.h

removed command threaded

2018-10-17 17:35:55 +02:00

slsDetectorUsers.cpp

funcs name only in c++, bug fix:slsdetectorusers not deleting multislsdetectorcommand object, bug fix: programfpga does not delete fpgasrc malloc if returning in failure

2018-10-12 17:37:39 +02:00

slsDetectorUsers.h

refactor receiver client interface, moved defs into one sls_detector_defs.h

2018-10-11 12:25:18 +02:00