Commit Graph

  • ac53cb2ae4 resetting the acquiringflag whenever acquisition stop is called Dhanya Maliakal 2015-11-24 15:25:42 +01:00
  • 5012ea0c6c unnecessary lock in acquire Dhanya Maliakal 2015-11-24 13:50:42 +01:00
  • a00df5da35 dummy value changed Dhanya Maliakal 2015-11-24 12:09:10 +01:00
  • a65ebbea99 merge to master Dhanya Maliakal 2015-11-23 12:40:24 +01:00
  • 0d86439589 some cleanup for rest Dhanya Maliakal 2015-11-23 11:54:55 +01:00
  • 8ae1e812e6 pulse chip fixed Dhanya Maliakal 2015-11-20 16:41:27 +01:00
  • c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc Dhanya Maliakal 2015-11-20 16:28:48 +01:00
  • a1bd54b16b pulsing in client and server Dhanya Maliakal 2015-11-19 17:43:46 +01:00
  • e0464ef782 pulsing client side, and bug fix server side for reset partially Dhanya Maliakal 2015-11-19 16:15:59 +01:00
  • 8b0772abae got rid of memory leak when using gui Dhanya Maliakal 2015-11-19 14:21:04 +01:00
  • 6600d82fc7 some small unimportant changes such as removign eiger header structure form generic socket and initializign differentlclients Dhanya Maliakal 2015-11-19 11:18:35 +01:00
  • 291fe8bc22 socket disconnecting in receiver Dhanya Maliakal 2015-11-19 11:10:59 +01:00
  • 8b0895add0 reset counter bit in eiger detector partially or completely Dhanya Maliakal 2015-11-17 16:39:36 +01:00
  • 11dafc6ebf resetting frame number done after resetting detector (prepareforacquisition) eiger server Dhanya Maliakal 2015-11-17 15:28:47 +01:00
  • 995f28ca52 just minor edit changes Dhanya Maliakal 2015-11-17 15:27:52 +01:00
  • 73f8d065b3 empty fifo at receiver start and comment waiting for packet Dhanya Maliakal 2015-11-17 12:27:18 +01:00
  • bc55f9d1e4 edited getdatafromdetector to not stop detector for eiger Dhanya Maliakal 2015-11-17 12:00:42 +01:00
  • 777f04331d implemented fifo depth configurable from client Dhanya Maliakal 2015-11-17 10:31:09 +01:00
  • 66db11421f implemented fifo depth configurable from client Dhanya Maliakal 2015-11-17 10:30:53 +01:00
  • 003d0255c3 fifodepth def change, and listening packets count right Dhanya Maliakal 2015-11-16 11:48:50 +01:00
  • 113e522399 refactoring and reducing overhead Dhanya Maliakal 2015-11-13 17:55:11 +01:00
  • f68d6d0ab6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Dhanya Maliakal 2015-11-13 17:49:36 +01:00
  • c43af96487 some changes refactoring and reducing time spent Dhanya Maliakal 2015-11-13 17:47:44 +01:00
  • c73d9f4103 merged and gotthard 2 det example Dhanya Maliakal 2015-11-13 17:44:24 +01:00
  • 041bfc8992 remove cout l_msdetect 2015-11-13 15:46:42 +01:00
  • 8ecc795574 corrected settings for eiger;removed loqwnoise to lowgain Dhanya Maliakal 2015-11-13 13:48:30 +01:00
  • a6294a7737 default files l_msdetect 2015-11-13 12:12:40 +01:00
  • c2c428254e change eiger settings l_msdetect 2015-11-13 12:04:52 +01:00
  • 4cf263027a change eiger setting dir l_msdetect 2015-11-13 11:51:17 +01:00
  • fa80d6a205 change settings for eiger l_msdetect 2015-11-13 11:43:19 +01:00
  • ab9e01f212 usleep in detector taken off Dhanya Maliakal 2015-11-12 15:30:56 +01:00
  • 62c92dd364 changing to random read when no gui at beginnning of acquire Dhanya Maliakal 2015-11-12 15:05:56 +01:00
  • 53f11c499d memory leak fixed Dhanya Maliakal 2015-11-12 13:49:09 +01:00
  • 24438419d5 some changes for memory leak Dhanya Maliakal 2015-11-11 15:09:37 +01:00
  • 0627668090 some changes for memory leak Dhanya Maliakal 2015-11-11 15:08:50 +01:00
  • 455c9c5c80 some changes for memory leak Dhanya Maliakal 2015-11-09 17:16:24 +01:00
  • 98ab99c53f fixed a bug of both threads not popping out(due to wrong frame packet) and end of acquisition wrongly inferred Dhanya Maliakal 2015-11-06 11:23:50 +01:00
  • 816543f358 detector ip for eiger is replaced by hardware ip for 1g Dhanya Maliakal 2015-11-06 11:10:51 +01:00
  • 667c1c0304 some small changes Dhanya Maliakal 2015-11-05 12:05:31 +01:00
  • 0841467dc9 added xmap and ymap in moench02Ctb.h Marco Ramilli 2015-11-04 12:26:00 +01:00
  • bc6dfca552 ensuring vthreshold returns the right value Dhanya Maliakal 2015-11-03 15:22:57 +01:00
  • e9f51e2ef5 put in the changes by Andrea to make it as static and remove as many destructors bugs Dhanya Maliakal 2015-11-02 17:33:10 +01:00
  • f77b78b5c6 changes to compile server in defs file Dhanya Maliakal 2015-11-02 15:55:15 +01:00
  • 2e701168b9 forgot to add eiger server Dhanya Maliakal 2015-11-02 12:32:56 +01:00
  • 2152eb1d28 detector id returns a number form a file or 0 if no file: eiger Dhanya Maliakal 2015-11-02 12:31:19 +01:00
  • 63507840e0 merging with master Dhanya Maliakal 2015-10-30 12:16:33 +01:00
  • 5c5e2edbf9 done Dhanya Maliakal 2015-10-29 17:45:24 +01:00
  • 1c9d01ea1c done Dhanya Maliakal 2015-10-29 17:39:47 +01:00
  • b5b7e7e529 done Dhanya Maliakal 2015-10-29 17:38:31 +01:00
  • 4c85a27f10 done Dhanya Maliakal 2015-10-29 17:34:19 +01:00
  • 963717215f done Dhanya Maliakal 2015-10-29 17:23:39 +01:00
  • 9b449009ff log Anna Bergamaschi 2015-10-29 13:33:24 +01:00
  • eb5f481faa detector type bug fix Anna Bergamaschi 2015-10-29 11:21:57 +01:00
  • db54fbddde detector type bug fix Anna Bergamaschi 2015-10-29 11:20:08 +01:00
  • 58bfa296be done l_msdetect 2015-10-28 17:40:55 +01:00
  • eee739625f Modified config_gen script Martin Brückner 2015-10-28 11:08:19 +01:00
  • 5f3de2057c df Dhanya Maliakal 2015-10-27 14:33:26 +01:00
  • 837d0dce03 dsg Dhanya Maliakal 2015-10-27 09:31:08 +01:00
  • da809171e9 output dir multi for all Dhanya Maliakal 2015-10-26 11:31:56 +01:00
  • dd1233bc7c outdir for multi is for all Dhanya Maliakal 2015-10-26 11:26:16 +01:00
  • 73ebb2750c Better commandline parsing Martin Brückner 2015-10-23 12:03:19 +02:00
  • feb6f0d0e2 THE REAL CHANGE: previous ones dont work:fixed bug gotthard server: dynamic gain and confgain values Dhanya Maliakal 2015-10-23 11:41:05 +02:00
  • 64c0fdfaef fixed bug gotthard server: dynamic gain and confgain values Dhanya Maliakal 2015-10-23 11:30:37 +02:00
  • 0ea9cc34b0 changed gotthard dynamic gain value and fixed bug of writing settings enum with more offset to not mixup with conf gain value in firmware Dhanya Maliakal 2015-10-23 10:57:45 +02:00
  • 6d6725c4e8 df Dhanya Maliakal 2015-10-21 11:03:57 +02:00
  • 8f66d63b08 Added config file generation tool Martin Brückner 2015-10-20 16:16:49 +02:00
  • 253383331f vg Dhanya Maliakal 2015-10-19 16:06:54 +02:00
  • 169a91b6ac some Dhanya Maliakal 2015-10-16 10:47:21 +02:00
  • 8ffdcb08c9 fixed the set trimbit getting stuck bug. was due to gain and offset not sent properly for eiger Dhanya Maliakal 2015-10-15 16:00:09 +02:00
  • 4fce397d20 eiger calibration files Dhanya Maliakal 2015-10-15 12:13:35 +02:00
  • a3e12e7955 somewhere Dhanya Maliakal 2015-10-15 12:11:06 +02:00
  • 6ab7947b97 fixed the gain and offset default values uploaded for eiger Dhanya Maliakal 2015-10-14 10:47:43 +02:00
  • 25dbaa4e09 fixed the gain and offset default values uploaded for eiger Dhanya Maliakal 2015-10-14 10:38:39 +02:00
  • f141624477 again Dhanya Maliakal 2015-10-14 09:11:40 +02:00
  • 5ac37c2154 some more Dhanya Maliakal 2015-10-13 15:22:30 +02:00
  • 8972fa1143 EigerDetectorServer for firmware version 11, changes: direct write into udp block ram Martin Brückner 2015-10-08 17:29:13 +02:00
  • e915245c10 additional change Dhanya Maliakal 2015-10-08 17:09:43 +02:00
  • a3e88f96d6 some more changes Dhanya Maliakal 2015-10-08 12:19:07 +02:00
  • 92b73e0e88 Merge branch 'partial_frames' into cleanup Dhanya Maliakal 2015-10-02 14:22:41 +02:00
  • 9148f6365e changed last packet value literal to expression, not big in functionality Dhanya Maliakal 2015-10-02 12:05:16 +02:00
  • c392348def big change half done Dhanya Maliakal 2015-09-30 11:40:39 +02:00
  • 5057fd4eef changed energyConversion.h to compile the calibration wizards Anna Bergamaschi 2015-09-24 11:10:12 +02:00
  • 11de59d87c Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-09-24 10:54:48 +02:00
  • 33cf26648b no real changes Anna Bergamaschi 2015-09-24 10:54:43 +02:00
  • a9958e3791 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Anna Bergamaschi 2015-09-24 10:53:59 +02:00
  • cf787c9e7d minor warnings removed Dhanya Maliakal 2015-09-23 17:01:44 +02:00
  • a4dfa6165a 4 bitand 32 bit mode for partial_frames offline analysis should work now Dhanya Maliakal 2015-09-23 17:01:06 +02:00
  • 06b38e591c got rid of warnings Dhanya Maliakal 2015-09-23 12:34:21 +02:00
  • 2ed8b46ad0 displaying subframe index in gui Dhanya Maliakal 2015-09-23 11:50:47 +02:00
  • a770389c90 including subframe index from receiver to client and also sending this to gui Dhanya Maliakal 2015-09-23 11:50:02 +02:00
  • 2f8a036b5e works for 16 and 8bit offline Dhanya Maliakal 2015-09-23 11:35:40 +02:00
  • 102162ac1a made compatible to subframe in gui for partial_frame Dhanya Maliakal 2015-09-22 16:41:00 +02:00
  • 7c0430572b included subframe into receiver and sends to gui Dhanya Maliakal 2015-09-22 16:21:41 +02:00
  • 71cd046bed small change to ensure no crash at wrong frame read Dhanya Maliakal 2015-09-22 12:16:42 +02:00
  • 8aed690113 doesnt crash at frame number 0 Dhanya Maliakal 2015-09-22 11:56:37 +02:00
  • 22ba839ad5 commenting out unnecessary lines Dhanya Maliakal 2015-09-22 11:39:33 +02:00
  • 30b83861a4 10g partial_frames should also work now Dhanya Maliakal 2015-09-17 12:34:17 +02:00
  • 5a4dfd128d 10g partial_frames should also work now Dhanya Maliakal 2015-09-17 12:29:16 +02:00
  • b3012acea2 bug fixxed for 10g writing filter, still debug mode Dhanya Maliakal 2015-09-17 12:03:11 +02:00
  • 1b471bc675 partial_frames for 10g bug fixed specifzing literal 1024 for allowed packet size in startwritign Dhanya Maliakal 2015-09-17 09:14:00 +02:00