Commit Graph

  • 3a07f0d785 fixed dr bug Leonardo Sala 2014-11-07 15:49:01 +01:00
  • 9ec5541b58 removed hardcoded DR and nframes Leonardo Sala 2014-11-07 14:42:56 +01:00
  • 8a63e7e184 added log printouts. Added hardcoded REST configuration Leonardo Sala 2014-11-05 11:43:17 +01:00
  • a690e4d830 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Anna Bergamaschi 2014-10-27 12:01:54 +01:00
  • 72ba2ae901 offset added to receiver funcs Anna Bergamaschi 2014-10-27 12:01:29 +01:00
  • b24f374155 setting number of frames had a bug in eiger server, refactored code a bit Maliakal Dhanya 2014-10-20 17:33:22 +02:00
  • 5acb1419af the version given to esrf Maliakal Dhanya 2014-10-16 14:14:34 +02:00
  • b85490b528 the version given to esrf Maliakal Dhanya 2014-10-16 14:14:20 +02:00
  • dd8f48929c the version given to esrf Maliakal Dhanya 2014-10-16 14:14:00 +02:00
  • 5a5372350f stop server incl in makefile, master chosen based on top or bottom module at the moment Maliakal Dhanya 2014-10-16 13:49:56 +02:00
  • cd3a502167 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software Anna Bergamaschi 2014-10-15 09:22:40 +02:00
  • f2dddd88cd JUNGFRAU detector type added Anna Bergamaschi 2014-10-15 09:22:17 +02:00
  • 327c2106df Some fixes for the CTB Anna Bergamaschi 2014-10-14 17:43:25 +02:00
  • 74ef04e726 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2014-10-14 17:03:50 +02:00
  • 308b3aa9b1 Client and jungfrau server funcs added for pattern generator Anna Bergamaschi 2014-10-14 17:03:13 +02:00
  • e94e678f7d receiver bottom module included, and image reconstruction works for all bit modes, receiver still for a half module each, although two of them combined to make one module image Maliakal Dhanya 2014-10-14 15:42:32 +02:00
  • 0896fb137f Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Maliakal Dhanya 2014-10-14 15:39:11 +02:00
  • bbf26927dd full module server works now, slave and master yet to be done Maliakal Dhanya 2014-10-14 15:38:45 +02:00
  • 347a36b7c1 module acquisition works, edit getrunstatus, added a small code for master incomplete, adjusted server to look for element in position 1 instead of zero Maliakal Dhanya 2014-10-06 11:01:51 +02:00
  • 1679977cad some eiger setup file changes Maliakal Dhanya 2014-10-06 10:56:01 +02:00
  • 2d66e1f731 Added pattern generator - must still implement client-server commands Anna Bergamaschi 2014-10-03 10:43:12 +02:00
  • 18188cd095 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2014-10-01 10:39:23 +02:00
  • fec9a30e6a Added jungfrau detector server (not functional, though) Anna Bergamaschi 2014-10-01 10:38:47 +02:00
  • 665401669e udpport2 module Maliakal Dhanya 2014-09-26 11:19:26 +02:00
  • d8c7201749 module udpport2 Maliakal Dhanya 2014-09-26 11:18:59 +02:00
  • 546d43dedb Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver Sala Leonardo 2014-09-22 14:46:34 +02:00
  • f05248cd32 fixes Leonardo Sala 2014-09-22 14:09:31 +02:00
  • e5864d4343 Added status resetting for REST Leonardo Sala 2014-09-22 11:45:01 +02:00
  • b427452f39 able to send data to eigerbe Leonardo Sala 2014-09-17 15:56:27 +02:00
  • fa6ab0b324 usleep added for 32 bit mode and debug statements for eiger server Maliakal Dhanya 2014-09-16 16:31:51 +02:00
  • 5cfe7b4338 32 bit image, and 32 bit mode frame number for eiger fixed, startframeindex included in readframe for all det in tcpip class Maliakal Dhanya 2014-09-16 16:29:36 +02:00
  • cfacc6ad6e modified to support REST receiver, still not properly working Leonardo Sala 2014-09-15 16:52:53 +02:00
  • 4971e26d7b modified Makefiles to support REST interface Leonardo Sala 2014-09-15 16:51:59 +02:00
  • 7986746194 from private to protected Leonardo Sala 2014-09-15 16:33:57 +02:00
  • 3d4b2e9fee Merge branch 'eiger_receiver_temp' into eiger_receiver Leonardo Sala 2014-09-12 16:22:59 +02:00
  • 13a54224eb updating makefiles Leonardo Sala 2014-09-12 16:22:22 +02:00
  • 03b04bca74 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_detectors_package into eiger_receiver Leonardo Sala 2014-09-12 16:18:34 +02:00
  • 388f96c046 Makefile updates Leonardo Sala 2014-09-12 16:16:10 +02:00
  • e0ee1fb386 fixed bug in config reading; added printout in MAkefile Leonardo Sala 2014-09-12 16:09:43 +02:00
  • 056fb4e119 updating Makefile Leonardo Sala 2014-09-12 13:47:19 +02:00
  • 81132f4d78 updating Makefile Leonardo Sala 2014-09-12 13:47:05 +02:00
  • 102f9a2d05 updating Makefile Leonardo Sala 2014-09-12 13:46:48 +02:00
  • eb1f9db9af added build dir Leonardo Sala 2014-09-12 13:24:08 +02:00
  • baf65e8318 some clone changes and setting the gui image read frequency to be one for eiger in gui Maliakal Dhanya 2014-09-10 14:39:02 +02:00
  • 50d049539e minor Sala Leonardo 2014-09-10 10:17:36 +02:00
  • 3e0f618fbe cleaning Sala Leonardo 2014-09-10 10:09:29 +02:00
  • ce0b32b558 Merge branch 'eiger_receiver' into devel_leo Sala Leonardo 2014-09-10 10:07:33 +02:00
  • 59fc6fbaf8 moved .h into include. Second round of cleaning Sala Leonardo 2014-09-10 09:39:11 +02:00
  • 3d08fc3e58 update gitignore Sala Leonardo 2014-09-10 09:20:49 +02:00
  • 27780d02d8 cleaning the project Sala Leonardo 2014-09-10 09:19:35 +02:00
  • dc04efbbb1 working logger! Sala Leonardo 2014-09-09 18:13:31 +02:00
  • 811bac16ec trying to make it work... Sala Leonardo 2014-09-09 17:16:51 +02:00
  • c2b885f230 version Maliakal Dhanya 2014-09-09 17:01:43 +02:00
  • 92c56739d9 version Maliakal Dhanya 2014-09-09 17:01:25 +02:00
  • 62464441ee vtrimbit size and vthreshold common for eiger Maliakal Dhanya 2014-09-09 17:00:26 +02:00
  • c62594c7ab added REST and Standard implementations Sala Leonardo 2014-09-09 16:38:27 +02:00
  • 51b610e32a added logger Sala Leonardo 2014-09-09 16:37:35 +02:00
  • 59980a4b90 beginning of reimplementation of the REST interface Sala Leonardo 2014-09-09 15:46:58 +02:00
  • 0d66e62d10 fixed histogram for trimbits and threshold Maliakal Dhanya 2014-09-09 15:46:36 +02:00
  • 205fc06200 trimbits work. Maliakal Dhanya 2014-09-09 15:43:18 +02:00
  • 7faac70c3f trimbits work. Maliakal Dhanya 2014-09-09 15:42:16 +02:00
  • 5641101705 added logger Sala Leonardo 2014-09-08 16:01:18 +02:00
  • 87efbf764e cleaning Sala Leonardo 2014-09-08 11:45:52 +02:00
  • 9a7e45aa56 cleaning Sala Leonardo 2014-09-08 11:45:33 +02:00
  • 9489cb8040 moved config reading to utilities.h Sala Leonardo 2014-09-08 11:44:58 +02:00
  • dc6045a14c first factory-based version compiling, still very very preliminary Sala Leonardo 2014-09-05 16:54:32 +02:00
  • 705a25c9e0 fixed moench dac error Maliakal Dhanya 2014-08-29 16:42:26 +02:00
  • c5a4f357bf got rid of extra servers for eiger, converted to c and it works Maliakal Dhanya 2014-08-29 16:41:19 +02:00
  • 10ca7c10e8 got rid of extra servers for eiger, converted to c and it works Maliakal Dhanya 2014-08-29 16:40:27 +02:00
  • 367bdd9c2f no change Maliakal Dhanya 2014-08-08 14:03:30 +02:00
  • c33657f04d histogram for 2d and s curves Maliakal Dhanya 2014-08-05 11:30:36 +02:00
  • 68dfe6f6a6 added old (workaround) EigerReceiver. Still not using slsReceiverBase Sala Leonardo 2014-08-05 11:08:11 +02:00
  • b50da5b198 updated makefile for eiger receiver Sala Leonardo 2014-08-05 11:05:24 +02:00
  • 8a26eef0bf scans for 2d detectors should read every frame Maliakal Dhanya 2014-07-31 12:14:09 +02:00
  • 3e36b603f9 receiver nth frame and acquisition indices for eiger Maliakal Dhanya 2014-07-31 12:13:15 +02:00
  • 56da3f42cc trimbits not working yet, nth frame works for eiger, scans work for eiger Maliakal Dhanya 2014-07-31 12:11:33 +02:00
  • 91c0a083b3 argv, argc moved from tcpip interface to slsReceiver Anna Bergamaschi 2014-07-25 10:28:56 +02:00
  • 7e46a407c6 added trimval function, but sending trimbits from char to int bug Maliakal Dhanya 2014-07-21 16:39:36 +02:00
  • e15d6077df small changes with trimbits Maliakal Dhanya 2014-07-18 17:38:39 +02:00
  • 4f04fc5457 removed callbacks from tcpip interface Anna Bergamaschi 2014-07-18 12:57:10 +02:00
  • b957cae85f added receiver interface, have not separated from eigerDummyReceiver yet Maliakal Dhanya 2014-07-18 12:27:32 +02:00
  • c4f8c4a2aa set_dac function updated for mythen and gotthard as well Anna Bergamaschi 2014-07-18 10:29:27 +02:00
  • e53058640b Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software Anna Bergamaschi 2014-07-18 09:40:11 +02:00
  • 8cee0a7332 implemented setModule, setTrimbits function Anna Bergamaschi 2014-07-18 09:39:27 +02:00
  • 4814fd56c1 slsdetectorcalibration is a repository on its own Maliakal Dhanya 2014-07-16 15:34:58 +02:00
  • 95947778c5 tried some stuff with ifg Maliakal Dhanya 2014-07-16 15:09:26 +02:00
  • 024e386f50 gotthard executable has mv in server Maliakal Dhanya 2014-07-16 10:48:07 +02:00
  • 5e6153af9e fixed bug mv in dacs for command line Maliakal Dhanya 2014-07-16 10:45:35 +02:00
  • fd6bf1d34b added slsdetectorcalibration to gitignore Maliakal Dhanya 2014-07-16 10:44:53 +02:00
  • 8b119f58ee switching master branch with separate_receiver branch Sala Leonardo 2014-07-14 14:28:36 +02:00
  • b388d08dbe eiger dac settings Maliakal Dhanya 2014-07-11 16:59:09 +02:00
  • 828a2dbd17 10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file Maliakal Dhanya 2014-07-11 13:06:48 +02:00
  • 7c58d3db46 enabling 10Gbe for eiger, advanced settings and also mV for dacs for all detectors Maliakal Dhanya 2014-07-11 12:56:11 +02:00
  • bbb0a05fca incorporating ten giga into the receiver Maliakal Dhanya 2014-07-11 12:53:53 +02:00
  • e11da6fd5b eiger dac files updated with dac units instead of mV Maliakal Dhanya 2014-07-11 12:51:42 +02:00
  • baac5df54e Julia's first test :) Smith Julia Helga 2014-07-03 14:47:30 +02:00
  • b5193b9bc3 no change Maliakal Dhanya 2014-07-03 14:03:31 +02:00
  • 34f3ba80f5 git ignore added Maliakal Dhanya 2014-07-03 13:59:11 +02:00
  • 4d9bbeecc3 eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working Maliakal Dhanya 2014-07-02 10:57:03 +02:00
  • 018b800117 eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working Maliakal Dhanya 2014-07-02 10:55:32 +02:00