8272 Commits

Author SHA1 Message Date
b17a49c06b Merge branch 'developer' into rxframeindex 2022-01-31 10:16:34 +01:00
Dhanya Thattil
5a3caf22d4
Merge pull request #349 from slsdetectorgroup/moenchfnum
Moenchfnum
2022-01-31 08:37:35 +01:00
4cd027507d updated release notes 2022-01-31 08:37:05 +01:00
a771c56f6f fix progress 2022-01-28 16:35:51 +01:00
80c1c6428a fix 2022-01-28 16:16:18 +01:00
b5070f384a Merge branch 'developer' into rxframeindex 2022-01-28 16:09:48 +01:00
bae41e74eb binaries in after merge 2022-01-28 16:09:12 +01:00
Dhanya Thattil
76901d4135
Merge pull request #354 from slsdetectorgroup/mythenkernelfix
Mythenkernelfix
2022-01-28 15:36:14 +01:00
5e817d68da release notes 2022-01-28 15:34:43 +01:00
e5b42d411e binaries in 2022-01-28 15:33:56 +01:00
3c0b57eaa1 fix to convert string to time for cet timezone as well 2022-01-28 15:26:12 +01:00
5d4c35ddbe binaries in 2022-01-28 11:53:11 +01:00
6a02264af6 fix for 1g udp interface framenumber being set 2022-01-28 11:52:07 +01:00
6be983ca1c binaries in 2022-01-28 11:48:37 +01:00
ab28615999 minor 2022-01-28 11:47:31 +01:00
8995d3db8d setting next frame number also for udp 1g itnerface 2022-01-28 11:44:12 +01:00
7b37489cdc missed in last commit 2022-01-28 11:34:01 +01:00
5a69c60205 added nextframenumber for moench, ctb (also for virtual servers) 2022-01-28 11:32:27 +01:00
Erik Fröjdh
f6e76145c1
Make a library for writing and reading tiff, added tests (#347)
* removed Makefile for moench and integrated the build in CMake
* broke out tiff reading and writing to its own library
* moved tiff includes to include/sls
* moved tiffio source to src
* removed incorrectly used bps
* cleanup and tests for tiffio
* removed using namespace std from header
* some fixing for moench04
* Program for offline processing renamed

Co-authored-by: Anna Bergamaschi <anna.bergamaschi@psi.ch>
2022-01-27 10:24:02 +01:00
28fe6eadb5 progress also depends on listener index now 2022-01-26 17:35:31 +01:00
0d0429983b Merge branch 'developer' into rxframeindex 2022-01-26 14:42:55 +01:00
Dhanya Thattil
379d08dd03
Merge pull request #340 from slsdetectorgroup/eiger2udp
Eiger2udp
2022-01-24 16:40:52 +01:00
bf43b003b6 using xy instead of portGeometry 2022-01-24 15:42:25 +01:00
dbb6accfbe Merge branch 'eiger2udp' into rxframeindex 2022-01-24 12:54:09 +01:00
a2f46aa2dd binaries in 2022-01-24 12:46:16 +01:00
Dhanya Thattil
eb715e82cb
Merge pull request #344 from slsdetectorgroup/patsetbit
Patsetbit and vref
2022-01-24 12:43:30 +01:00
8a64d055b3 Merge branch 'eiger2udp' of github.com:slsdetectorgroup/slsDetectorPackage into eiger2udp 2022-01-24 11:39:22 +01:00
6c0356ff90 merge with developer 2022-01-24 11:39:13 +01:00
7cc7d979e4 merge with developer 2022-01-24 11:36:46 +01:00
a44284834a binaries in 2022-01-24 11:29:02 +01:00
27e48851e6 vref voltage of ad9257 changed from 1.33V to default 2V (for moench) 2022-01-24 11:28:36 +01:00
Erik Frojdh
c554bbb2d3 formatted slsDetectorCalibration 2022-01-24 11:26:56 +01:00
c45f2a282c updated release 2022-01-24 11:25:07 +01:00
Erik Frojdh
623b1de8a0 added f suffix 2022-01-24 11:19:38 +01:00
9328aadfa3 Merge branch 'developer' into patsetbit 2022-01-24 11:13:32 +01:00
4a15b31b04 updated help in Detector API and python 2022-01-24 11:09:36 +01:00
01e8414162 binarie sin 2022-01-24 11:00:37 +01:00
3b11000532 fixed getsettings (moench) for patsetbit and patmask 2022-01-24 11:00:16 +01:00
f38c1c8714 binaries in 2022-01-24 09:40:24 +01:00
664c992028 exchanging patsetbit and patsetmask functionalities 2022-01-24 09:39:19 +01:00
Erik Frojdh
02174f79d1 changed deprecated uint32 declaration to uint32_t 2022-01-24 09:01:44 +01:00
5f40e32924 rxr: frame number should be forwarded to caught frame number for discard partial frames or discardemptyframe mode, currentframeindex command should point to listener current frame index and not dataprocessors index 2022-01-21 14:46:38 +01:00
ef8de7b2be updated release notes 2022-01-21 12:06:50 +01:00
7c740445dc Merge branch 'developer' into eiger2udp 2022-01-21 11:51:42 +01:00
f95a15c841 update release 2022-01-21 11:51:32 +01:00
193ab75ebe Merge branch 'developer' into eiger2udp 2022-01-20 18:02:19 +01:00
Dhanya Thattil
062ab63289
Merge pull request #343 from slsdetectorgroup/ctbslowadc
fix for slow adcs and any other adcs that went to stop server, but ne…
2022-01-20 17:23:55 +01:00
50c1056eb2 minor 2022-01-20 17:23:41 +01:00
14d10d2f8f fix for slow adcs and any other adcs that went to stop server, but needed control server for configuration of the adc 2022-01-20 17:21:37 +01:00
5403656e79 Fixed some stuff for the Zmq process 2022-01-19 14:56:44 +01:00