Commit Graph

  • c7017eef5b 10g gui bottom offset bug fix Dhanya Maliakal 2015-09-15 15:41:58 +02:00
  • 5368103efa 10g gui bottom offset bug fix Dhanya Maliakal 2015-09-15 15:40:54 +02:00
  • fe76ce9650 seems to run fine, only 16gb checked for fimware v 10 and software version v1.10.2 Dhanya Maliakal 2015-09-15 15:31:29 +02:00
  • 572b6fe29f f Dhanya Maliakal 2015-09-10 14:05:10 +02:00
  • 4dba6d746d Merge branch 'master' into partial_frames Dhanya Maliakal 2015-09-10 13:08:01 +02:00
  • 754d0b7911 included set all trimbits Dhanya Maliakal 2015-09-10 12:53:18 +02:00
  • 271838b2b5 changes to includes clkdivider and flags in gui and modify the server for proper checks Dhanya Maliakal 2015-09-10 11:29:15 +02:00
  • 1c41ea8898 changes to includes clkdivider and flags in gui Dhanya Maliakal 2015-09-10 11:28:39 +02:00
  • 03c41a759f should work for 10g now Dhanya Maliakal 2015-09-04 17:40:13 +02:00
  • 2ff8364aa8 some default calibration files for eiger Dhanya Maliakal 2015-09-04 15:57:17 +02:00
  • 584b9e6036 added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger Dhanya Maliakal 2015-09-04 15:54:12 +02:00
  • 7f168e3a70 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-09-03 15:40:11 +02:00
  • 681ed0f34f added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software Anna Bergamaschi 2015-09-03 15:39:54 +02:00
  • 04578f7c69 added subframe exposure time settable Dhanya Maliakal 2015-09-03 15:17:31 +02:00
  • cae286941a added subframe exposure time settable Dhanya Maliakal 2015-09-03 15:16:48 +02:00
  • 9dee6d41bd should work for 8 and 16 bit eiger Dhanya Maliakal 2015-09-03 12:05:25 +02:00
  • 74366b3cfe halfway into new server Dhanya Maliakal 2015-09-03 12:00:37 +02:00
  • 95324fc929 resets footer frame numbers Dhanya Maliakal 2015-09-02 11:06:07 +02:00
  • 34a1dac0fe sls_detector_acquire [id-] should finally work Anna Bergamaschi 2015-08-31 14:44:40 +02:00
  • d19b051860 reverting multiSlsDetectorClient to previous version otherwise the index of the detector does not work with default multidetector index. Use sls_detector_get 1-acquire for acquiring with multiple multi-detectors Anna Bergamaschi 2015-08-28 12:58:26 +02:00
  • b073ecacb9 multiple detector on one PC should now work Anna Bergamaschi 2015-08-28 12:14:55 +02:00
  • 442e857bb3 some changes to receiver defs Anna Bergamaschi 2015-08-28 11:00:07 +02:00
  • ed1dc77bb3 some changes to receiver defs Anna Bergamaschi 2015-08-28 10:56:24 +02:00
  • 84ad2912c6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-08-28 10:55:22 +02:00
  • dc05e58a57 may be changes to jungfrau detector server Anna Bergamaschi 2015-08-28 10:54:59 +02:00
  • 8ebb34dd42 fixed long file names in guireducing redundancy in name Dhanya Maliakal 2015-08-28 10:23:21 +02:00
  • f546814d39 reduced size of file names in gui Dhanya Maliakal 2015-08-27 10:44:24 +02:00
  • 2f160a7c28 reordered file name positions for gemma Dhanya Maliakal 2015-08-26 16:47:18 +02:00
  • df1453568c reverted the file name indices positioning as it doesnt work for gui Dhanya Maliakal 2015-08-26 12:50:45 +02:00
  • 41a4a9b611 some changes for 8 and 16 bit Dhanya Maliakal 2015-08-26 10:28:39 +02:00
  • b2c443af42 bug with 8 bit and 16 bt mode Dhanya Maliakal 2015-08-26 10:28:10 +02:00
  • 9f55e8bfdd merging with master Dhanya Maliakal 2015-08-21 14:47:07 +02:00
  • 0a0dfb2dc6 fixed problem with increasing file descriptor when connecting to receiver Dhanya Maliakal 2015-08-21 14:11:38 +02:00
  • 8f6b8a8474 forgot to commit earlier Dhanya Maliakal 2015-08-21 10:54:14 +02:00
  • e732dbbeab should work properly Dhanya Maliakal 2015-08-21 10:05:29 +02:00
  • 4813d7b598 should work properly Dhanya Maliakal 2015-08-21 10:04:55 +02:00
  • a29da27a42 works without problems except bottom doesnt get much for acquire Dhanya Maliakal 2015-08-20 17:36:41 +02:00
  • 8d7445d347 changed startframeindex to 1 as thats whats written to file in eiger Dhanya Maliakal 2015-08-20 10:17:36 +02:00
  • 704c0f796a reset acquiringDone before acquistion Dhanya Maliakal 2015-08-19 16:56:17 +02:00
  • 79e13c6db7 using framescaught instead of frameindex in gui to get data Dhanya Maliakal 2015-08-19 15:48:14 +02:00
  • 587d357f3e resetting frame index for scans for eiger Dhanya Maliakal 2015-08-19 15:47:24 +02:00
  • 5dd5c250f3 removing unnecessary prints Dhanya Maliakal 2015-08-19 14:55:15 +02:00
  • e8a5f81083 moving to fix another branch Dhanya Maliakal 2015-08-19 14:32:08 +02:00
  • 225b67f5e5 some bug fix with file naming from previous change Dhanya Maliakal 2015-08-19 11:46:41 +02:00
  • c9a952a748 changing file name prefix orders, reset frames caught command from command line Dhanya Maliakal 2015-08-19 11:38:09 +02:00
  • 80f33997d4 almost works test stage still Dhanya Maliakal 2015-08-17 15:37:28 +02:00
  • 2950af9be1 need to chek Dhanya Maliakal 2015-08-13 14:46:57 +02:00
  • 35cd736c4c nothing much, made it more compatible Dhanya Maliakal 2015-08-10 15:12:32 +02:00
  • 0800e07315 partial frames shows missing packet when you map values Dhanya Maliakal 2015-08-10 15:11:45 +02:00
  • 1e817c138f nothing much Dhanya Maliakal 2015-08-10 14:57:24 +02:00
  • 0a24778ff8 missing packets should work now Dhanya Maliakal 2015-08-10 14:45:43 +02:00
  • 52f83b9249 do not push, debug commands involved Dhanya Maliakal 2015-08-10 13:44:57 +02:00
  • e3d61d7020 do not push, debug commands involved Dhanya Maliakal 2015-08-10 13:42:58 +02:00
  • d2f53aaf64 bugs Dhanya Maliakal 2015-08-07 12:06:10 +02:00
  • 6d0ee4e738 Merge branch 'master' into partial_frames Dhanya Maliakal 2015-08-05 12:08:44 +02:00
  • a4a0ea508e proper freeng after udpsocket shutdown Dhanya Maliakal 2015-08-05 12:08:28 +02:00
  • 53cf4a7f67 Merge branch 'master' into partial_frames Dhanya Maliakal 2015-08-05 09:12:10 +02:00
  • a26cbced57 corrected 10g mapping for gui Dhanya Maliakal 2015-08-05 09:11:50 +02:00
  • 4fbfe186ef done Dhanya Maliakal 2015-08-04 15:20:00 +02:00
  • 902ab36705 almost done Dhanya Maliakal 2015-08-03 16:29:59 +02:00
  • d766d1ff37 merge with 10g fix from master Dhanya Maliakal 2015-07-30 12:00:38 +02:00
  • c0f2e5c6c2 onepacketsize not consistent for 10g bug fix Dhanya Maliakal 2015-07-30 11:00:36 +02:00
  • d49da66dae almost done with changes Dhanya Maliakal 2015-07-30 10:42:10 +02:00
  • e9a301dd97 merge master into partial_Frames, including changes of propix Dhanya Maliakal 2015-07-29 10:23:35 +02:00
  • fa156f337e sorta done without missing packet identifiers Dhanya Maliakal 2015-07-28 18:15:09 +02:00
  • 5c5e9d349a zmin zmax change finish Dhanya Maliakal 2015-07-27 19:18:32 +02:00
  • b1a9689caf solved some zmax zmin problems with gui Dhanya Maliakal 2015-07-27 18:53:16 +02:00
  • f970baf1b8 write and copy to gui left Dhanya Maliakal 2015-07-27 12:36:45 +02:00
  • 24dcc45f5b receiver crash solved Dhanya Maliakal 2015-07-24 10:45:11 +02:00
  • 0d83346943 continuous and storeinram variable Dhanya Maliakal 2015-07-24 09:21:38 +02:00
  • 2d8ee637dc adc update not stopped between acquisition Dhanya Maliakal 2015-07-22 10:35:26 +02:00
  • db5412e599 propix integrated into gui Dhanya Maliakal 2015-07-22 10:06:38 +02:00
  • b4a540b6c2 propix settigns file added Dhanya Maliakal 2015-07-21 16:34:11 +02:00
  • a8fc34c92b included propix for client Dhanya Maliakal 2015-07-21 16:26:50 +02:00
  • 4e52096991 included propix receiver Dhanya Maliakal 2015-07-21 16:25:56 +02:00
  • 878c12d43e still long way to go Dhanya Maliakal 2015-07-21 13:36:14 +02:00
  • 74fc443db5 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Dhanya Maliakal 2015-07-17 13:56:04 +02:00
  • 29c62b1721 offsets corrected for 1.5m Dhanya Maliakal 2015-07-17 13:55:02 +02:00
  • 26a42d8f67 new way Dhanya Maliakal 2015-07-17 13:29:23 +02:00
  • ca9f195f0b starting of a new change Dhanya Maliakal 2015-07-16 13:33:34 +02:00
  • 476d1b452f some changes Dhanya Maliakal 2015-07-10 16:04:29 +02:00
  • 2ef27b718c updated gotthardserver to reflect v1.0 Dhanya Maliakal 2015-07-09 16:59:13 +02:00
  • fbfafb98fd small change Dhanya Maliakal 2015-07-03 16:10:04 +02:00
  • 5f0741d882 trimbits flipped and works correctly for top and bottom Dhanya Maliakal 2015-07-01 15:00:17 +02:00
  • 88e96d45e7 getting dr from rxr fixed Dhanya Maliakal 2015-06-30 17:21:45 +02:00
  • a3a2db1f73 fixed 32 progress problem, and increased debugging Dhanya Maliakal 2015-06-30 17:20:23 +02:00
  • f29f9b701d check detector mac matches hardware mac only for 1Gbe Dhanya Maliakal 2015-06-30 12:28:44 +02:00
  • c4e0f2967f solved detector organisation in client side Dhanya Maliakal 2015-06-30 11:54:13 +02:00
  • 3600fb6304 git rev in Dhanya Maliakal 2015-06-29 16:57:16 +02:00
  • 8202e4aa0a git rev in Dhanya Maliakal 2015-06-29 16:56:34 +02:00
  • a5e18833de git rev in Dhanya Maliakal 2015-06-29 16:55:51 +02:00
  • 4ebc9dffac git rev in Dhanya Maliakal 2015-06-29 16:55:26 +02:00
  • ceba5b8331 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration Dhanya Maliakal 2015-06-29 16:53:37 +02:00
  • 51bd146178 flip bytes incorporated Dhanya Maliakal 2015-06-29 16:52:52 +02:00
  • 90340d76b4 lookup table for the IR intensity Anna Bergamaschi 2015-06-26 16:55:38 +02:00
  • 2a719390cb adding script for gifs Anna Bergamaschi 2015-06-26 16:32:10 +02:00
  • 7e02a9d3d1 resolved flip bytes in eiger Dhanya Maliakal 2015-06-26 15:57:28 +02:00
  • 47d51674b4 resolved flip bytes in eiger Dhanya Maliakal 2015-06-26 15:57:10 +02:00
  • 49ef6659d4 eiger dynamic range offline header, moved eiger specific stuff from slsDetectorData to eigerHalfmodule Dhanya Maliakal 2015-06-26 15:45:38 +02:00
  • 1f9f474670 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration Dhanya Maliakal 2015-06-26 11:53:01 +02:00