Commit Graph

  • 074636a7d6 minor cleaning Erik Frojdh 2020-02-03 11:34:07 +01:00
  • e432e6f90d 4.1.1 changes: software trigger via stop server, disentangling rxr streamin from register call back Dhanya Thattil 2020-02-03 11:25:19 +01:00
  • a3c686d271 renamed Erik Frojdh 2020-02-03 11:04:49 +01:00
  • 9f79f132b7 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-02-03 10:34:51 +01:00
  • 4a7424d749 renamed circularFifo Erik Frojdh 2020-02-03 10:34:43 +01:00
  • e4f2072067 Merge pull request #75 from slsdetectorgroup/nohardexit Dhanya Thattil 2020-02-03 09:13:38 +01:00
  • 8bae1059db Merge branch 'developer' into nohardexit Dhanya Thattil 2020-01-31 17:36:22 +01:00
  • 4b39ca6e5f gotthard2 gui Dhanya Thattil 2020-01-31 17:35:56 +01:00
  • f0cccf9de8 initialchecks can be bypassed (version compatibility and oher tests at server start up) Dhanya Thattil 2020-01-31 16:46:33 +01:00
  • 89c774dbf7 nios programming: check file size first Dhanya Thattil 2020-01-31 11:24:48 +01:00
  • 5ca3a1b685 gotthard2 and mythen3: programming fpga, reboot; jungfrau, ctb: modified programming (#74) Dhanya Thattil 2020-01-31 04:52:35 +01:00
  • 7d7302a90c mnior Dhanya Thattil 2020-01-29 14:38:19 +01:00
  • ac3230c656 gotthard2 testing Dhanya Thattil 2020-01-29 14:34:23 +01:00
  • 5761642da0 Merge branch 'developer' into gotthard2testing Dhanya Thattil 2020-01-29 11:37:59 +01:00
  • 70ffdf9709 fixes for IpAddr and MacAddr in Gui Dhanya Thattil 2020-01-28 15:00:05 +01:00
  • af2f2708ad rxr: remove file buffering Dhanya Thattil 2020-01-28 13:55:44 +01:00
  • c42b4b8c0e incorrect printout to MB Dhanya Thattil 2020-01-28 10:43:06 +01:00
  • d9b88ea7d2 performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning Dhanya Thattil 2020-01-27 20:10:49 +01:00
  • 9f22c80081 Revert "performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning" Dhanya Thattil 2020-01-27 19:59:18 +01:00
  • ab6f448e1f performance optimization in fifodepth, ensure memory is allocated by writing something in the beginning Dhanya Thattil 2020-01-27 18:34:10 +01:00
  • 53e5a097ab rxr: semaphore instead of keeprunning variable at startup Dhanya Thattil 2020-01-27 18:03:03 +01:00
  • e527aad6ab bugfix: high fifo depth more than 32 bit Dhanya Thattil 2020-01-27 15:25:41 +01:00
  • a0208778c1 bugfix: high fifo depth more than 32 bit Dhanya Thattil 2020-01-27 15:21:19 +01:00
  • 69897d4c78 WIP testing Dhanya Thattil 2020-01-27 13:56:44 +01:00
  • 940c8f05cd interpolation without quads Anna Bergamaschi 2020-01-24 15:32:48 +01:00
  • 41035808e9 merge from mythen3 and gotthard2 Dhanya Thattil 2020-01-24 15:08:58 +01:00
  • 2314fdabd1 merge from mythen3, and jungfrau fix Dhanya Thattil 2020-01-23 16:44:01 +01:00
  • abe63acc79 jungfrau fix: wait for acquisition to be done before sending stop receiver Dhanya Thattil 2020-01-23 16:41:09 +01:00
  • 688e4e84d9 Merge pull request #73 from slsdetectorgroup/mythen3 Dhanya Thattil 2020-01-23 12:35:43 +01:00
  • 0210b7358c autogen python bindings Erik Frojdh 2020-01-23 12:13:23 +01:00
  • dd84337ef3 autogen enums Erik Frojdh 2020-01-23 11:45:33 +01:00
  • a9e375ed34 gotthard2: bursttype to burstmode Dhanya Thattil 2020-01-23 11:03:14 +01:00
  • f881133795 get/set timing, generate data for gotthard2, vref_rstore instead of restore for gotthard2 Dhanya Thattil 2020-01-22 18:18:56 +01:00
  • 8cbf3c62a9 merge from developer Dhanya Thattil 2020-01-22 17:30:13 +01:00
  • ffc09ed19c Gotthard2 (#72) Dhanya Thattil 2020-01-22 14:03:59 +01:00
  • 3ea2520615 PR minor changes Dhanya Thattil 2020-01-22 13:55:10 +01:00
  • 1dea112742 adding gotthard2 tests Dhanya Thattil 2020-01-22 11:35:29 +01:00
  • d8fccdcefa Merge branch 'developer' into gotthard2 Dhanya Thattil 2020-01-21 18:18:57 +01:00
  • 981b13494c mythen3: virtual server, connected timing mode, row and col in header, included pattern bit and mask Dhanya Thattil 2020-01-21 18:16:27 +01:00
  • 7131f77a3a eiger: vcal set to 0 Dhanya Thattil 2020-01-21 16:10:15 +01:00
  • f08d430d16 eiger: vcal set to 0 Dhanya Thattil 2020-01-21 16:09:39 +01:00
  • 9c89f6a63d Merge branch 'developer' into gotthard2 Dhanya Thattil 2020-01-21 16:05:04 +01:00
  • e746256653 gotthard2: gain updated Dhanya Thattil 2020-01-21 16:01:38 +01:00
  • 2e78484b61 gotthard2 virtual server sends data Dhanya Thattil 2020-01-21 14:50:31 +01:00
  • 1908a82627 ctb Erik Frojdh 2020-01-21 10:44:43 +01:00
  • bdf3a010c3 updated client doc for gotthard2: the timers that are used in continuous mode only Dhanya Thattil 2020-01-21 10:26:11 +01:00
  • 6bd0256172 pattern stuff Erik Frojdh 2020-01-21 10:22:26 +01:00
  • 5667353f47 WIP Erik Frojdh 2020-01-21 09:07:27 +01:00
  • c4137dc309 gotthard2: works Dhanya Thattil 2020-01-20 17:03:11 +01:00
  • 4b7edf2e62 ctb Erik Frojdh 2020-01-20 16:46:38 +01:00
  • 0194d7ba1c ctb Erik Frojdh 2020-01-20 16:37:18 +01:00
  • 23dffa47df gotthard2 bug fix: no module attached Dhanya Thattil 2020-01-20 14:42:06 +01:00
  • 5c35a33e02 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-01-20 14:27:30 +01:00
  • a0c222b3c6 constructor Erik Frojdh 2020-01-20 14:23:28 +01:00
  • 65d95480bd mythen3 bug fix: rxr needs to update dr Dhanya Thattil 2020-01-20 13:50:50 +01:00
  • 6cfd0f8962 gotthard2: first edit Dhanya Thattil 2020-01-20 12:13:23 +01:00
  • 6e47f0b7f7 merge resolved Dhanya Thattil 2020-01-20 11:36:35 +01:00
  • 3c891495db mythen3: bug fix detector type Dhanya Thattil 2020-01-20 11:32:02 +01:00
  • 66b837eb59 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-01-16 16:57:12 +01:00
  • 6170c42618 explicit also in MacAddr Erik Frojdh 2020-01-16 16:57:04 +01:00
  • 95030bc55f Merge branch 'developer' into gotthard2 Dhanya Thattil 2020-01-16 16:52:08 +01:00
  • 69dd5f3b5e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2020-01-16 16:37:44 +01:00
  • c1fac7cdb7 fixed conversion for IpAddr Erik Frojdh 2020-01-16 16:31:11 +01:00
  • de57146e1b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2020-01-16 16:14:11 +01:00
  • fb75986c55 mythne3: counters fixed Dhanya Thattil 2020-01-16 16:13:40 +01:00
  • e8bdf5a505 gotthard2: updated register map; powerchip checking detector type; internal and external period, frames, exptime; set/get delay, get actualtime, measurement, framesfromstart enabled; which detector comment updated in cmdproxy, detector and slsdetector Dhanya Thattil 2020-01-16 15:33:35 +01:00
  • f3598c1f39 nullptr Erik Frojdh 2020-01-16 14:17:57 +01:00
  • 9ac08ad5c9 clang-tidy header include order Erik Frojdh 2020-01-16 14:00:43 +01:00
  • bcb4942793 cleaning Erik Frojdh 2020-01-16 12:26:22 +01:00
  • 4b69ac5cfc const string& in exceptions constructor Erik Frojdh 2020-01-16 11:44:01 +01:00
  • 7a00732fa8 various minor things from clang-tidy Erik Frojdh 2020-01-16 11:39:35 +01:00
  • 30a4a1740f added Mythen3 Erik Frojdh 2020-01-15 17:56:08 +01:00
  • e4ab4547db Interpolation in both directions for rect pixels works, saving of the rectangular image is done by rebinning Anna Bergamaschi 2020-01-15 17:27:46 +01:00
  • 39ec29c0e6 added counters to python Erik Frojdh 2020-01-15 17:26:07 +01:00
  • b6d9015ed0 rearranging Dhanya Thattil 2020-01-15 15:08:01 +01:00
  • 209a2f082b added release doc Dhanya Thattil 2020-01-15 11:45:42 +01:00
  • 9649982932 sw trigger with acquire and parameter file understands submodules Gemma Tinti 2020-01-15 11:22:40 +01:00
  • de53747ddd Counters (#71) Dhanya Thattil 2020-01-14 17:40:46 +01:00
  • eca2836703 Merge branch '4.1.1' of github.com:slsdetectorgroup/slsDetectorPackage into 4.1.1 Erik Frojdh 2020-01-14 16:25:57 +01:00
  • d14c9600bb conda version Erik Frojdh 2020-01-14 16:24:10 +01:00
  • 42971c94b7 updated versioning Dhanya Thattil 2020-01-14 16:16:45 +01:00
  • b0fd4f4c44 updated release doc Dhanya Thattil 2020-01-14 16:11:24 +01:00
  • 06473cfcb2 bug fix: software trigger using control connect Dhanya Thattil 2020-01-14 13:59:08 +01:00
  • 70c54f4315 added jungfrau again Erik Frojdh 2020-01-13 18:26:24 +01:00
  • a709384fbb renamed python detector Erik Frojdh 2020-01-13 16:33:02 +01:00
  • a1abd7587c Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-01-13 16:13:52 +01:00
  • 8c8d213b56 python funcs Erik Frojdh 2020-01-13 16:13:47 +01:00
  • 7b31fbc002 eiger virtual server bug fix: increasing subdeadtime Dhanya Thattil 2020-01-13 14:18:43 +01:00
  • db9aa7589a tests fix Dhanya Thattil 2020-01-13 12:07:30 +01:00
  • 28f8a76dcc updated binaries Dhanya Thattil 2020-01-10 09:05:26 +01:00
  • dac5ecd123 dbit Erik Frojdh 2020-01-08 16:44:42 +01:00
  • 71b0ed271e CTB Erik Frojdh 2020-01-08 15:33:28 +01:00
  • c223f00511 Eiger Erik Frojdh 2020-01-08 14:55:16 +01:00
  • 639ed52d65 pybind 2.4 Erik Frojdh 2020-01-07 16:30:59 +01:00
  • 6943763e3d Updated pybind11 to 2.4.3 Erik Frojdh 2020-01-07 16:30:12 +01:00
  • 4b3b518401 asamples dsamples Erik Frojdh 2020-01-07 16:18:36 +01:00
  • 7379b1e2ef added python3.8 Erik Frojdh 2020-01-07 15:48:38 +01:00
  • ed2a69744b Auto generating Python bindings (#70) Erik Fröjdh 2020-01-07 15:47:38 +01:00
  • 6f2aad3836 updated temporary versioning Dhanya Thattil 2020-01-06 19:01:44 +01:00
  • 38aad40fef read/write of config/parameter file rewritten so that parameter file can take in slsdetector level commands Dhanya Thattil 2020-01-06 18:16:41 +01:00