Commit Graph

  • 09b546352e removed travis and clang Dhanya Thattil 2019-04-08 12:00:15 +02:00
  • 1481a5e941 removed code (incl symbolic links) Dhanya Thattil 2019-04-08 11:55:25 +02:00
  • 58b11fbd10 removed code (incl symbolic links) Dhanya Thattil 2019-04-08 11:54:37 +02:00
  • 683712d1ba recompiled docs with navigation Dhanya Thattil 2019-04-08 11:51:31 +02:00
  • e998226bce added releases Dhanya Thattil 2019-04-08 11:29:15 +02:00
  • fad308754b turned off -Wshadow for gcc Erik Frojdh 2019-04-08 09:28:40 +02:00
  • 33f726ff7e shadowing variables Erik Frojdh 2019-04-05 17:01:29 +02:00
  • cbacf471d6 tests and std::sort Erik Frojdh 2019-04-05 16:24:28 +02:00
  • f11db00aef removed old typedef Erik Frojdh 2019-04-05 10:14:41 +02:00
  • 951d4d6091 new try Erik Frojdh 2019-04-04 18:26:14 +02:00
  • 025b3a8d4c cleaning Erik Frojdh 2019-04-04 18:04:24 +02:00
  • acf32a5524 removed old error handling Erik Frojdh 2019-04-04 17:42:55 +02:00
  • 55ba2afc05 better test + conda Erik Frojdh 2019-04-04 17:39:31 +02:00
  • 498569a42a update for trimEn Erik Frojdh 2019-04-04 12:31:46 +02:00
  • d6360ca197 removed warning Erik Frojdh 2019-04-04 12:21:48 +02:00
  • 05720c12ac Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-04-04 12:19:39 +02:00
  • 85516e42c0 trimEn now takes vector Erik Frojdh 2019-04-04 12:19:30 +02:00
  • b35a8f0650 ctb server updated Dhanya Thattil 2019-04-04 11:51:37 +02:00
  • c284b24397 operator<< test Erik Frojdh 2019-04-03 20:05:29 +02:00
  • 7256a1e422 added test Erik Frojdh 2019-04-03 19:59:37 +02:00
  • 69a11f8950 cleaning up Erik Frojdh 2019-04-03 18:41:21 +02:00
  • 0270e18882 new tests Erik Frojdh 2019-04-03 18:11:48 +02:00
  • 697c020a49 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-04-03 16:17:16 +02:00
  • 90b257a74d warnings Erik Frojdh 2019-04-03 16:17:09 +02:00
  • bb025adc09 cmake3 in cmk.sh and removed warnings Dhanya Thattil 2019-04-03 16:03:19 +02:00
  • 1558ca2bb5 version check of compiler Erik Frojdh 2019-04-03 15:21:11 +02:00
  • a7ab8aa9e6 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-04-03 14:48:04 +02:00
  • 3b4d36c3d4 bumped cmake to 3.5 Erik Frojdh 2019-04-03 14:47:58 +02:00
  • 59a0f5fac9 Merge branch 'address' into refactor, including minor change in formal argument name Dhanya Thattil 2019-04-03 14:11:32 +02:00
  • bbfb5df30d conflict resolved, changed to using hex() instead of str() in configuremac Dhanya Thattil 2019-04-03 14:11:01 +02:00
  • 09f1a8956e ignore .vscode Dhanya Thattil 2019-04-03 10:22:00 +02:00
  • d6c0f7be05 constexpr Erik Frojdh 2019-04-02 17:59:59 +02:00
  • 11d7ebd298 Merge branch 'program2' into refactor Dhanya Thattil 2019-04-02 17:29:56 +02:00
  • d9ea8e6747 Merge branch 'refactor' into program2 Dhanya Thattil 2019-04-02 17:29:00 +02:00
  • 5131245f0a all servers except eiger: easier to update firmware and software using update or copydetectorserver, rebootcontroller, and programfpga Dhanya Thattil 2019-04-02 17:27:01 +02:00
  • 6fc388bf78 reset to info Erik Frojdh 2019-04-02 17:15:21 +02:00
  • 24f28f14f4 clean up Erik Frojdh 2019-04-02 17:00:00 +02:00
  • 45fd35b243 Merge branch 'refactor' into address Erik Frojdh 2019-04-02 15:44:57 +02:00
  • 11a452545c added parallel call for void return Erik Frojdh 2019-04-02 15:44:19 +02:00
  • b198b50377 class for Ip and Mac Erik Frojdh 2019-04-02 15:24:25 +02:00
  • df2d67d90d classes for ip and mac addr Erik Frojdh 2019-04-02 11:56:33 +02:00
  • 73ad238028 removed missed cout Erik Frojdh 2019-04-01 13:15:38 +02:00
  • 959d9aa5d1 cleaning and new functions Erik Frojdh 2019-04-01 10:36:47 +02:00
  • 45b837b42a program fpga printouts for errors Dhanya Thattil 2019-04-01 10:22:50 +02:00
  • 969551ae37 program fpga made parallel Dhanya Thattil 2019-03-29 17:59:06 +01:00
  • 05709e2f47 finished Erik Frojdh 2019-03-29 16:29:00 +01:00
  • 1fce125d47 Merge branch 'refactor' into address Erik Frojdh 2019-03-29 10:18:15 +01:00
  • d134e54810 ip Erik Frojdh 2019-03-29 10:18:10 +01:00
  • ed9dc3b386 fixed bug not clearing socket descriptor Erik Frojdh 2019-03-29 10:14:07 +01:00
  • 990848554c midpoint Erik Frojdh 2019-03-28 16:16:41 +01:00
  • 78fcb7eb98 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-28 15:48:34 +01:00
  • 94c4e4c352 new constuctor Erik Frojdh 2019-03-28 15:48:26 +01:00
  • 3e23a38fc8 moench server: sync increases when other clocks do Dhanya Thattil 2019-03-28 15:24:47 +01:00
  • 37b80bcc0d ctb server: pll reset to keep the phase after setting clock Dhanya Thattil 2019-03-28 15:22:13 +01:00
  • fc0306564c ctb server: sync is min clock and must go higher when the others do Dhanya Thattil 2019-03-28 14:22:40 +01:00
  • 52f74142b1 Moench working version moenchv0.1 Anna Bergamaschi 2019-03-28 13:29:12 +01:00
  • c38bebd615 jungfrau server: added deg and maxadcphaseshift, ctb & moench server: set adc phase like jungfrau that positive shift is positive, moved conversion between shift to degrees to the common function. receiver: removed unused variables Dhanya Thattil 2019-03-28 09:35:53 +01:00
  • 5a4122ae7c ctb & moench server: reset phase when changing clock Dhanya Thattil 2019-03-27 15:48:55 +01:00
  • 2ccd03a3b0 added eiger binary Dhanya Thattil 2019-03-27 12:26:10 +01:00
  • c7c52c63cd ctb & moench: phase fix for absolute within limits, option to set as degrees and get max phase shift, bug fix for eiger with implementation of 2 udp interface Dhanya Thattil 2019-03-27 12:25:38 +01:00
  • c7ad548e4c conflict git fix Dhanya Thattil 2019-03-26 15:01:58 +01:00
  • 7cd5bc8b2d jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done Dhanya Thattil 2019-03-26 15:00:19 +01:00
  • 193f2b9011 Split slsReceiver into slsListener and slsReceiver split-listener Samuel Debionne 2019-03-25 17:52:30 +01:00
  • 8c2ee57591 ctb/moench server: clock fix, max shifts per clock is calculated everytime Dhanya Thattil 2019-03-25 14:41:15 +01:00
  • c15e72510c new commands Gemma Tinti 2019-03-22 17:41:14 +01:00
  • ac1511c3b0 rmem max Gemma Tinti 2019-03-22 16:35:42 +01:00
  • cd5aea895b jungfrau server: changes for new firmware, aligning adc deserializer. ctb serveR: removed unnecessary pll reset and polling mode for pll Dhanya Thattil 2019-03-22 15:09:29 +01:00
  • 5bf37a4f0d changes to jungfrau server Dhanya Thattil 2019-03-22 11:27:15 +01:00
  • 6cb043b2d9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-21 16:30:25 +01:00
  • fa34ad435b server: pll fix Dhanya Thattil 2019-03-21 16:30:18 +01:00
  • c5178bc4de manual Gemma Tinti 2019-03-21 16:29:36 +01:00
  • c89fad45a9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Gemma Tinti 2019-03-21 15:09:19 +01:00
  • 6c4fad01d4 manual Gemma Tinti 2019-03-21 15:09:10 +01:00
  • eb3dff3a6c eiger server Dhanya Thattil 2019-03-21 14:15:52 +01:00
  • d9503bebf9 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-21 14:13:15 +01:00
  • b99606211b ctb server: altera pll odd division fix Dhanya Thattil 2019-03-21 14:13:07 +01:00
  • 039e658773 manual Gemma Tinti 2019-03-21 11:46:38 +01:00
  • 92ca22fc09 manual Gemma Tinti 2019-03-20 18:34:44 +01:00
  • d4ac6fe160 gitinfo as public Erik Frojdh 2019-03-20 17:48:01 +01:00
  • 8cb0f3a29c Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-20 17:41:57 +01:00
  • c16f9b8c30 specify detector or receiver in error Erik Frojdh 2019-03-20 17:41:46 +01:00
  • 050854de36 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-20 17:34:37 +01:00
  • cb80cf5f09 receiver missing packets made to have signed for getting more packets than expected Dhanya Thattil 2019-03-20 17:34:29 +01:00
  • 83e43b1bcf format ColumnLimit changed to 100 Erik Frojdh 2019-03-20 17:31:19 +01:00
  • 2a01688683 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Erik Frojdh 2019-03-20 17:07:29 +01:00
  • 4b2c6af4f5 reorganizing of slsDetectorSoftware Erik Frojdh 2019-03-20 17:07:02 +01:00
  • 3ff01bf609 removed minor warnings for unused ret Dhanya Thattil 2019-03-20 17:07:02 +01:00
  • 03402d0e9e Error handling with exceptions in slsDetector and multiSlsDetector (#14) Erik Fröjdh 2019-03-20 16:23:41 +01:00
  • 9d489dc962 servers, gitinfo script updated; ctb/moench server: delay uses sync clock, Dhanya Thattil 2019-03-20 14:39:24 +01:00
  • 44f0dfc3c0 ctbserver: updated firmware version and api Dhanya Thattil 2019-03-19 18:58:42 +01:00
  • 685fcc31b6 setonline, setreceiveronline was never really setting offline flag, so was never really updating detector first time Dhanya Thattil 2019-03-19 18:42:45 +01:00
  • ce6289afda Merge pull request #13 from slsdetectorgroup/except Dhanya Thattil 2019-03-19 18:01:09 +01:00
  • 4e56107015 new socket overload Erik Frojdh 2019-03-19 17:49:20 +01:00
  • 430e0e3fb5 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor Dhanya Thattil 2019-03-19 17:32:17 +01:00
  • d8c0fb522a ctb/ moench server fix: usleep of 10 for reading from fifo removed Dhanya Thattil 2019-03-19 17:32:07 +01:00
  • ce25c06b41 Merge pull request #12 from slsdetectorgroup/except Dhanya Thattil 2019-03-19 16:58:43 +01:00
  • 6759b2eeb8 refactor getID Erik Frojdh 2019-03-19 16:27:07 +01:00
  • 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