3499 Commits

Author SHA1 Message Date
Dhanya Maliakal
ef9fd77850 some more changes to make file for automatic versioning, but changes to cpp file does not affect make, need to include that 2017-07-10 11:20:50 +02:00
Dhanya Maliakal
672c42a20e some more changes to make file for automatic versioning 2017-07-10 11:20:26 +02:00
Dhanya Maliakal
dbce25fdea some more changes to make file for automatic versioning 2017-07-10 11:20:15 +02:00
Dhanya Maliakal
a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +02:00
Dhanya Maliakal
cf0ef68cda fixed adc and num dacs for jungfrau in gui 2017-07-06 18:34:00 +02:00
Dhanya Maliakal
be6925c504 fixed temperature for jungfrau in server, also for negative values 2017-07-06 16:07:01 +02:00
Dhanya Maliakal
14bba171e7 conflict gitversion 2017-07-03 17:45:06 +02:00
Dhanya Maliakal
1e50bc4cc0 conflict git 2017-07-03 17:44:52 +02:00
Dhanya Maliakal
374b07a126 merge developer 2017-07-03 17:42:06 +02:00
Dhanya Maliakal
460a44a9b1 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:31 +02:00
Dhanya Maliakal
f944d7cae4 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:24 +02:00
Dhanya Maliakal
b4309a9f60 changed jungfrau temperature conversion but binary to follow 2017-07-03 14:45:44 +02:00
Dhanya Maliakal
539ab79e99 changed jungfrau temperature conversion 2017-07-03 14:45:29 +02:00
Dhanya Maliakal
99dad79572 Somewhere 2017-07-03 13:46:06 +02:00
Dhanya Maliakal
26f9b1ccbd Somewhere 2017-07-03 13:45:45 +02:00
Dhanya Maliakal
da4ffb235c ensuring set detector type is the first call 2017-07-03 13:32:10 +02:00
Dhanya Maliakal
b03e35a8d6 sorted receiver client interface, more consistent 2017-07-03 13:31:17 +02:00
Dhanya Maliakal
f8c04a6a51 sorted the receiver client interface, more manageable 2017-06-30 18:17:33 +02:00
Dhanya Maliakal
7033d43e61 changed makefile to find libraries 2017-06-30 12:21:48 +02:00
Dhanya Maliakal
bd9f19f6c7 changed the makefile a bit to find libraries 2017-06-30 12:20:42 +02:00
Dhanya Maliakal
a4c07ba9a0 added black background for reciever to see gray font better 2017-06-30 12:19:27 +02:00
Dhanya Maliakal
4b9a8c1dad makefiles and versioning update complete 2017-06-29 17:10:28 +02:00
Dhanya Maliakal
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +02:00
Dhanya Maliakal
c01931e5a6 makefiles and versioning update complete 2017-06-29 17:09:46 +02:00
Dhanya Maliakal
7afbd8f0f0 makefiles and versioning update complete 2017-06-29 17:09:34 +02:00
Dhanya Maliakal
b6eb4cbb61 testing changes 2017-06-29 10:18:51 +02:00
Dhanya Maliakal
21e1fcf693 trying with gui makefile changes 2017-06-29 09:27:26 +02:00
Dhanya Maliakal
cfff7969e3 changes for Makefile dependencies 2017-06-28 18:52:43 +02:00
Dhanya Maliakal
6bfbb075c8 ensuring fiel permissions 2017-06-28 18:18:30 +02:00
Dhanya Maliakal
1a74ceca3e ensuring file permissions 2017-06-28 18:16:55 +02:00
Dhanya Maliakal
7990dd6f77 fixed makefile and included correct versioning while compiling 2017-06-28 18:13:47 +02:00
Dhanya Maliakal
f4857355b6 fixed new header for eiger 2017-06-28 16:53:01 +02:00
Dhanya Maliakal
81d68bebc6 Merge branch 'developer' into eigerheaderchange 2017-06-28 11:30:46 +02:00
Dhanya Maliakal
8992d51787 correct binary jungfrau 2017-06-28 11:26:35 +02:00
Dhanya Maliakal
e79827384a included update git versionign in each server, removing the main one 2017-06-28 11:24:30 +02:00
Dhanya Maliakal
4905f49108 added updateversion into makefile while compiling 2017-06-28 11:23:19 +02:00
Dhanya Maliakal
073d30bf61 added updateversion into makefile while compiling 2017-06-28 11:21:10 +02:00
Dhanya Maliakal
3515951bb8 added updateversion into makefile while compiling 2017-06-28 11:18:55 +02:00
Dhanya Maliakal
fde7ddf832 added updateversion into makefile while compiling 2017-06-28 11:00:21 +02:00
Dhanya Maliakal
7a8d0b8dad added updateversion into makefile while compiling 2017-06-28 10:57:39 +02:00
Dhanya Maliakal
56645a48af added updateversion into makefile while compiling 2017-06-28 10:54:27 +02:00
Dhanya Maliakal
a7d3006cda added updateversion into makefile while compiling 2017-06-28 10:48:03 +02:00
Dhanya Maliakal
c2624daa9a uncommented a print 2017-06-28 10:27:40 +02:00
Dhanya Maliakal
2126e2a723 added updategit 2017-06-28 10:24:49 +02:00
Dhanya Maliakal
c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
Dhanya Maliakal
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
Dhanya Maliakal
22796d0d27 updaterev 2017-06-27 17:43:19 +02:00
Dhanya Maliakal
e6f1a90ed7 changes 2017-06-27 14:57:43 +02:00
Dhanya Maliakal
5dd2f273fc eigerserver changes, need to include martins changes 2017-06-27 10:22:55 +02:00
Dhanya Maliakal
1ed4407c11 parallelizing adcs and dacs 2017-06-23 17:26:46 +02:00