Commit Graph

2309 Commits

Author SHA1 Message Date
Erik Frojdh d4ac6fe160 gitinfo as public 2019-03-20 17:48:01 +01:00
Erik Frojdh 83e43b1bcf format ColumnLimit changed to 100 2019-03-20 17:31:19 +01:00
Erik Frojdh 2a01688683 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-20 17:07:29 +01:00
Erik Frojdh 4b2c6af4f5 reorganizing of slsDetectorSoftware 2019-03-20 17:07:02 +01:00
maliakal_d 3ff01bf609 removed minor warnings for unused ret 2019-03-20 17:07:02 +01:00
Erik Fröjdh 03402d0e9e Error handling with exceptions in slsDetector and multiSlsDetector (#14)
* less error mask

* removing error mask from slsDetector

* removed ErrorMask

* setonline, setreceiveornline bug fix
2019-03-20 16:23:41 +01:00
maliakal_d 685fcc31b6 setonline, setreceiveronline was never really setting offline flag, so was never really updating detector first time 2019-03-19 18:42:45 +01:00
Erik Frojdh 4e56107015 new socket overload 2019-03-19 17:49:20 +01:00
Erik Frojdh 6759b2eeb8 refactor getID 2019-03-19 16:27:07 +01:00
Erik Frojdh 38bf540c1a fixed segfault on loading trimbits 2019-03-18 18:10:50 +01:00
Erik Frojdh 43012e4f28 more const more python 2019-03-18 17:38:44 +01:00
Erik Frojdh 43d478076c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-18 12:06:49 +01:00
Erik Frojdh 4036e6af8d const qualified multi calls, python fixes 2019-03-18 12:06:39 +01:00
maliakal_d fad73a57aa minor 2019-03-18 09:19:04 +01:00
Erik Frojdh c0d5303b70 removed pycache 2019-03-15 17:59:36 +01:00
Erik Frojdh c93b78c74f working 2019-03-15 13:50:50 +01:00
Erik Frojdh c153be95d1 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-15 10:15:50 +01:00
Erik Frojdh 4943983d10 det id const and ini shm in constructor 2019-03-15 10:15:42 +01:00
maliakal_d 5fe7a86361 switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message 2019-03-15 10:00:22 +01:00
Erik Frojdh 9f724f0c0d using only sls exceptions 2019-03-14 17:09:44 +01:00
Erik Frojdh bad44f5bf4 moving SharedMemory into namespace sls 2019-03-14 16:51:38 +01:00
Erik Frojdh 40d2f66146 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-03-14 16:37:46 +01:00
Erik Frojdh 9639e480d9 new exceptions 2019-03-14 16:37:36 +01:00
maliakal_d be33102164 checkonline, checkrecieveronline, retval has offline hostnames, online flag should be set no matter what the outcome 2019-03-14 13:18:42 +01:00
maliakal_d cb687d805e merge conflict 2019-03-14 12:41:37 +01:00
maliakal_d 327d08a016 removing comments, added one check for nullptr, updated current threshold when getting module, removing unsued function from header file (writesettingsfile) 2019-03-14 12:40:01 +01:00
Erik Frojdh c9422befff fixed loading trimbits 2019-03-14 10:21:18 +01:00
Erik Frojdh d21ceb0e75 only construct shared memory from a type with exact size 2019-03-13 17:43:48 +01:00
Erik Frojdh 9a08c85b2a changed the shared memory of slsDetector 2019-03-13 17:38:27 +01:00
Erik Frojdh 85134443de initial 2019-03-13 16:29:29 +01:00
maliakal_d f8aa0e3d6d removed minor commented lines 2019-03-13 15:19:32 +01:00
Erik Frojdh 7e793539ca removed typedef for shared struct 2019-03-12 14:42:27 +01:00
Erik Frojdh d4e4fb8ffe move constructor deleted copy constructor 2019-03-12 14:37:06 +01:00
Erik Frojdh 48e4cec56f minor 2019-03-12 11:52:13 +01:00
Erik Frojdh 3b2c734efd adding tests 2019-03-12 11:43:28 +01:00
Erik Frojdh 507a22ac05 default args 2019-03-12 10:14:24 +01:00
Erik Frojdh a01d68a61f initial changes 2019-03-12 08:22:07 +01:00
maliakal_d 2532df37cc client: added basic fail handling where ommitted 2019-03-06 17:37:13 +01:00
maliakal_d ca817c6ae9 client: update roi on updatedetector, (ctb, moench)moved nchans and databyte calculated to updatenumberofchannels and called for any update in roi, readoutflag or #samples changed (get should not update). ctb,moench server: roi fixed, . gotthard server: bug fix waiting to finish, ad9252 spi call fix. receiver: updated for moench and 10g 2019-03-06 17:25:18 +01:00
maliakal_d 0765b330f1 ctb and moench, exptime connects to set pattern wait time with level 0 2019-03-06 15:17:54 +01:00
maliakal_d abc7a9bd2f moench has only analog readout 2019-03-06 14:52:21 +01:00
maliakal_d 2676e8b43d receiver: readout flag bug fix, clent:send roi for ctb and moench 2019-03-06 10:55:51 +01:00
maliakal_d d3c1193a71 ctb/moench server, fixed frequency configuring bug, readpattern sleep, detectormode command, jsonheader set even if rxr offline, set speed returnvalue is value not ok/fail, rxr printout missingpackets 64 bit 2019-03-06 10:25:16 +01:00
maliakal_d 08bd2378f4 slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t 2019-03-04 09:41:20 +01:00
maliakal_d 8939e23622 jungfrau feature:storagecell_delay added 2019-03-01 15:26:38 +01:00
maliakal_d d2d50a56df eiger server/client bug fix: readout flag of -1 2019-03-01 14:08:28 +01:00
maliakal_d 8c067437e6 ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions 2019-03-01 12:28:11 +01:00
maliakal_d 35b1ad39f7 ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive 2019-03-01 10:45:01 +01:00
maliakal_d bb81613900 ctb, moench: implemented led enable feature 2019-03-01 09:00:04 +01:00
maliakal_d debf3a1b01 ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver 2019-02-28 16:07:47 +01:00