Commit Graph
7977 Commits
Author SHA1 Message Date
Maliakal Dhanya 5cfe7b4338 32 bit image, and 32 bit mode frame number for eiger fixed, startframeindex included in readframe for all det in tcpip class 2014-09-16 16:29:36 +02:00
sala cfacc6ad6e modified to support REST receiver, still not properly working 2014-09-15 16:52:53 +02:00
sala 4971e26d7b modified Makefiles to support REST interface 2014-09-15 16:51:59 +02:00
sala 7986746194 from private to protected 2014-09-15 16:33:57 +02:00
sala 3d4b2e9fee Merge branch 'eiger_receiver_temp' into eiger_receiver
Conflicts:
	client/Makefile
2014-09-12 16:22:59 +02:00
sala 13a54224eb updating makefiles 2014-09-12 16:22:22 +02:00
sala 03b04bca74 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_detectors_package into eiger_receiver
Conflicts:
	Makefile
2014-09-12 16:18:34 +02:00
sala 388f96c046 Makefile updates 2014-09-12 16:16:10 +02:00
sala e0ee1fb386 fixed bug in config reading; added printout in MAkefile 2014-09-12 16:09:43 +02:00
sala 056fb4e119 updating Makefile 2014-09-12 13:47:19 +02:00
sala 81132f4d78 updating Makefile 2014-09-12 13:47:05 +02:00
sala 102f9a2d05 updating Makefile 2014-09-12 13:46:48 +02:00
sala eb1f9db9af added build dir 2014-09-12 13:25:01 +02:00
Maliakal Dhanya baf65e8318 some clone changes and setting the gui image read frequency to be one for eiger in gui 2014-09-10 14:39:02 +02:00
sala 50d049539e minor 2014-09-10 10:17:36 +02:00
sala 3e0f618fbe cleaning 2014-09-10 10:09:29 +02:00
sala ce0b32b558 Merge branch 'eiger_receiver' into devel_leo
Conflicts:
	Makefile
	include/UDPInterface.h
	slsReceiver/Makefile
	slsReceiver/eigerReceiver/eigerReceiver.cpp
	slsReceiver/eigerReceiver/eigerReceiverDummy.cpp
	slsReceiver/eigerReceiver/eigerReceiverTest.cpp
2014-09-10 10:07:33 +02:00
sala 59fc6fbaf8 moved .h into include. Second round of cleaning 2014-09-10 09:39:11 +02:00
sala 3d08fc3e58 update gitignore 2014-09-10 09:20:49 +02:00
sala 27780d02d8 cleaning the project 2014-09-10 09:19:35 +02:00
sala dc04efbbb1 working logger! 2014-09-09 18:13:31 +02:00
sala 811bac16ec trying to make it work... 2014-09-09 17:16:51 +02:00
Maliakal Dhanya c2b885f230 version 2014-09-09 17:01:43 +02:00
Maliakal Dhanya 92c56739d9 version 2014-09-09 17:01:25 +02:00
Maliakal Dhanya 62464441ee vtrimbit size and vthreshold common for eiger 2014-09-09 17:00:26 +02:00
sala c62594c7ab added REST and Standard implementations 2014-09-09 16:38:27 +02:00
sala 51b610e32a added logger 2014-09-09 16:37:35 +02:00
sala 59980a4b90 beginning of reimplementation of the REST interface 2014-09-09 15:46:58 +02:00
Maliakal Dhanya 0d66e62d10 fixed histogram for trimbits and threshold 2014-09-09 15:46:36 +02:00
Maliakal Dhanya 205fc06200 trimbits work. 2014-09-09 15:43:18 +02:00
Maliakal Dhanya 7faac70c3f trimbits work. 2014-09-09 15:42:16 +02:00
sala 5641101705 added logger 2014-09-08 16:01:18 +02:00
sala 87efbf764e cleaning 2014-09-08 11:45:52 +02:00
sala 9a7e45aa56 cleaning 2014-09-08 11:45:33 +02:00
sala 9489cb8040 moved config reading to utilities.h
using GetOpt for CLI option reading
2014-09-08 11:44:58 +02:00
sala dc6045a14c first factory-based version compiling, still very very preliminary 2014-09-05 16:54:32 +02:00
Maliakal Dhanya 705a25c9e0 fixed moench dac error 2014-08-29 16:42:26 +02:00
Maliakal Dhanya c5a4f357bf got rid of extra servers for eiger, converted to c and it works 2014-08-29 16:41:19 +02:00
Maliakal Dhanya 10ca7c10e8 got rid of extra servers for eiger, converted to c and it works 2014-08-29 16:40:27 +02:00
Maliakal Dhanya 367bdd9c2f no change 2014-08-08 14:03:30 +02:00
Maliakal Dhanya c33657f04d histogram for 2d and s curves 2014-08-05 11:30:36 +02:00
sala 68dfe6f6a6 added old (workaround) EigerReceiver. Still not using slsReceiverBase 2014-08-05 11:08:11 +02:00
sala b50da5b198 updated makefile for eiger receiver 2014-08-05 11:05:24 +02:00
Maliakal Dhanya 8a26eef0bf scans for 2d detectors should read every frame 2014-07-31 12:14:09 +02:00
Maliakal Dhanya 3e36b603f9 receiver nth frame and acquisition indices for eiger 2014-07-31 12:13:15 +02:00
Maliakal Dhanya 56da3f42cc trimbits not working yet, nth frame works for eiger, scans work for eiger 2014-07-31 12:11:33 +02:00
bergamaschi 91c0a083b3 argv, argc moved from tcpip interface to slsReceiver 2014-07-25 10:28:56 +02:00
Maliakal Dhanya 7e46a407c6 added trimval function, but sending trimbits from char to int bug 2014-07-21 16:39:36 +02:00
Maliakal Dhanya e15d6077df small changes with trimbits 2014-07-18 17:38:39 +02:00
bergamaschi 4f04fc5457 removed callbacks from tcpip interface 2014-07-18 12:57:10 +02:00