3997 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	ab5229bcbf	bugfix zmq ip was being overwritten	2017-11-23 17:48:30 +01:00
Dhanya Maliakal	5eb8402742	bugfix zmq streaming both on	2017-11-23 17:28:35 +01:00
Dhanya Maliakal	585661412c	Merge branch '3.0.1' into developer	2017-11-23 17:20:13 +01:00
Dhanya Maliakal	dc5384f0f9	copy zmq port even if receiver not online, else it is lost	2017-11-23 17:20:07 +01:00
Dhanya Maliakal	935fecefde	copy zmq ip even if receiver not online, else it is lost	2017-11-23 17:18:40 +01:00
Dhanya Maliakal	20dc338c90	when changing network parameter, switch off data streaming only if on	2017-11-23 17:00:12 +01:00
Dhanya Maliakal	2c276db579	solved merge conflict in changes to use ZmqSocket.h externally	2017-11-23 16:35:31 +01:00
Dhanya Maliakal	b14ea217ee	Merge branch '3.0.1' into zmqchange	2017-11-23 16:34:14 +01:00
Dhanya Maliakal	da3ca9f306	changes to use ZmqSocket.h externally without further changes	2017-11-23 16:28:02 +01:00
Dhanya Maliakal	a57e8edd88	jctb setting dr correctly	2017-11-23 16:15:38 +01:00
Dhanya Maliakal	ad64df01c7	somewhere	2017-11-23 14:53:40 +01:00
Dhanya Maliakal	8538604c0f	somewhere	2017-11-23 14:53:37 +01:00
Dhanya Maliakal	d23c9d52ed	somewhere	2017-11-23 14:53:33 +01:00
Dhanya Maliakal	2ac170db98	removed data streaming shutdown from command line to allow external gui	2017-11-23 11:52:46 +01:00
Dhanya Maliakal	ab93835ce2	merge conflict to include datastreaming in client comment	2017-11-23 10:29:08 +01:00
Dhanya Maliakal	3b292bdeb6	need to enable data streaming for client	2017-11-23 10:27:59 +01:00
Dhanya Maliakal	43140811bd	one measurement in users class	2017-11-23 10:25:35 +01:00
Dhanya Maliakal	34908edd6a	Merge branch '3.0.1' into developer	2017-11-23 10:22:03 +01:00
Dhanya Maliakal	856ad76247	included setreceiver online in users class, so that one can start using users without config file	2017-11-23 10:21:54 +01:00
Dhanya Maliakal	29f3387d73	Merge branch '3.0.1' into developer	2017-11-23 09:34:22 +01:00
Dhanya Maliakal	4749e8c4e4	modified users client to work without config and better print out	2017-11-23 09:34:12 +01:00
Dhanya Maliakal	a1d325a115	Merge branch '3.0.1' into developer	2017-11-23 09:20:22 +01:00
Dhanya Maliakal	3034cf87d0	changes that might be reverted in detser	2017-11-23 09:20:20 +01:00
Dhanya Maliakal	447451231c	modified users client to work without config and better print out	2017-11-22 18:09:16 +01:00
Dhanya Maliakal	0b45d73e0c	Merge branch '3.0.1' into developer	2017-11-22 18:02:45 +01:00
Dhanya Maliakal	7860637b46	switching off data streaming from command line only in receiver start and not in receiver as a whoel put command	2017-11-22 18:02:36 +01:00
Dhanya Maliakal	c0bfe46aa1	enabling client in developer user api	2017-11-22 18:00:41 +01:00
Dhanya Maliakal	26829585dc	Merge branch '3.0.1' into developer	2017-11-22 17:47:28 +01:00
Dhanya Maliakal	ea3c722552	made a bin in manual api to be able to compile here	2017-11-22 17:47:16 +01:00
Dhanya Maliakal	c0a1f83691	Merge branch '3.0.1' into developer	2017-11-22 17:43:49 +01:00
Dhanya Maliakal	4ecbfada5b	Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1	2017-11-22 17:43:12 +01:00
Dhanya Maliakal	d47abb140f	removed detreceivernocall	2017-11-22 17:43:00 +01:00
Dhanya Maliakal	fb3c903c04	Merge branch '3.0.1' into developer	2017-11-22 17:06:51 +01:00
Dhanya Maliakal	6753f8ba6c	network parameter should return with extra plus at the end like hostname	2017-11-22 17:06:43 +01:00
Dhanya Maliakal	db6947cc9c	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-11-22 15:08:33 +01:00
Dhanya Maliakal	590fac9e07	making nx and ny available for jctb in call back	2017-11-22 15:08:09 +01:00
Anna Bergamaschi	400585be6a	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-11-22 12:34:28 +01:00
Anna Bergamaschi	dcfa6fb100	Fixed filename problem with CPU readout and trimval command for mythen	2017-11-22 12:34:14 +01:00
Dhanya Maliakal	39a20e1616	comment	2017-11-22 11:34:55 +01:00
Dhanya Maliakal	114c45c04a	making gui work temporarily for jctb	2017-11-22 09:27:42 +01:00
Dhanya Maliakal	4159e83fd6	making gui work temporarily for jctb	2017-11-22 09:27:01 +01:00
Dhanya Maliakal	3a26c95c0d	Merge branch '3.0.1' into developer	2017-11-21 15:46:21 +01:00
Dhanya Maliakal	8c45f94496	updated npixelsy for jungfrau effecting hdf5 mapping	2017-11-21 15:46:10 +01:00
Gemma Tinti	f2f00fec06	Merge branch '3.0.1' into developer	2017-11-21 15:35:19 +01:00
Gemma Tinti	e023cb186f	manual	2017-11-21 15:34:56 +01:00
Dhanya Maliakal	7f58b77dfb	Merge branch '3.0.1' into developer	2017-11-21 15:12:32 +01:00
Dhanya Maliakal	fd4dd5b1e9	removed printout	2017-11-21 15:12:05 +01:00
Dhanya Maliakal	5d34358f44	changin zmqip in rxr should also restart streaming	2017-11-21 15:11:29 +01:00
Dhanya Maliakal	8328b30cbd	removed merge conflicts from bug fix of zmq buffering while acquire from command line	2017-11-21 14:58:07 +01:00
Dhanya Maliakal	9c55cb4974	removed merge conflicts from bug fix of zmq buffering while acquire from command line	2017-11-21 14:57:52 +01:00