Commit Graph

  • 38bf540c1a fixed segfault on loading trimbits Erik Frojdh 2019-03-18 18:10:50 +01:00
  • 43012e4f28 more const more python Erik Frojdh 2019-03-18 17:38:44 +01:00
  • 98655ee7e3 added missing py file Erik Frojdh 2019-03-18 12:20:48 +01:00
  • 43d478076c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-18 12:06:49 +01:00
  • 4036e6af8d const qualified multi calls, python fixes Erik Frojdh 2019-03-18 12:06:39 +01:00
  • fad73a57aa minor Dhanya Thattil 2019-03-18 09:19:04 +01:00
  • c0d5303b70 removed pycache Erik Frojdh 2019-03-15 17:59:36 +01:00
  • 3356c2d3f6 all python version Erik Frojdh 2019-03-15 15:01:44 +01:00
  • f7eb256eb6 version Erik Frojdh 2019-03-15 14:45:44 +01:00
  • 250fc26308 fixed deloyment Erik Frojdh 2019-03-15 14:40:12 +01:00
  • 3f45d39c8d deploy on all branches Erik Frojdh 2019-03-15 14:37:01 +01:00
  • 4e94995142 conda build Erik Frojdh 2019-03-15 14:23:51 +01:00
  • c93b78c74f working Erik Frojdh 2019-03-15 13:50:50 +01:00
  • 73af4a744f added pybind11 v2.2 as submodule Erik Frojdh 2019-03-15 11:05:12 +01:00
  • 6ddde83c81 python Erik Frojdh 2019-03-15 11:01:36 +01:00
  • bb93147537 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-15 10:37:54 +01:00
  • 1eff8485dd receiver listener bug fix from previous commit Dhanya Thattil 2019-03-15 10:37:47 +01:00
  • c153be95d1 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-15 10:15:50 +01:00
  • 4943983d10 det id const and ini shm in constructor Erik Frojdh 2019-03-15 10:15:42 +01:00
  • 5fe7a86361 switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message Dhanya Thattil 2019-03-15 10:00:22 +01:00
  • 7522a655df removing warning in gcc Erik Frojdh 2019-03-14 17:38:40 +01:00
  • 836eb8cde2 explicit override Erik Frojdh 2019-03-14 17:15:58 +01:00
  • 9f724f0c0d using only sls exceptions Erik Frojdh 2019-03-14 17:09:44 +01:00
  • bad44f5bf4 moving SharedMemory into namespace sls Erik Frojdh 2019-03-14 16:51:38 +01:00
  • 40d2f66146 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-14 16:37:46 +01:00
  • 9639e480d9 new exceptions Erik Frojdh 2019-03-14 16:37:36 +01:00
  • 8520492e4b lock server bug: sending lockstatus converts to littleendian for eiger, lastclient should have other as datatype for eiger Dhanya Thattil 2019-03-14 14:14:14 +01:00
  • be33102164 checkonline, checkrecieveronline, retval has offline hostnames, online flag should be set no matter what the outcome Dhanya Thattil 2019-03-14 13:18:42 +01:00
  • 5235a87e93 Merge branch 'detshm' into refactor Dhanya Thattil 2019-03-14 12:42:08 +01:00
  • cb687d805e merge conflict Dhanya Thattil 2019-03-14 12:41:37 +01:00
  • 327d08a016 removing comments, added one check for nullptr, updated current threshold when getting module, removing unsued function from header file (writesettingsfile) Dhanya Thattil 2019-03-14 12:40:01 +01:00
  • 1960460e43 upgraded catch to 2.7 Erik Frojdh 2019-03-14 10:47:43 +01:00
  • e42e8f5bf6 option for sanitizers Erik Frojdh 2019-03-14 10:44:31 +01:00
  • c9422befff fixed loading trimbits Erik Frojdh 2019-03-14 10:21:18 +01:00
  • c56efdec8a Merge branch 'refactor' into detshm Dhanya Thattil 2019-03-14 09:11:27 +01:00
  • 14131f93f1 sanitizer compile fail Dhanya Thattil 2019-03-14 09:06:44 +01:00
  • d21ceb0e75 only construct shared memory from a type with exact size Erik Frojdh 2019-03-13 17:43:48 +01:00
  • 9a08c85b2a changed the shared memory of slsDetector Erik Frojdh 2019-03-13 17:38:27 +01:00
  • 85134443de initial Erik Frojdh 2019-03-13 16:29:29 +01:00
  • 7d3d2a8b31 ctb and moench server: pll vco clock changed from 400 to 800,ctb server: max adc clock from 40 to 65MHz Dhanya Thattil 2019-03-13 16:03:11 +01:00
  • 75ce111344 Merge branch 'shm' into refactor Dhanya Thattil 2019-03-13 15:21:12 +01:00
  • f8aa0e3d6d removed minor commented lines Dhanya Thattil 2019-03-13 15:19:32 +01:00
  • 2dcef909ca Merge branch 'refactor' into shm Dhanya Thattil 2019-03-13 14:22:26 +01:00
  • ec18db868f ctb, moench, jungfrau server: changing phase only changes one clock in one direction. ctb and moench phase shift connected to adc clk, instead of run clk Dhanya Thattil 2019-03-13 08:37:45 +01:00
  • 7e793539ca removed typedef for shared struct Erik Frojdh 2019-03-12 14:42:27 +01:00
  • d4e4fb8ffe move constructor deleted copy constructor Erik Frojdh 2019-03-12 14:37:06 +01:00
  • 48e4cec56f minor Erik Frojdh 2019-03-12 11:52:13 +01:00
  • 3b2c734efd adding tests Erik Frojdh 2019-03-12 11:43:28 +01:00
  • 507a22ac05 default args Erik Frojdh 2019-03-12 10:14:24 +01:00
  • a01d68a61f initial changes Erik Frojdh 2019-03-12 08:22:07 +01:00
  • 06a50520c1 gotthard server: bug fix get settings should not set default dacs Dhanya Thattil 2019-03-11 14:54:53 +01:00
  • 6765fd0dc8 ctb moench: bugfix for fifofull, should not read pattern, same as executing it Dhanya Thattil 2019-03-08 16:59:44 +01:00
  • ae5938799f Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-08 16:16:53 +01:00
  • 19b21dac88 Listener bug fix: switching to make_unique ptr side effects, the dummy socket still alive when destructor of listener called Dhanya Thattil 2019-03-08 16:16:40 +01:00
  • b8f071dcf6 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-08 15:13:23 +01:00
  • 182f65bc2f always compile commands Erik Frojdh 2019-03-08 15:13:11 +01:00
  • 1103f56256 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-08 09:14:39 +01:00
  • 0553755439 receiver bug fix: with refactor, the callbacks were getting reset upon initialization. fixed Dhanya Thattil 2019-03-08 09:14:29 +01:00
  • 65b8ab5b89 manual Gemma Tinti 2019-03-07 17:40:56 +01:00
  • 658438df3b ctb moench server update: (fw update): det id changed, status reg looks at anyfifofull instead of somefifofull, datapresent looks at corresponding analog/digital fifo empty, usleep after read strobe to sync different clock Dhanya Thattil 2019-03-07 17:36:35 +01:00
  • 999a2f4d15 Merge pull request #8 from slsdetectorgroup/use-unique-ptr Dhanya Thattil 2019-03-06 17:48:28 +01:00
  • 2532df37cc client: added basic fail handling where ommitted Dhanya Thattil 2019-03-06 17:37:13 +01:00
  • 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 Dhanya Thattil 2019-03-06 17:25:18 +01:00
  • 0765b330f1 ctb and moench, exptime connects to set pattern wait time with level 0 Dhanya Thattil 2019-03-06 15:17:54 +01:00
  • abc7a9bd2f moench has only analog readout Dhanya Thattil 2019-03-06 14:52:21 +01:00
  • 2676e8b43d receiver: readout flag bug fix, clent:send roi for ctb and moench Dhanya Thattil 2019-03-06 10:55:51 +01:00
  • 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 Dhanya Thattil 2019-03-06 10:25:16 +01:00
  • db232ad00d in Listener, remove raw pointers allocations, use unique_ptr instead. Add an overload of sls::make_unique for array types. Samuel Debionne 2019-03-06 08:55:19 +01:00
  • ceb515d517 Merge pull request #7 from slsdetectorgroup/fix-sprintf-warnings Dhanya Thattil 2019-03-05 16:26:18 +01:00
  • 0bb800cc8a manual Gemma Tinti 2019-03-05 15:48:20 +01:00
  • 04c8a2871d Fix sprintf warnings Samuel Debionne 2019-03-05 14:34:01 +01:00
  • 1803a5aecc Merge pull request #6 from slsdetectorgroup/fix-typos Dhanya Thattil 2019-03-05 14:19:19 +01:00
  • c40db94474 Fix typos Samuel Debionne 2019-03-05 10:43:20 +01:00
  • c56561bc9f updated ctb and moench, moench not tested Dhanya Thattil 2019-03-05 09:38:10 +01:00
  • fc766055d4 receiver bug fix release text updated Dhanya Thattil 2019-03-04 11:42:54 +01:00
  • 828b1479c7 receiver bug fix jungfrau as root Dhanya Thattil 2019-03-04 11:28:56 +01:00
  • 22ed52605c receiverbug fixe affecting jungfrau receivers as root Dhanya Thattil 2019-03-04 11:15:53 +01:00
  • a1a95ebb20 receiver bug fixaffecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t Dhanya Thattil 2019-03-04 11:02:10 +01:00
  • 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 Dhanya Thattil 2019-03-04 09:41:20 +01:00
  • 8939e23622 jungfrau feature:storagecell_delay added Dhanya Thattil 2019-03-01 15:26:38 +01:00
  • 93192c6e84 bugfix receiver: setImagesize only for ctb, moench Dhanya Thattil 2019-03-01 15:22:39 +01:00
  • d2d50a56df eiger server/client bug fix: readout flag of -1 Dhanya Thattil 2019-03-01 14:08:28 +01:00
  • 8c067437e6 ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions Dhanya Thattil 2019-03-01 12:28:11 +01:00
  • 35b1ad39f7 ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive Dhanya Thattil 2019-03-01 10:45:01 +01:00
  • bb81613900 ctb, moench: implemented led enable feature Dhanya Thattil 2019-03-01 09:00:04 +01:00
  • ebee9e308e ctb server: reserved not required, as the additional space in last packet can be calcualted Dhanya Thattil 2019-02-28 16:14:45 +01:00
  • 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 Dhanya Thattil 2019-02-28 16:07:47 +01:00
  • 96584ce397 ctb: enable tengiga in server and moved everything to list implementation Dhanya Thattil 2019-02-28 11:32:10 +01:00
  • 7f2197fc4f slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp Dhanya Thattil 2019-02-28 10:09:54 +01:00
  • 302d9f0633 ctb server: back to 10g def Dhanya Thattil 2019-02-28 08:51:07 +01:00
  • f80483de6e ctb server: (bug fixes, udp sending feature instead of tcp, better debugging prints, digital readout mode (fifoempty flag in status register is always up, so it is idle for this readout mode), pattern loop bugs, max_pattern_length redefined in server side, do not update period for ctb and moench in setreceiver Dhanya Thattil 2019-02-28 08:46:26 +01:00
  • 1fe473e830 client: for set port functions, moved forceupdate outside to automatically close previous function call Dhanya Thattil 2019-02-25 14:45:14 +01:00
  • 966896b942 moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr Dhanya Thattil 2019-02-25 12:57:44 +01:00
  • 4c7a9cd838 moench: set threshold energy and set roi sets jsonheader Dhanya Thattil 2019-02-25 12:34:35 +01:00
  • c218e391bb client: rx_tcpport fixed Dhanya Thattil 2019-02-25 11:43:10 +01:00
  • 43ad8b69b3 client: stop and control port get fixed Dhanya Thattil 2019-02-25 09:35:07 +01:00
  • 4c35dd9b5b Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-02-25 09:16:27 +01:00
  • 15fc55f914 client: must print detector or receiver returning error Dhanya Thattil 2019-02-25 09:16:20 +01:00
  • eecfcae312 ctbserver: dac -1 check limit error Dhanya Thattil 2019-02-25 08:58:35 +01:00
  • c723b29f9b address and undefined behaviour sanitizers on debug Erik Frojdh 2019-02-22 19:55:56 +01:00