Commit Graph

  • 9041c48bbf offline headers for dynamic range, fixed port to be same 1 bit always Dhanya Maliakal 2015-06-26 11:52:17 +02:00
  • 237c5286ca includes dynamic range in offline headers for eiger Dhanya Maliakal 2015-06-26 11:49:26 +02:00
  • b820ae0cad checkFrameNumber added to moench03 read data Anna Bergamaschi 2015-06-23 11:03:49 +02:00
  • 92e1029fec Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration Anna Bergamaschi 2015-06-23 09:15:46 +02:00
  • 1941ecb3c3 Adedde sturctures for moench03 10Gb data Anna Bergamaschi 2015-06-23 09:15:23 +02:00
  • f3d5de70bf firmware version for eiger added Dhanya Maliakal 2015-06-22 17:09:47 +02:00
  • 23a21b373e modified readMoench03 by Marco Anna Bergamaschi 2015-06-18 14:16:43 +02:00
  • e16cda9509 fix a typo and makefile Gemma Tinti 2015-06-17 17:30:41 +02:00
  • aa94f2f7be write headers is compulsory for eiger and shouldnt be in makefile Dhanya Maliakal 2015-06-16 16:28:53 +02:00
  • 8b282e3bbe write headers is compulsory for eiger Dhanya Maliakal 2015-06-16 16:28:24 +02:00
  • 9a61841ac7 git version update Dhanya Maliakal 2015-06-16 12:00:02 +02:00
  • 861753a5d1 formatted changes made by Martin, which inclded resolving fifo full problem, first frame problem; 32 bit mode sub frame and 16 byte ignore Dhanya Maliakal 2015-06-16 11:59:07 +02:00
  • 7b2934fb73 git version update Dhanya Maliakal 2015-06-16 11:56:58 +02:00
  • 8323f81e8a beb includes read, write functions, so that it doesnt have to go to locallink interface Dhanya Maliakal 2015-06-15 17:41:48 +02:00
  • bcf8d40fd2 minor changes, but posted semaphore in stop receiver so rxr not waiting forever for gui when it will never come Dhanya Maliakal 2015-06-12 17:46:50 +02:00
  • b11b7c1c09 beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable Dhanya Maliakal 2015-06-12 17:45:43 +02:00
  • e035eeaf08 not compulsory anymore for every frame for eiger Dhanya Maliakal 2015-06-12 17:44:30 +02:00
  • 2b05ceb281 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-06-12 13:00:21 +02:00
  • de0f35afb3 some jctb changes Anna Bergamaschi 2015-06-12 13:00:13 +02:00
  • d69c6df9ce 32 bit mode image reconstuction should work for frame numbers as well Dhanya Maliakal 2015-06-11 13:33:18 +02:00
  • 67628c74e1 removed all the scripts for just gitall Dhanya Maliakal 2015-06-11 12:35:53 +02:00
  • aa29f12bb8 removed all the scripts for just gitall Dhanya Maliakal 2015-06-11 12:34:44 +02:00
  • 13b35b319c removed all the scripts for just gitall Dhanya Maliakal 2015-06-11 12:34:15 +02:00
  • aca95703a9 tiny changes Dhanya Maliakal 2015-06-11 11:42:44 +02:00
  • a4de9a914a added a function to give frame number while reading next frame Dhanya Maliakal 2015-06-11 11:38:10 +02:00
  • b27f691d03 Revert "Solved merge conflicts" Martin Brückner 2015-06-11 11:30:40 +02:00
  • 28ed7d6b2d Solved merge conflicts Martin Brückner 2015-06-11 11:25:49 +02:00
  • b193237df3 Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW) Martin Brückner 2015-06-11 11:19:51 +02:00
  • fdaca88225 includes 32 bit subframes Dhanya Maliakal 2015-06-10 13:26:51 +02:00
  • 849d0de5cb not much valuable change Dhanya Maliakal 2015-06-10 12:23:38 +02:00
  • 7046d2ad6e fixed merge Dhanya Maliakal 2015-05-28 14:46:46 +02:00
  • 88ec090ee6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration cartier_s 2015-05-28 14:29:45 +02:00
  • 7e8cf810fb main in moenchReadDataMT [multi threading] cartier_s 2015-05-28 14:28:17 +02:00
  • 4f88e831c4 checks if receiver udp object was created before executing functions and hence always returns a ret Dhanya Maliakal 2015-05-26 17:01:42 +02:00
  • c0dac6fd27 receiver can return fail for a get and a message Dhanya Maliakal 2015-05-26 17:00:07 +02:00
  • cb51de145b Merge branch 'startlater' Dhanya Maliakal 2015-05-26 12:31:51 +02:00
  • 99196aa272 ignore 16 byte messages Dhanya Maliakal 2015-05-26 12:08:21 +02:00
  • ee4fa791be interleaving request messages to different ports of eiger detector Dhanya Maliakal 2015-05-26 12:07:43 +02:00
  • ee8b0b2ee7 knowing which repo Dhanya Maliakal 2015-05-22 10:22:53 +02:00
  • c840305189 starting receiver only at set detector type works Dhanya Maliakal 2015-05-21 17:39:17 +02:00
  • 2cd2dbadc0 included scripts for diff and status Dhanya Maliakal 2015-05-21 11:18:04 +02:00
  • 9c66e96770 receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore Dhanya Maliakal 2015-05-21 11:11:17 +02:00
  • 302d9ca0ed added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well Dhanya Maliakal 2015-05-20 12:01:49 +02:00
  • bbcd984df0 mapping of bottom and top for all bit modes work Dhanya Maliakal 2015-05-19 10:12:57 +02:00
  • 92dfb366f6 gemma offline reading works Dhanya Maliakal 2015-05-19 10:12:09 +02:00
  • 1f1581a1fa no_serial was merged to master Dhanya Maliakal 2015-05-13 14:41:25 +02:00
  • 49b0dce727 not significant Dhanya Maliakal 2015-05-13 10:30:39 +02:00
  • 11f6d883be Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Dhanya Maliakal 2015-05-12 14:28:48 +02:00
  • d9809925af debugging statements Dhanya Maliakal 2015-05-12 14:28:13 +02:00
  • bd3466b04f Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-05-04 13:49:10 +02:00
  • ba377ec273 Command adcreg added to write to adc registers Anna Bergamaschi 2015-05-04 13:48:46 +02:00
  • 9f8ed3a4b5 Added more debug messages for DMARTIN flag Martin Brückner 2015-04-28 17:19:04 +02:00
  • 992a298abc added dunny implementation as an example to combine TCPIP interface and custom UDP reciever Anna Bergamaschi 2015-04-21 15:09:50 +02:00
  • 7f7e7ca727 Fixed serial assignment. If top=1, serial=0 and vice versa. Martin Brückner 2015-04-21 11:57:31 +02:00
  • 8a8e1b7130 Remove -DMARTIN as default flag Martin Brückner 2015-04-21 11:11:32 +02:00
  • 399ae4e669 Added colors for MARTIN debug prints l_brueckner_m 2015-04-20 18:22:29 +02:00
  • 39cd82f0b8 Added Backend board FPGA temperature support l_brueckner_m 2015-04-20 18:20:02 +02:00
  • 0c2bd83e96 moved getchannel back to slsdetectordata as it doesnt work for eiger Dhanya Maliakal 2015-04-15 15:49:52 +02:00
  • e483141a15 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Dhanya Maliakal 2015-04-15 14:49:32 +02:00
  • 8f4c2001ae warning fixed Dhanya Maliakal 2015-04-15 14:49:06 +02:00
  • 83a766914f not necessary merge Dhanya Maliakal 2015-04-15 14:48:27 +02:00
  • 6b38ad10d1 eiger mapping of top Dhanya Maliakal 2015-04-15 14:43:37 +02:00
  • 5731ead4cb eiger top mapping done. bottom doesnt work Dhanya Maliakal 2015-04-15 14:38:32 +02:00
  • a513ff2c79 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Anna Bergamaschi 2015-04-15 10:16:44 +02:00
  • 1f6c5c26b4 eiger mapping for 32 bit done Dhanya Maliakal 2015-04-14 17:13:09 +02:00
  • 15bbb099d3 for mapping 32 bit eiger Dhanya Maliakal 2015-04-14 17:11:56 +02:00
  • 6cd28165ca top image reconstruct works with make flga Dhanya Maliakal 2015-04-10 17:11:26 +02:00
  • 31f06fb567 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-04-10 10:08:34 +02:00
  • 0c7f2bdceb Changes to pattern generator and jungfrau server Anna Bergamaschi 2015-04-10 10:08:12 +02:00
  • 904462b582 xmap, ymap added again to slsDetectorData Anna Bergamaschi 2015-04-01 13:04:27 +02:00
  • e0de23dd45 threshold to set all vcmp dacs for eiger Dhanya Maliakal 2015-04-01 12:17:55 +02:00
  • 85416acbea indiviual dac control for each detector enabled in gui Dhanya Maliakal 2015-04-01 12:05:09 +02:00
  • 48d672b918 Moved eiger related stuff from slsDetectorData to eigerHalfModule data, added xmap and ymap to slsDetectorData calss Anna Bergamaschi 2015-03-31 15:07:53 +02:00
  • ee0c6c4a05 1 sec usleep to stop receiver for eiger Dhanya Maliakal 2015-03-31 15:00:57 +02:00
  • b4f995084c Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Dhanya Maliakal 2015-03-31 14:59:49 +02:00
  • 9d3a171a28 1 sec usleep to stop receiver for eiger Dhanya Maliakal 2015-03-31 14:59:26 +02:00
  • db4e6ea678 still messing up Anna Bergamaschi 2015-03-31 14:50:45 +02:00
  • 3c363d82e8 messing up while updating and merging Anna Bergamaschi 2015-03-31 14:45:45 +02:00
  • b5e8c104db printouts for eigermapping Dhanya Maliakal 2015-03-31 14:45:41 +02:00
  • 5e59c86d72 Jungfrau10ModuleData modified Anna Bergamaschi 2015-03-31 14:41:06 +02:00
  • 714e1a7f72 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2015-03-31 13:55:21 +02:00
  • 1edcdff936 Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1 Anna Bergamaschi 2015-03-31 13:54:59 +02:00
  • e35867227f writing frame number to the file for eiger Dhanya Maliakal 2015-03-30 17:16:31 +02:00
  • 031ccdf070 change to server for no serial to work Dhanya Maliakal 2015-03-30 15:36:55 +02:00
  • 70c98a663d eiger mapping done Dhanya Maliakal 2015-03-27 17:42:23 +01:00
  • ea4f596077 removed conflicts Dhanya Maliakal 2015-03-26 11:29:29 +01:00
  • 1611dde9d4 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package Dhanya Maliakal 2015-03-25 15:37:31 +01:00
  • 24bcb04372 included flag for eiger fifo debug Dhanya Maliakal 2015-03-25 15:37:07 +01:00
  • 1ad0bc56e7 included slsDetectorUsers Dhanya Maliakal 2015-03-25 15:26:38 +01:00
  • 7924989fb1 some more changes for eiger mapping Dhanya Maliakal 2015-03-25 15:14:03 +01:00
  • 9b11df1c31 a trial version of eiger mapping data Dhanya Maliakal 2015-03-24 10:42:22 +01:00
  • 248848c666 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Leonardo Sala 2015-03-24 09:49:41 +01:00
  • f461ddf2b7 slsDetectorUSers re-added to Makefile - don't remove it again Anna Bergamaschi 2015-03-23 15:42:12 +01:00
  • 1df89d4ce2 test Leonardo Sala 2015-03-23 11:41:19 +01:00
  • 9e78bae614 solved bad_alloc Leonardo Sala 2015-03-23 11:18:05 +01:00
  • c9269d0f21 included a cstring include for compilation in slsReceiverData.h Dhanya Maliakal 2015-03-16 17:53:54 +01:00
  • 36191396b2 added pull.sh and fetch.sh Brückner Martin (PSI) 2015-03-13 13:35:40 +01:00
  • 5c14453c5d fixed histogram issues Dhanya Maliakal 2015-03-13 11:20:00 +01:00
  • 477b2fb467 acquire works properly now Dhanya Maliakal 2015-03-12 16:47:20 +01:00
  • 2c6f0c49a7 lets gui know if old plot Dhanya Maliakal 2015-03-12 13:45:45 +01:00