2172 Commits

Author SHA1 Message Date
Erik Frojdh
c4aa5ef7bb sendToDetectorStop 2019-04-26 15:15:56 +02:00
Erik Frojdh
d7eadd5782 sendToReceiver 2019-04-26 12:58:40 +02:00
Erik Frojdh
714e456d7d Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-25 17:56:32 +02:00
Erik Frojdh
b76d123df1 shorter functino 2019-04-25 17:56:20 +02:00
2eac75aa0b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-25 17:39:56 +02:00
18558e1288 bug fix command line patnloops should print in decimal, receiver ctb: added p option to print data for debugging, fixed initializing of result in memory 2019-04-25 17:39:46 +02:00
Erik Frojdh
b853bd92c8 template for sending to detector 2019-04-25 17:01:04 +02:00
Erik Frojdh
4da85b15a0 cleaning 2019-04-25 13:55:45 +02:00
Erik Frojdh
8cc8b58b05 sendToDetector 2019-04-24 15:24:56 +02:00
Erik Frojdh
dbf927901f more of sendToDetector 2019-04-24 14:39:08 +02:00
Erik Frojdh
834b1e58ea cleaning slsDetector 2019-04-24 10:57:02 +02:00
Erik Frojdh
02fd4b356e adding config for tests 2019-04-23 17:37:02 +02:00
1bc6e7f978 conflict resolved 2019-04-18 15:32:07 +02:00
266520741a ctb patterns interface rewritten 2019-04-18 15:29:43 +02:00
Erik Frojdh
86afb2bd0e more ctb commands 2019-04-18 15:03:01 +02:00
Erik Frojdh
f591adccb8 added getPatternLoop 2019-04-18 09:33:14 +02:00
Erik Frojdh
849d3ba049 removed create and delete module 2019-04-17 17:17:59 +02:00
Erik Frojdh
ee20cfab1e removed pointers added constructor 2019-04-17 16:19:18 +02:00
Erik Frojdh
b46e107f35 moved detParameters to sls_detector_defs 2019-04-17 14:28:53 +02:00
Erik Frojdh
91813a2c68 moved sls_detector_module outside slsDetectorDefs class 2019-04-17 09:27:45 +02:00
Erik Frojdh
c7169f3c36 moved setDetectorSpecific parameters to constructor of detectorParameters 2019-04-16 12:15:31 +02:00
Erik Frojdh
dd6bb85230 clang-tidy fix 2019-04-16 10:31:04 +02:00
Erik Frojdh
bad8b99b25 clang-tidy fix 2019-04-16 10:21:35 +02:00
Erik Frojdh
001ce4a93e clang-tidy warnings 2019-04-16 09:28:29 +02:00
Erik Frojdh
0527880747 slsDetector implicit conversion 2019-04-16 09:15:17 +02:00
Erik Frojdh
d31446ce07 unused values and comments 2019-04-15 18:14:58 +02:00
Erik Frojdh
0cc0c2715b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-04-15 17:22:40 +02:00
Erik Frojdh
248306d570 minor 2019-04-15 17:22:31 +02:00
6b4d6084f5 merge conflict resolved 2019-04-12 19:23:16 +02:00
79c6f5310b eiger server and client: cleaning up setting of dynamic range for eiger, where multi client takes care of checking rate correction in a separate call, tests included 2019-04-12 19:20:31 +02:00
25d7781878 ctb bug fix:digitial io delay and led were checking if receiver was online instead of detector 2019-04-12 15:33:15 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
ed74e710d6 merge from 4.0.1 2019-02-11 14:37:54 +01:00
907d1655d1 merge from 4.0.1 2019-02-11 14:04:09 +01:00
6bf1a944da updaterev 2019-02-08 17:28:44 +01:00
3c77447868 removed minor warnings 2019-02-08 16:32:23 +01:00
441c3dc5db Merge branch 'add-targets-export-name' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-targets-export-name
Pull request from Samuel ESRF
2019-02-08 13:07:08 +01:00
Erik Frojdh
cd738106ec printf and uninitialized variables 2019-02-08 11:14:16 +01:00
Erik Frojdh
0e120330f4 fixed comparisons to build with clang 2019-02-08 10:16:32 +01:00
bf0e0ac601 updated binaries in serverbin 2019-02-07 17:06:07 +01:00
143682cfb1 updaterev 2019-02-07 16:55:01 +01:00
dcad6c80ce minor modifications for interpolation and mythe data structure 2019-02-06 16:22:17 +01:00
22686e1e25 eiger server bug fix: getmeasured period and exptime gets 32 bit from Febinterface and needs to be casted to int64_t before multiplying by 10 2019-02-06 14:52:52 +01:00
Samuel Debionne
e13ecc8625 Add slsReceiver and slsDetector targets to the export set (used by donwstream project)
set TARGETS_EXPORT_NAME if the project is built directly.
2019-02-05 11:51:03 +01:00
61e769773b got rid of insignificant printouts from debugging 2019-02-04 16:43:37 +01:00
3c2bbf6ad4 gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes, multi: possible fix of image reconstruction in x direction in gui 2019-02-01 18:48:51 +01:00
2f11681d3f gotthard server: configmac should also set cycles for sending dummy frame 2019-01-30 18:24:25 +01:00
Erik Frojdh
73ae8c6151 removing static libs 2019-01-15 17:24:20 +01:00
615dd2a84f jungfrau server: minor change 2019-01-07 12:06:04 +01:00
dc80dccb8a jungfrau server: updated binaries 2019-01-07 11:52:36 +01:00