Commit Graph

8229 Commits

Author SHA1 Message Date
maliakal_d 7c740445dc Merge branch 'developer' into eiger2udp 2022-01-21 11:51:42 +01:00
maliakal_d f95a15c841 update release 2022-01-21 11:51:32 +01:00
maliakal_d 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
maliakal_d 50c1056eb2 minor 2022-01-20 17:23:41 +01:00
maliakal_d 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
bergamaschi 5403656e79 Fixed some stuff for the Zmq process 2022-01-19 14:56:44 +01:00
maliakal_d 26aa129004 merged with developer to fix conflicts 2022-01-19 10:40:20 +01:00
maliakal_d 945adebe2e binaries in 2022-01-19 08:38:27 +01:00
maliakal_d 753cbbd18c gui doesnt need to multply to get port geometry for number of interfaces, previously worked as bool was used instead of int for numInterfaces in DetectorImpl:readframefromreceiver 2022-01-18 17:10:12 +01:00
maliakal_d bfccc004e8 updated versions 2022-01-18 12:22:36 +01:00
maliakal_d 987404a14e binaries in 2022-01-17 16:46:56 +01:00
maliakal_d a41b6f73d4 merge from developer 2022-01-17 11:58:22 +01:00
bergamaschi 7871a78c8f updates to work with ctb and moench04 2022-01-14 13:39:40 +01:00
maliakal_d e5be13f064 Merge branch 'eiger2udp' of github.com:slsdetectorgroup/slsDetectorPackage into eiger2udp 2022-01-13 16:39:27 +01:00
maliakal_d c15131f8f6 fixed eiger bottom port now shows, because number of udp interfaces for eiger was set by default to get zmq port, has to be calcualted again now 2022-01-13 16:39:17 +01:00
maliakal_d 15c887f413 server binary 2022-01-13 15:19:43 +01:00
maliakal_d 01d7831abf module id in udp header for virtual servers for debugging, formatting 2022-01-12 12:21:17 +01:00
maliakal_d 182e5fdadb missing one line 2022-01-07 12:55:40 +01:00
maliakal_d fd655437ab gui doesnt work, but ports fixed 2022-01-07 12:51:49 +01:00
maliakal_d 88869c1746 some more fixes for eiger 2 udp interface 2022-01-07 12:44:32 +01:00
maliakal_d c92d0e5ee2 minor 2022-01-07 08:57:31 +01:00
maliakal_d 549fef5680 fixed warnings 2022-01-07 08:54:20 +01:00
maliakal_d 79affe1ea4 updated client and rxr, not tested 2022-01-06 18:46:14 +01:00
Erik Frojdh 2aaf59adb3 added libtiff as dependency for Moench 2022-01-06 16:44:19 +01:00
Dhanya Thattil f9eed62a45 Merge pull request #339 from slsdetectorgroup/fixes
Fixes
2022-01-06 15:51:33 +01:00
Erik Frojdh f818ac46b8 int64_t in receiver missing packets 2022-01-06 15:15:42 +01:00
maliakal_d 1e309b67ef server side done 2022-01-06 09:20:29 +01:00
maliakal_d 22c820771a update release notes 2022-01-05 15:23:56 +01:00
maliakal_d ae9691e848 removing warnings, hdfmutexlib moved from class member in dataprocessor to just arguments when required in dataprocessor (setupfilewriter and createvirtualfile) 2022-01-05 15:20:06 +01:00
maliakal_d 4fce0dcd9c temp workaround, but must fix in cmdproxy the possibility of getting extra packets in rx_missingpackets 2022-01-05 14:23:53 +01:00
maliakal_d 77fb8280f1 warning in using abs for unsigned (missing packets) in rxr, but also trying to print to signed in command line (so as not to change api atm) 2022-01-05 12:55:21 +01:00
maliakal_d 2dd98c6054 numImages not used in Listener anymore 2022-01-05 11:38:18 +01:00
maliakal_d 9101200283 updated project version 2022-01-04 13:22:20 +01:00
lopez_c 6057de2a6d This commit fixes the issue #336
A delay of 100ms has been added between the generation of the stop pulse and the resetCore function call. This should give enough time to the detector to readout and streamout the ongoing frame before the internal logic is reset (even after the transmission is delayed with txndelay_frame).
2021-12-14 17:28:56 +01:00
maliakal_d f476266e5e back to developer versions 2021-11-26 10:42:57 +01:00
Erik Frojdh 066706872d updated version and added python 3.10 build 6.1.0 2021-11-26 09:25:41 +01:00
maliakal_d f98c403f06 Merge branch 'main' into developer 2021-11-25 13:03:03 +01:00
maliakal_d 5dcc2ab35c fixed server names versioing 2021-11-25 13:01:23 +01:00
maliakal_d d80c5e1c02 fixed versions in servers 2021-11-25 12:59:44 +01:00
maliakal_d 7acc201797 fix release version 2021-11-25 12:56:21 +01:00
maliakal_d 57a52ba2dc update release version 2021-11-25 12:55:47 +01:00
maliakal_d c011129c43 Merge branch 'main' into 6.0.1.rc1 2021-11-25 12:40:24 +01:00
maliakal_d 2ed8b85143 update release notes 2021-11-25 12:30:59 +01:00
maliakal_d 5ac2fc33ff release notes 2021-11-25 12:29:45 +01:00
maliakal_d c169e6b896 fixed tests 2021-11-25 12:26:48 +01:00
maliakal_d 497d29db39 fix for eiger overwriting of server nchip 2021-11-25 12:21:44 +01:00
maliakal_d 2fbf0d6996 to fix test changing order 2021-11-25 12:15:20 +01:00
maliakal_d 16246407c5 Merge branch '6.0.1.rc1' of github.com:slsdetectorgroup/slsDetectorPackage into 6.0.1.rc1 2021-11-25 12:09:16 +01:00
maliakal_d 4a89bef87b no need to update server nchan/nchip/ndac values from client 2021-11-25 12:09:07 +01:00