Commit Graph

  • 582a3c6878 Update README.md Dhanya Thattil 2020-03-03 17:55:16 +01:00
  • 134611c638 gotthard2: switching between period and burst period (not delay and burst period), internal frequency depending on timing source (for all except actualtime and measurement time) Dhanya Thattil 2020-03-03 17:49:28 +01:00
  • 3431752649 WIP Erik Frojdh 2020-03-03 17:01:45 +01:00
  • 06bd6dfd53 Merge branch 'developer' into moenchUpdated Dhanya Thattil 2020-03-03 16:37:31 +01:00
  • fca7d51cb4 moench: removed hardcoding ny in call back for gui Dhanya Thattil 2020-03-03 16:30:28 +01:00
  • 85aca0ffad moench: insignficant dac naming fix Dhanya Thattil 2020-03-03 16:21:45 +01:00
  • fac95516cf moench: insignficant naming fix Dhanya Thattil 2020-03-03 16:07:37 +01:00
  • 8abc32e7f1 moench: default pattern file in server, settings, tests Dhanya Thattil 2020-03-03 16:00:01 +01:00
  • 1efacc9475 cleaning up headers Erik Frojdh 2020-03-03 11:33:28 +01:00
  • b2d88b441a removed comments Erik Frojdh 2020-03-03 11:17:26 +01:00
  • 75e083ae46 find tests and commands Erik Frojdh 2020-03-03 11:04:05 +01:00
  • 9699e064d3 WIP Erik Frojdh 2020-03-03 10:12:26 +01:00
  • c6c3a68520 WIP Erik Frojdh 2020-03-03 10:08:20 +01:00
  • 5e92c5b67e WIP Erik Frojdh 2020-03-03 09:38:05 +01:00
  • 0947cefe08 WIP Erik Frojdh 2020-03-03 09:29:25 +01:00
  • 6bbcf6173d moench: first version Dhanya Thattil 2020-03-02 18:34:10 +01:00
  • ecc3b36204 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Anna Bergamaschi 2020-03-02 14:50:48 +01:00
  • 3e88beb8a5 O3 as default and option for mtune 2020.03.02.dev0 Erik Frojdh 2020-03-02 13:50:16 +01:00
  • cce659d98c deploy only on tags Erik Frojdh 2020-03-02 13:12:46 +01:00
  • 95d56ad545 lookup Erik Frojdh 2020-03-02 11:57:35 +01:00
  • 84cd4d8436 generated python funcs Erik Frojdh 2020-03-02 11:34:30 +01:00
  • d7319968a7 gui: always show gain plots, include intensity ticks(2d), channels number and gain ticks(1d) Dhanya Thattil 2020-02-28 17:28:44 +01:00
  • a769f7515c gotthard2 bug fix: fixed pll freq was incorrect when 0 in front Dhanya Thattil 2020-02-28 16:03:15 +01:00
  • 11e7737a2f gotthard2: timingsource and currentsource features, (timing source external yet to be implemented in fpga to test (#80) Dhanya Thattil 2020-02-28 12:45:02 +01:00
  • 913df8ecae Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Anna Bergamaschi 2020-02-28 12:26:48 +01:00
  • c10e04c4eb explicitly setting rx zmq datastream int the ctb Gui Anna Bergamaschi 2020-02-28 12:25:48 +01:00
  • 2e2e91b219 ctb adc: get in uV and print in client in mV to get decimals Dhanya Thattil 2020-02-27 15:43:42 +01:00
  • 10ba16a9dc updating versions Dhanya Thattil 2020-02-27 14:26:18 +01:00
  • 8c8032dc69 ctb bug fix: slow adcs incorrect mv read out, needed clk down and usleep before reading Dhanya Thattil 2020-02-27 09:16:22 +01:00
  • 90acd51389 server api changes: for mythen3, jungfrau, eiger as well Dhanya Thattil 2020-02-26 17:52:35 +01:00
  • f38ed8706f removing gui warnings from qwt section Dhanya Thattil 2020-02-26 16:56:41 +01:00
  • 300b0c8105 Merge pull request #79 from slsdetectorgroup/bursts Dhanya Thattil 2020-02-26 11:29:05 +01:00
  • d9cfc59df6 code refactor in slsdet: prevval for setnumtriggers Dhanya Thattil 2020-02-26 11:27:24 +01:00
  • 80304c2eaf multi progress calculated in one function rather getting all of them from shm Dhanya Thattil 2020-02-26 11:17:49 +01:00
  • fe3a7b0faf gotthard2: removed unnecessary casting Dhanya Thattil 2020-02-26 11:02:28 +01:00
  • e66d42a43d old form fix Dhanya Thattil 2020-02-26 10:28:45 +01:00
  • ec76590f28 Merge branch 'developer' into bursts Dhanya Thattil 2020-02-26 09:29:18 +01:00
  • 2fcb2bff75 dac tests Dhanya Thattil 2020-02-26 09:29:06 +01:00
  • 2310b5e55d Merge branch 'developer' into bursts Dhanya Thattil 2020-02-25 20:03:18 +01:00
  • dca2d098a9 gui: hide gain legend Dhanya Thattil 2020-02-25 20:03:09 +01:00
  • 462bc2e70c Merge branch 'developer' into bursts Dhanya Thattil 2020-02-25 18:22:58 +01:00
  • 2da3d179ee gotthard2 gain plot in gui Dhanya Thattil 2020-02-25 18:22:18 +01:00
  • 5e6a3b7e3d merge resolved Dhanya Thattil 2020-02-25 15:48:41 +01:00
  • 6a0a931e3e gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes Dhanya Thattil 2020-02-25 15:45:40 +01:00
  • e61d1a1651 zmqsocket bug fix: memcpy source and destination overlap Dhanya Thattil 2020-02-25 10:28:23 +01:00
  • 2bec476b4f fixed failed tests Erik Frojdh 2020-02-25 09:26:57 +01:00
  • f902bb06ad gui bug fix: trigger timing mode was disconnected Dhanya Thattil 2020-02-24 17:40:00 +01:00
  • c03bc4a6b4 gotthard2: copy #frames and period when switching between continuous and burst mode Dhanya Thattil 2020-02-24 17:20:51 +01:00
  • 6118567959 gotthard2 gui bug fix: gainbit not masked out Dhanya Thattil 2020-02-24 17:04:37 +01:00
  • 02b367ffe8 mythen3 and gotthard2: updated clocks Dhanya Thattil 2020-02-24 16:50:47 +01:00
  • 87d48fd943 bugfix rxr numpacketscaught if stopped Dhanya Thattil 2020-02-24 15:02:01 +01:00
  • 21a1b872bf bugfix:mythen3 date change Dhanya Thattil 2020-02-24 11:00:16 +01:00
  • 3a74ca8fc2 bugfix: mythen3 git date incorrect Dhanya Thattil 2020-02-24 10:53:06 +01:00
  • f4b922165f bugfix from earlier commit: dr in readfromreceiver commented out Dhanya Thattil 2020-02-24 10:36:52 +01:00
  • 247d40f5a6 added Zmq image structures Anna Bergamaschi 2020-02-21 11:56:44 +01:00
  • 8953235268 reverted to UdpRxSocket.h version of revision fc27cfd (with gcc problem fixed) Anna Bergamaschi 2020-02-21 11:07:24 +01:00
  • 63f5b52a6e jctbDetectorServer compilation flags match only for moench Anna Bergamaschi 2020-02-19 12:26:35 +01:00
  • 481496ea53 update manual Gemma Tinti 2020-02-18 21:17:39 +01:00
  • 3b84684415 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Gemma Tinti 2020-02-18 18:26:19 +01:00
  • d0da5d3fcd update manual Gemma Tinti 2020-02-18 18:26:11 +01:00
  • 52a89cbcc5 fix for older gcc Erik Frojdh 2020-02-18 17:54:28 +01:00
  • d8c9748850 update manual to 4.1.1 Gemma Tinti 2020-02-18 15:49:00 +01:00
  • f42e87e37f format Erik Frojdh 2020-02-18 15:03:02 +01:00
  • 53a3656d5e removed copy, fixed receive to external buffer Erik Frojdh 2020-02-18 15:02:40 +01:00
  • 53ba22dbc4 fixed for current rectangular sensor geometry Anna Bergamaschi 2020-02-18 11:37:10 +01:00
  • 124e2a7714 now rectangular interpolation possible Anna Bergamaschi 2020-02-18 11:36:31 +01:00
  • fcd4821b8d fixed compilation problem with rectangular pixels for zmq process Anna Bergamaschi 2020-02-18 11:23:54 +01:00
  • fc27cfd663 merging problem Anna Bergamaschi 2020-02-18 10:55:41 +01:00
  • 6b0bf02a85 Some fixes to use moench Anna Bergamaschi 2020-02-18 10:45:53 +01:00
  • f1bce15a57 replaced udp socket Erik Frojdh 2020-02-17 17:43:14 +01:00
  • 3ea9b86bf5 date fix Erik Frojdh 2020-02-13 14:50:23 +01:00
  • 4cce0aee62 Fixed ctbGui to work also with moench03 Anna Bergamaschi 2020-02-06 14:28:20 +01:00
  • dfb1b9ad69 Revert "gotthard2: burst mode check" Dhanya Thattil 2020-02-04 15:29:43 +01:00
  • 4d6996bd55 gotthard2: burst mode check Dhanya Thattil 2020-02-04 15:28:24 +01:00
  • 0ac28c0208 gotthard2: burst mode check for #frames Dhanya Thattil 2020-02-04 15:27:18 +01:00
  • 37c3048c2a gotthard2: bug fix from previosu commit Dhanya Thattil 2020-02-04 12:32:37 +01:00
  • d3dc9a7690 gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging Dhanya Thattil 2020-02-04 12:23:58 +01:00
  • c4559fadb3 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2020-02-04 12:00:15 +01:00
  • 806a2736c1 gotthard2: longer wait for startup, period 0 Dhanya Thattil 2020-02-04 12:00:07 +01:00
  • 94fcf52e64 Merge pull request #76 from slsdetectorgroup/exec Dhanya Thattil 2020-02-04 10:59:48 +01:00
  • 64214f22f9 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2020-02-04 10:50:14 +01:00
  • 36bd91daa3 gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms Dhanya Thattil 2020-02-04 10:50:01 +01:00
  • 40bfca588b minor from clang-tidy Erik Frojdh 2020-02-04 10:36:03 +01:00
  • b9446f40d1 fmt and minor Erik Frojdh 2020-02-04 10:11:27 +01:00
  • ec66079f65 renamed ServerInterface Erik Frojdh 2020-02-04 08:57:35 +01:00
  • e6340456f6 minor Erik Frojdh 2020-02-04 08:47:22 +01:00
  • f42d591845 sizeof Erik Frojdh 2020-02-03 16:51:57 +01:00
  • e9029ba8f2 removed unused functions Erik Frojdh 2020-02-03 16:44:14 +01:00
  • 121747352d buffer Erik Frojdh 2020-02-03 16:35:30 +01:00
  • 4cfea36b93 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-02-03 16:00:32 +01:00
  • a829e69313 minor Erik Frojdh 2020-02-03 16:00:24 +01:00
  • 42124ca97c eiger rxr: setting exptime now also sets subperiod in rxr master file Dhanya Thattil 2020-02-03 15:54:41 +01:00
  • 972f21258a renamed multiSlsDetector Erik Frojdh 2020-02-03 14:57:37 +01:00
  • 6bb1188c37 renamed exes Erik Frojdh 2020-02-03 14:43:40 +01:00
  • a57c677105 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-02-03 14:38:31 +01:00
  • 254e8f85d8 moved non public headers Erik Frojdh 2020-02-03 14:38:24 +01:00
  • 56484daf18 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Dhanya Thattil 2020-02-03 12:25:40 +01:00
  • 6cc13f9dc1 naming Erik Frojdh 2020-02-03 12:05:52 +01:00
  • 93ab8d05d7 eiger: change speed to full speed for dr of 4, 8, 16 Dhanya Thattil 2020-02-03 11:37:43 +01:00
  • 88c65c506f Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer Erik Frojdh 2020-02-03 11:34:14 +01:00