Commit Graph

4087 Commits

Author SHA1 Message Date
da4ffb235c ensuring set detector type is the first call 2017-07-03 13:32:10 +02:00
b03e35a8d6 sorted receiver client interface, more consistent 2017-07-03 13:31:17 +02:00
f8c04a6a51 sorted the receiver client interface, more manageable 2017-06-30 18:17:33 +02:00
7033d43e61 changed makefile to find libraries 2017-06-30 12:21:48 +02:00
bd9f19f6c7 changed the makefile a bit to find libraries 2017-06-30 12:20:42 +02:00
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
4b9a8c1dad makefiles and versioning update complete 2017-06-29 17:10:28 +02:00
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +02:00
c01931e5a6 makefiles and versioning update complete 2017-06-29 17:09:46 +02:00
7afbd8f0f0 makefiles and versioning update complete 2017-06-29 17:09:34 +02:00
b6eb4cbb61 testing changes 2017-06-29 10:18:51 +02:00
21e1fcf693 trying with gui makefile changes 2017-06-29 09:27:26 +02:00
cfff7969e3 changes for Makefile dependencies 2017-06-28 18:52:43 +02:00
6bfbb075c8 ensuring fiel permissions 2017-06-28 18:18:30 +02:00
1a74ceca3e ensuring file permissions 2017-06-28 18:16:55 +02:00
7990dd6f77 fixed makefile and included correct versioning while compiling 2017-06-28 18:13:47 +02:00
f4857355b6 fixed new header for eiger 2017-06-28 16:53:01 +02:00
81d68bebc6 Merge branch 'developer' into eigerheaderchange 2017-06-28 11:30:46 +02:00
8992d51787 correct binary jungfrau 2017-06-28 11:26:35 +02:00
e79827384a included update git versionign in each server, removing the main one 2017-06-28 11:24:30 +02:00
4905f49108 added updateversion into makefile while compiling 2017-06-28 11:23:19 +02:00
073d30bf61 added updateversion into makefile while compiling 2017-06-28 11:21:10 +02:00
3515951bb8 added updateversion into makefile while compiling 2017-06-28 11:18:55 +02:00
fde7ddf832 added updateversion into makefile while compiling 2017-06-28 11:00:21 +02:00
7a8d0b8dad added updateversion into makefile while compiling 2017-06-28 10:57:39 +02:00
56645a48af added updateversion into makefile while compiling 2017-06-28 10:54:27 +02:00
a7d3006cda added updateversion into makefile while compiling 2017-06-28 10:48:03 +02:00
c2624daa9a uncommented a print 2017-06-28 10:27:40 +02:00
2126e2a723 added updategit 2017-06-28 10:24:49 +02:00
c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
ca358e4d17 changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate 2017-06-27 17:46:32 +02:00
22796d0d27 updaterev 2017-06-27 17:43:19 +02:00
e6f1a90ed7 changes 2017-06-27 14:57:43 +02:00
0b6aeac364 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-06-27 10:40:19 +02:00
5dd2f273fc eigerserver changes, need to include martins changes 2017-06-27 10:22:55 +02:00
ffd3cb6511 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-06-26 13:03:08 +02:00
dfb8a1f7ad small modifications for jctb and moench03 module 2017-06-26 13:03:01 +02:00
1ed4407c11 parallelizing adcs and dacs 2017-06-23 17:26:46 +02:00
f7e4dbc99e getadc must specify -1 for imod, as imod in multi might be default 0 2017-06-23 17:26:33 +02:00
57ae305c7d parallelized enabledatastreaming 2017-06-22 16:59:41 +02:00
5d75d8371b unnecessary printout 2017-06-22 16:59:18 +02:00
bbbd4731d7 ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring 2017-06-22 16:44:29 +02:00
df01ca7e4b ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring 2017-06-22 16:44:13 +02:00
931e750d65 fixed gui starting up without the config file 2017-06-22 15:26:00 +02:00
697fc5b85e updaterev 2017-06-22 14:36:22 +02:00
cd86c708dc updaterev 2017-06-22 14:36:02 +02:00
cffdf7fede updaterev 2017-06-22 14:33:24 +02:00
c05b89a77d updating exe 2017-06-22 14:32:52 +02:00
f66950d312 fixed the 9m master server having to be rebooted for hv to work 2017-06-22 14:32:24 +02:00
98cb8de478 when using userReceiver with many instances of the receiver in one program, the index will keep increasing, hence need to adjust zmq port and det index in file name 2017-06-22 12:27:17 +02:00