Commit Graph

5810 Commits

Author SHA1 Message Date
maliakal_d 9f3ad4e2f4 merge from 4.2.0 2020-04-07 15:14:27 +02:00
Dhanya Thattil ab9fed45fb Merge pull request #91 from slsdetectorgroup/testing
Testing
2020-04-07 12:15:37 +02:00
maliakal_d a86ae0cb47 WIP 2020-04-07 12:14:22 +02:00
maliakal_d bdf0f9e2b9 fixed start stop tests 2020-04-07 10:39:50 +02:00
maliakal_d fad10273ed fix for server crashing when sending udp packets if no udp server present to listen to it (receiver): cannot use connect and write 2020-04-07 09:57:22 +02:00
maliakal_d 83283b672a WIP 2020-04-06 19:38:35 +02:00
maliakal_d 456b96446f WIP 2020-04-06 17:59:06 +02:00
maliakal_d 80e55cd4da WIP 2020-04-06 17:28:05 +02:00
maliakal_d 47b0e46f15 Merge branch 'developer' into testing 2020-04-06 10:55:41 +02:00
Dhanya Thattil fdb6e3f3d4 Removeshm (#90)
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not  updated yet)

* removed dr and deadtiem from shm

* help for rx_status and status to point them to rx_Start, rx_stop, start and stop

* moved progress to receiver

* removed currentsettings from eiger shm

* updated server binaries, and client api

* moench and ctb virtual servers compile fix

* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
maliakal_d eeed102bf3 somewhere between fork and pipes, crashes at sendingudppacket at print 2020-04-03 20:18:16 +02:00
maliakal_d 7c7f7e8c70 testing WIP 2020-04-03 16:20:05 +02:00
maliakal_d 262b4b0b16 more tests 2020-03-31 18:19:32 +02:00
maliakal_d 83010de9f4 updated all binaries, previous ones may not work 2020-03-31 16:58:35 +02:00
maliakal_d f2dd146e56 updates on servers (mainly virtual): indices, dbit clock not allowed for moench anymore 2020-03-31 16:54:35 +02:00
maliakal_d 03af145ee8 test delay fix 2020.04.01.dev0 2020-03-31 13:38:11 +02:00
maliakal_d 043e62f9fd delay test 2020-03-31 13:35:04 +02:00
maliakal_d 6289163ac8 virtual servers checked 2020-03-31 10:40:42 +02:00
maliakal_d 3ba9e5ec22 eiger, jungfrau, ctb, moench, gotthard virtual servers checked 2020-03-30 18:24:42 +02:00
Erik Frojdh 719157f5c3 python funcs 2020-03-30 14:59:08 +02:00
Dhanya Thattil d58eb1dc6e Gappixels (#89)
* WIP

* WIP virtual delays, imagetest for saturation

* WIP, vertical and horizontal

* WIP

* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers

* quad works (also in virtual), handling gappixels and quad

* jungfrau gapppixels work

* jungfrau: done

* complete image or missing packets given in json header and gui

* eiger virtual 4 bit mode bug fix

* working version of zmq add json header, except printout

* printout bug

* fix for json para

* to map WIP

* map done

* map print , mapwith result left

* json result works, testing added

* updated server binaries

* compiling on rhels7, variable size char array iniitalization

* zmqsocket parsing didnt need Document

* const to map, json para is strings not map

* json add header: mapping cleaner without insert make_pair
2020-03-30 14:54:35 +02:00
maliakal_d 6a6af528ef testing WIP 2020-03-30 13:25:39 +02:00
maliakal_d 112d120a89 testing WIP 2020-03-27 18:54:46 +01:00
maliakal_d 8dfb55d476 testing 2020-03-27 17:00:14 +01:00
maliakal_d d488f4bea8 updated all receiver testing 2020-03-27 16:59:16 +01:00
Erik Frojdh 58ab3c4123 gold linker 2020-03-27 08:22:24 +01:00
maliakal_d 02d7381788 compile manuals 2020-03-26 18:42:01 +01:00
Erik Frojdh fb051355b8 moved string conversion to .cpp 2020-03-26 15:06:23 +01:00
Erik Frojdh 4d8a63eee1 ToString of Result<map> 2020-03-26 14:10:06 +01:00
Erik Frojdh d0c3e006fb printing of std::map 2020-03-26 12:39:56 +01:00
Erik Frojdh f22f23849d minor 2020-03-26 11:56:38 +01:00
bergamaschi 94bddb9908 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-24 12:03:59 +01:00
bergamaschi ed20e17c3a fixed bug in pedestal cloning and changed cluster finder file format- tested only for 3x3 2020-03-24 12:03:29 +01:00
Erik Frojdh 8fc1578a5e added support for MSG_PEEK 2020-03-24 09:20:38 +01:00
Erik Frojdh 9753d075f0 added headers to install 2020-03-24 09:06:36 +01:00
Erik Frojdh 865b4e50ad Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-19 17:12:44 +01:00
Erik Frojdh 597c359ef8 added overload signatures in python binding 2020-03-19 17:12:35 +01:00
Erik Frojdh a108a4df4c fixed also the moench oofline cluster finder 2020-03-19 15:42:24 +01:00
bergamaschi 0a6b04ee76 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-19 15:25:33 +01:00
bergamaschi 78dd96357d fixed slsDeetctorcalibration - including interpolation for rectangular pixels 2020-03-19 15:25:00 +01:00
maliakal_d 9230182e35 rxr: dont update index if fwrite 0 2020-03-19 15:21:21 +01:00
maliakal_d 8f7adb130f conflict fix 2020-03-19 14:07:33 +01:00
maliakal_d 16d5321885 rx_hostname can be added with port and also concatenated 2020-03-19 14:06:16 +01:00
Erik Frojdh 9a6f521f6a other replacements for string 2020-03-19 12:39:42 +01:00
Erik Frojdh dee0aea378 replace stoi with StringTo<int> 2020-03-19 12:33:13 +01:00
bergamaschi 0e3cd00579 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-19 11:56:49 +01:00
bergamaschi 6091271f37 somenthing on calibration 2020-03-19 11:41:55 +01:00
maliakal_d 272a8bfaf1 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-03-19 11:36:44 +01:00
maliakal_d 75692c3539 zmq server address copy warning fix 2020-03-19 11:36:32 +01:00
Erik Frojdh 46e9b450c0 assume dec unless 0x 2020-03-19 11:09:20 +01:00