Commit Graph

  • bb9208f8ee some changes to the group Dhanya Maliakal 2016-12-19 16:58:08 +01:00
  • 3eea80a121 compiles after merging Anna Bergamaschi 2016-12-19 13:50:25 +01:00
  • 68b13a0ecd merged to developer Anna Bergamaschi 2016-12-19 12:26:53 +01:00
  • 12cd3d07a2 some changes for jctb Anna Bergamaschi 2016-12-19 12:05:59 +01:00
  • ebf44704b2 merged error defs Dhanya Maliakal 2016-12-19 11:39:14 +01:00
  • bd1601c2eb fixwed the printing of errors but not error message Dhanya Maliakal 2016-12-19 11:37:14 +01:00
  • d555bc6e75 fixwed the printing of errors but not error message Dhanya Maliakal 2016-12-19 11:33:16 +01:00
  • b5f7dc29af Merge branch '2.2-rc' into hdf5 Dhanya Maliakal 2016-12-16 15:00:22 +01:00
  • 2d1c91c0e0 bug in sem for new scans Dhanya Maliakal 2016-12-16 14:59:55 +01:00
  • b403aa20a6 Merge branch '2.2-rc' into hdf5 Dhanya Maliakal 2016-12-16 14:51:08 +01:00
  • 64843c1c76 made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread Dhanya Maliakal 2016-12-16 14:46:54 +01:00
  • f464be38a3 xyrangechanged not checked for histogram Dhanya Maliakal 2016-12-16 14:46:02 +01:00
  • 33092b6d85 Merge branch '9m_rest' into developer Dhanya Maliakal 2016-12-15 14:34:05 +01:00
  • aaab8d697a Merge branch '9m_rest' into hdf5 Dhanya Maliakal 2016-12-15 14:33:38 +01:00
  • ed3129029d Merge branch '9m_rest' into 2.2-rc Dhanya Maliakal 2016-12-15 14:32:34 +01:00
  • 8b8d8449f2 Merge branch 'developer' into hdf5 Dhanya Maliakal 2016-12-15 14:05:29 +01:00
  • 983f517e07 added users to the package Dhanya Maliakal 2016-12-15 14:04:37 +01:00
  • 545c5530e3 added moenchT1 data structure Anna Bergamaschi 2016-12-15 13:58:55 +01:00
  • ae48a0e251 made some groups and force closing Dhanya Maliakal 2016-12-15 09:26:25 +01:00
  • 62ba3838ef included c++ lib Dhanya Maliakal 2016-12-14 18:19:40 +01:00
  • cdcb413241 removed hdf5 c, only c++ Dhanya Maliakal 2016-12-14 18:19:29 +01:00
  • f8b34a16dd converted to c++ Dhanya Maliakal 2016-12-14 18:15:47 +01:00
  • a971d87008 Merge branch '2.2-rc' into hdf5 Dhanya Maliakal 2016-12-13 13:23:06 +01:00
  • 2a508435c7 change the filenaming according to det position and not det id Dhanya Maliakal 2016-12-13 11:41:27 +01:00
  • aba3319427 moving towards c++ api Dhanya Maliakal 2016-12-12 14:24:39 +01:00
  • d3200dc76f moving towards c++ api Dhanya Maliakal 2016-12-12 14:24:24 +01:00
  • e7621a6cd0 moving towards c++ api Dhanya Maliakal 2016-12-12 14:24:11 +01:00
  • d6793a0802 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_calibration into developer Anna Bergamaschi 2016-12-05 16:01:00 +01:00
  • 37ba8f9a71 added moench03 T CPU data structure Anna Bergamaschi 2016-12-05 16:00:34 +01:00
  • 3c0ce23bc2 fixed hardcoded port number, cleanup Leonardo Sala 2016-12-02 15:21:22 +00:00
  • a67f9d50de removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen Dhanya Maliakal 2016-12-02 12:47:01 +01:00
  • 28b0897dd7 fixed bug of crash when changing dr sometimes, latestdata was incorrectly inititalized Dhanya Maliakal 2016-12-02 08:55:07 +01:00
  • dd9387ef29 using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports Dhanya Maliakal 2016-12-02 08:53:08 +01:00
  • 657d3e5759 first functional commit, still some workarounds. Can start, acquire, stop, restart Leonardo Sala 2016-12-01 15:59:12 +00:00
  • f61d819599 wip for Eiger9M Leonardo Sala 2016-12-01 07:43:46 +00:00
  • d9016c95de updated the server bins Dhanya Maliakal 2016-11-30 11:23:46 +01:00
  • ce086fe79d updaterev Dhanya Maliakal 2016-11-30 11:20:42 +01:00
  • 790cef37ff updaterev Dhanya Maliakal 2016-11-30 11:20:16 +01:00
  • 37ea7d425f updaterev Dhanya Maliakal 2016-11-30 11:17:38 +01:00
  • 1fe810d9d1 uncommented imagereconstruction in normal checkout script and also added but commented tests repository Dhanya Maliakal 2016-11-30 11:16:59 +01:00
  • 09645cbba8 bottom is defined as flippeddatax in config file, not anymore as argument for receiver Dhanya Maliakal 2016-11-30 10:36:46 +01:00
  • 466f1506a5 bottom is defined as flippeddatax in config file, not anymore as argument for receiver Dhanya Maliakal 2016-11-30 10:36:34 +01:00
  • 0c8ca874e4 image reconstruction should work now Dhanya Maliakal 2016-11-28 14:52:46 +01:00
  • 5445552b17 removed bug where it shuts down socket and tries to read it as it is -1 Dhanya Maliakal 2016-11-25 14:34:49 +01:00
  • af8c750b5a made the eiger like the jungfrau ignoring packets Dhanya Maliakal 2016-11-25 12:22:21 +01:00
  • 52dbb7f9fc smaller changes to make arguments const Dhanya Maliakal 2016-11-25 12:22:00 +01:00
  • b131f268e0 added the check for detector and receiver online in refreshing tabs Dhanya Maliakal 2016-11-22 14:11:11 +01:00
  • c70f453de4 changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely Dhanya Maliakal 2016-11-22 14:01:07 +01:00
  • 96d8478b46 gui ensuring receiver offline caught, also at progress Dhanya Maliakal 2016-11-22 13:59:27 +01:00
  • 09d146ee55 changed a printout Dhanya Maliakal 2016-11-22 11:39:47 +01:00
  • 9031b3998b removed warnings and zmq only when not mythen Dhanya Maliakal 2016-11-22 11:06:05 +01:00
  • 394526a9c3 removed zmq threads from client and made it receive packets via for loop Dhanya Maliakal 2016-11-22 11:05:42 +01:00
  • 55408118b1 removed some warnings and printsouts Dhanya Maliakal 2016-11-22 11:05:12 +01:00
  • 0ed9ee0e5d fixing the 32 bit crash and empty plot using zmq Dhanya Maliakal 2016-11-21 12:02:45 +01:00
  • 9d106f6c93 changed clock for jungfrau, maybe other debugging stuff outside this folder Dhanya Maliakal 2016-11-21 09:21:30 +01:00
  • 21e4201bb8 updaterev Dhanya Maliakal 2016-11-14 11:57:57 +01:00
  • ebf102b8d9 updaterev Dhanya Maliakal 2016-11-14 11:57:53 +01:00
  • e6c7dfc440 adding exptime to receiver for file header Dhanya Maliakal 2016-11-14 11:57:34 +01:00
  • c639477f28 adding exptime to receiver for file header Dhanya Maliakal 2016-11-14 11:57:29 +01:00
  • 45fc87240f write number of frames and period in file header Dhanya Maliakal 2016-11-11 16:08:18 +01:00
  • b980640a4c updaterev Dhanya Maliakal 2016-11-11 14:44:56 +01:00
  • 7ffba557f6 updatereveiger Dhanya Maliakal 2016-11-11 14:44:42 +01:00
  • f13a42feeb eigerupdaterev Dhanya Maliakal 2016-11-11 14:43:55 +01:00
  • b1a3a224ff implemented high voltage for normal modules Dhanya Maliakal 2016-11-11 14:43:18 +01:00
  • 4292bf1ce8 updaterev Dhanya Maliakal 2016-11-11 14:15:08 +01:00
  • c364b28922 updaterev Dhanya Maliakal 2016-11-11 14:14:59 +01:00
  • b1f658c439 file header with semi colon Dhanya Maliakal 2016-11-11 10:20:00 +01:00
  • 9ee9fdea96 fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards Dhanya Maliakal 2016-11-10 16:13:42 +01:00
  • 7d860cc7cd fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards Dhanya Maliakal 2016-11-10 16:13:22 +01:00
  • cec2e5c6b4 reverting to previous Dhanya Maliakal 2016-11-10 16:08:38 +01:00
  • 5189640cd7 debugging for eriks pc Dhanya Maliakal 2016-11-10 16:02:31 +01:00
  • 8298486f27 debugging for eriks pc Dhanya Maliakal 2016-11-10 15:57:04 +01:00
  • fd666605aa some changes for qwt7 and for higher gcc Dhanya Maliakal 2016-11-10 14:56:52 +01:00
  • acb900961a fixed time interval in receiveR Dhanya Maliakal 2016-11-10 14:37:26 +01:00
  • 44d6b0ffc0 fixed time interval in receiveR Dhanya Maliakal 2016-11-10 14:37:18 +01:00
  • b55414cd38 fixed time interval in receiveR Dhanya Maliakal 2016-11-10 14:37:08 +01:00
  • 70326f8b10 Merged developer branch with anna's modifications for chiptestboard Anna Bergamaschi 2016-11-10 13:27:18 +01:00
  • 3c48065b5a removed the normal timer on the updateplot, it shold now plot as soon as it gets the data Dhanya Maliakal 2016-11-10 12:23:01 +01:00
  • 6f43e9fcde the space in the makefile screwed up the compilation Dhanya Maliakal 2016-11-10 10:26:27 +01:00
  • 37c0b5bdc1 done Dhanya Maliakal 2016-11-10 10:26:02 +01:00
  • 753ed306d9 changes to include eiger in gui Dhanya Maliakal 2016-11-10 08:41:46 +01:00
  • a4d4b05c1d s Dhanya Maliakal 2016-11-09 15:35:22 +01:00
  • cb879c61ca changes for new chipterboard -now works with reduced dynamic range and analog/digital readout Anna Bergamaschi 2016-11-09 11:36:59 +01:00
  • 149610aa51 updaterev Dhanya Maliakal 2016-11-09 10:21:20 +01:00
  • f09e5ebad8 debugging Dhanya Maliakal 2016-11-09 10:18:33 +01:00
  • 4a96b90296 debugging Dhanya Maliakal 2016-11-09 10:13:30 +01:00
  • f6b753f5d7 debugging Dhanya Maliakal 2016-11-09 09:36:42 +01:00
  • 7cbd21651b debugging Dhanya Maliakal 2016-11-09 09:27:23 +01:00
  • 6a2adb48aa debugging Dhanya Maliakal 2016-11-09 09:19:11 +01:00
  • b8ffe24c5f debugging Dhanya Maliakal 2016-11-09 09:16:36 +01:00
  • 1a64fc30ca added the print temp losses Dhanya Maliakal 2016-11-08 16:37:15 +01:00
  • 33d0563133 added the print temp losses Dhanya Maliakal 2016-11-08 16:36:17 +01:00
  • 5f4a38416a added the print temp losses Dhanya Maliakal 2016-11-08 16:31:05 +01:00
  • 964c76ac60 added the print temp losses Dhanya Maliakal 2016-11-08 16:08:48 +01:00
  • 9b9876e287 added the print temp losses Dhanya Maliakal 2016-11-08 16:03:44 +01:00
  • 7b2be5b009 debugging Dhanya Maliakal 2016-11-08 15:44:34 +01:00
  • d30e4a4d1c updaterev Dhanya Maliakal 2016-11-08 15:26:18 +01:00
  • 400eef6712 updaterevjungfrau Dhanya Maliakal 2016-11-08 15:25:56 +01:00
  • 475e217cc5 adding binary Dhanya Maliakal 2016-11-08 15:25:16 +01:00
  • 0b5dc3a5a1 updaterev Dhanya Maliakal 2016-11-08 15:24:02 +01:00