Commit Graph

  • 89ad2112c6 difference between acquisition index and frame index Dhanya Maliakal 2015-03-12 12:25:23 +01:00
  • 7e44648da9 different between acquisition index and frame index Dhanya Maliakal 2015-03-12 12:22:19 +01:00
  • 6232c6584a put executables into git Dhanya Maliakal 2015-03-10 16:06:19 +01:00
  • 6063c712f7 copy first frame to latest data no matter what and also copy only if more than packets per frame Dhanya Maliakal 2015-03-10 15:04:50 +01:00
  • 7a2e42d59a changed the way gui polls receiver for data for nth frame and otherwise Dhanya Maliakal 2015-03-10 15:03:08 +01:00
  • a37eb65dbc new argv set merged Anna Bergamaschi 2015-03-06 10:57:06 +01:00
  • b091b7e1a9 Smallish changes? Anna Bergamaschi 2015-03-06 10:44:07 +01:00
  • cd67991357 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Anna Bergamaschi 2015-03-06 10:43:22 +01:00
  • c7aea8f2a6 Some changes for the JCTB software Anna Bergamaschi 2015-03-06 10:43:05 +01:00
  • 71ad7ae2f0 some pointers deleted equalled to null Dhanya Maliakal 2015-03-05 15:30:21 +01:00
  • 2f82469531 fifo debug with color done Dhanya Maliakal 2015-03-05 15:21:12 +01:00
  • 985b4d71b4 Added jungfrau1.0 data structure (bad) and added xmap, ymap and getPixel method to the slsDetectorData base class Anna Bergamaschi 2015-03-05 13:04:31 +01:00
  • cdd18182a8 resolved client side memory leak caused from gui Dhanya Maliakal 2015-03-04 16:24:03 +01:00
  • 24b9402e52 eiger ensures the mac address is the same as the software mac address Dhanya Maliakal 2015-03-03 16:35:52 +01:00
  • 7cca11637a include gemmas 1 module testing as well as multi module testing for serial Dhanya Maliakal 2015-03-03 14:23:05 +01:00
  • 848569b216 print receiver configurations and some error messages upon exit Dhanya Maliakal 2015-03-02 14:04:27 +01:00
  • 2c69e45348 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Dhanya Maliakal 2015-03-02 13:56:52 +01:00
  • 85ccf64175 print receiver configurations for all detectors added Dhanya Maliakal 2015-03-02 13:56:23 +01:00
  • ed50f83fe6 Added extra debug messages (-DMARTIN) Brückner Martin (PSI) 2015-03-02 12:12:23 +01:00
  • 5682a6b458 moved startframeindice to before stop listening for gotthard Dhanya Maliakal 2015-02-25 10:34:57 +01:00
  • 875ee02038 got ridf of warnings for eiger server Dhanya Maliakal 2015-02-25 10:34:18 +01:00
  • 3ee146a2ca moved start of frame to after stoplistening, for eiger to ignore incomplete frames Dhanya Maliakal 2015-02-24 16:19:33 +01:00
  • 2c2d2171d2 get the last frame in eiger with acquiringdone Dhanya Maliakal 2015-02-24 16:10:31 +01:00
  • 3fa5191705 so that the dacs dont go negative in the gui, default timer reduced to 200ms so more frames can be shown Dhanya Maliakal 2015-02-23 15:26:14 +01:00
  • 651a13f811 so that gui can reread the same frame from receiver, guidataready is set to zero only once Dhanya Maliakal 2015-02-23 15:25:06 +01:00
  • d658799b20 eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing Dhanya Maliakal 2015-02-23 15:13:14 +01:00
  • 8a79e94fa8 Added draft of moench02 JCTB data Anna Bergamaschi 2015-02-20 11:39:35 +01:00
  • 59c3d26c96 added script ot checkout Dhanya Maliakal 2015-02-18 13:48:08 +01:00
  • e3e7b3a885 eiger settings files Dhanya Maliakal 2015-02-13 15:29:11 +01:00
  • 6d8fcaa423 debugging output change Dhanya Maliakal 2015-02-13 11:58:36 +01:00
  • b2c7944014 type change in eiger server Dhanya Maliakal 2015-02-13 11:57:44 +01:00
  • 81bcb29f75 no hardcoded beb numbers Dhanya Maliakal 2015-02-12 12:08:21 +01:00
  • 8863a9f880 no change Dhanya Maliakal 2015-02-11 11:22:54 +01:00
  • 1e55577fc2 no change Dhanya Maliakal 2015-02-10 16:54:39 +01:00
  • c5f8067735 Merge branch 'dhanya_devel' Dhanya Maliakal 2015-02-10 16:44:57 +01:00
  • b54f3628ae Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Dhanya Maliakal 2015-02-10 16:00:09 +01:00
  • 5c34db9cb1 Merge branch 'dhanya_devel' Dhanya Maliakal 2015-02-10 14:43:17 +01:00
  • bea1791b4d initializing variables and copying ot gui only full frames Dhanya Maliakal 2015-02-10 12:21:31 +01:00
  • c69ddad821 jungfrau detector server starts in CPU_NOT_10GB mode; ADC VREF put to 1V Anna Bergamaschi 2015-02-10 10:16:43 +01:00
  • 5735aff30c Added Moench03 common mode and photon finder/pedestal funcs Anna Bergamaschi 2015-02-10 10:15:16 +01:00
  • e975a75be9 some code refraction to get rid of memeory leakage Dhanya Maliakal 2015-02-04 16:11:13 +01:00
  • 4f84bb19da Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-02-04 09:28:09 +01:00
  • aeffb4b93f get detector and receiver status bug fixed Dhanya Maliakal 2015-02-02 16:31:28 +01:00
  • 7fd12f97b4 some unnecessary printouts Dhanya Maliakal 2015-01-30 16:49:30 +01:00
  • f30833a460 got rid of unnecessary printouts in receiver Dhanya Maliakal 2015-01-30 15:03:35 +01:00
  • 9ac08e5e76 supports frames with many samples for jctb - obtained by faking number of chips in case of many samples Anna Bergamaschi 2015-01-30 12:58:53 +01:00
  • 2b248eb793 unnecessary long wait in receiver Dhanya Maliakal 2015-01-30 10:58:30 +01:00
  • 058f988586 Merge branch 'master' into dhanya_devel Dhanya Maliakal 2015-01-29 15:15:16 +01:00
  • 05755617f4 possibility of reading images, pedestal etc. for moench03 implemented Anna Bergamaschi 2015-01-29 11:20:24 +01:00
  • 02a69a0a6c moench03Ctb data structure and readout funcs added Anna Bergamaschi 2015-01-27 17:34:20 +01:00
  • 36d6538104 got rid of segmentation fault in update offfsets Dhanya Maliakal 2015-01-26 16:57:03 +01:00
  • 76c9d2c61b lot of couts and some pre and post Maliakal Dhanya 2015-01-14 10:48:36 +01:00
  • 4a755d96ce revision update Maliakal Dhanya 2015-01-14 10:43:41 +01:00
  • d1aa3021fb includes handling dynamic range for multiple receivers for eiger Maliakal Dhanya 2015-01-14 10:18:54 +01:00
  • a149d7fb2e usleep adeed to reduce CPU consumption Anna Bergamaschi 2015-01-08 10:29:30 +01:00
  • faca56f2e3 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2014-12-19 14:29:06 +01:00
  • 785f025d1b Jungfrau server with changed ADC phase Anna Bergamaschi 2014-12-19 14:28:41 +01:00
  • f88cc1c47d merged branch devel Maliakal Dhanya 2014-12-11 14:31:53 +01:00
  • 255f9e3fee eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better Maliakal Dhanya 2014-12-11 14:16:43 +01:00
  • 169c0a43ce updating version numbers Maliakal Dhanya 2014-12-08 10:25:42 +01:00
  • 193c62dc42 updating version numbers Maliakal Dhanya 2014-12-08 10:20:09 +01:00
  • 08a1034f63 back to only top gettgn acquisition Maliakal Dhanya 2014-12-08 10:16:31 +01:00
  • f79f3cf021 makefile crash if files dont exist in make clean, fixed Maliakal Dhanya 2014-12-08 09:17:56 +01:00
  • dc4e74087d makefile crash if files dont exist in make clean, fixed Maliakal Dhanya 2014-12-08 09:16:19 +01:00
  • 0184970ef9 default dac values for eiger Maliakal Dhanya 2014-12-04 16:16:06 +01:00
  • 294a8a3098 no change Gemma Tinti 2014-12-04 11:20:15 +01:00
  • d76200e68d bottom allowed Maliakal Dhanya 2014-12-04 10:49:15 +01:00
  • 94a73ecd45 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2014-12-03 10:23:25 +01:00
  • 8eea6f1d83 Mofifications to jungfrau server and pattern generator Anna Bergamaschi 2014-12-03 10:23:05 +01:00
  • 8dd7772bfe stop server automatic for gemma Maliakal Dhanya 2014-12-02 16:12:45 +01:00
  • 52d3140a3a a version of receiver for gemma with bottom Maliakal Dhanya 2014-12-02 10:12:00 +01:00
  • 6787c2e1e0 got rid of unnecessary usleep before transmitting in receiver Maliakal Dhanya 2014-12-01 17:18:26 +01:00
  • 28b7a73b13 working version for eiger detector before branching to gemma Maliakal Dhanya 2014-12-01 17:15:31 +01:00
  • 8dc41efad2 changed to linux argument type with -- Maliakal Dhanya 2014-12-01 10:54:31 +01:00
  • bc79546e4e changes for eiger to compensate for 16 bytes and return while at the same time works for first frame being less than expected :266240 Maliakal Dhanya 2014-11-28 14:29:09 +01:00
  • 5b2a896ed3 to return if it catches only 16 bytes or less than expected, but compensates for first frame being only 266240 for eiger Maliakal Dhanya 2014-11-28 14:28:56 +01:00
  • f79f8558f0 mostly to do with better testing methods in eiger server and separating acquisition, inclding start receiver etc Maliakal Dhanya 2014-11-28 14:26:47 +01:00
  • 4649de2742 some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave Maliakal Dhanya 2014-11-28 14:26:19 +01:00
  • 9ad65bc374 First commit Anna Bergamaschi 2014-11-27 09:30:14 +01:00
  • 5fe8c6e457 multiSlsDetector merging fixed Anna Bergamaschi 2014-11-25 12:00:08 +01:00
  • 1d5580b0d4 JMCB max frames Anna Bergamaschi 2014-11-25 11:54:54 +01:00
  • 91344f54d9 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2014-11-25 11:46:34 +01:00
  • d10335e4a9 pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency Anna Bergamaschi 2014-11-25 11:38:19 +01:00
  • 4770d74c12 return even if eiger got only 16 bytes of a packet Maliakal Dhanya 2014-11-18 17:29:12 +01:00
  • 2eaefaba3a added log level control Sala Leonardo 2014-11-18 10:51:52 +01:00
  • 3921dc2bf8 added DEBUG flags added REST, DEBUG description in make help Sala Leonardo 2014-11-18 10:50:38 +01:00
  • a2fdcce711 fixed non-rest compilation Sala Leonardo 2014-11-17 17:06:50 +01:00
  • ceb2d28281 symbolic link corrected to point ot correct location Maliakal Dhanya 2014-11-17 17:00:38 +01:00
  • 3548ca5750 symbolic link corrected to point ot correct location Maliakal Dhanya 2014-11-17 16:57:54 +01:00
  • 9a43fb4082 put REST=no as default Sala Leonardo 2014-11-17 15:59:11 +01:00
  • f36d742cd3 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver Sala Leonardo 2014-11-17 15:52:43 +01:00
  • 9b8325bd37 Merge branch 'master' into eiger_receiver Sala Leonardo 2014-11-17 15:04:42 +01:00
  • 02ab7a4ed0 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Sala Leonardo 2014-11-17 15:00:32 +01:00
  • 769f9b7e76 Merge branch 'master' into eiger_receiver Sala Leonardo 2014-11-17 14:59:41 +01:00
  • cc6ee10e10 added a temp eiger setup file in settingsdir Maliakal Dhanya 2014-11-17 14:48:35 +01:00
  • 194b41bfc5 changes to get index in eiger server Maliakal Dhanya 2014-11-17 14:46:28 +01:00
  • 3324667d05 proper thread handling for the REST receiver Leonardo Sala 2014-11-12 11:54:12 +01:00
  • 72bf64ff57 cleaning Leonardo Sala 2014-11-11 17:01:55 +01:00
  • 7c51b06777 Merge branch 'master' into eiger_receiver Leonardo Sala 2014-11-11 15:53:48 +01:00
  • eb0ca1c944 commented overloaded data members Leonardo Sala 2014-11-07 16:02:24 +01:00