detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 06:50:02 +02:00
Code Issues Actions Packages Releases Activity
1,448 Commits 44 Branches 100 Tags
Commit Graph

1448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dhanya Maliakal
04165a9da8 rest implementation, index issues 2017-07-13 14:44:34 +02:00
Dhanya Maliakal
e3667f6827 can set zmqport from receiver 2017-07-13 12:18:07 +02:00
Dhanya Maliakal
68b1959a85 excluding detector server directories in makefile 2017-07-11 11:16:37 +02:00
Dhanya Maliakal
931a5840e8 changes to gotthard server to include write adc, and also changes to fix the dma=dma+1 2017-07-11 10:54:21 +02:00
Dhanya Maliakal
a583f3d6e2 some more changes to make file for automatic versioning 2017-07-10 11:18:41 +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
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
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
99dad79572 Somewhere 2017-07-03 13:46:06 +02:00
Dhanya Maliakal
da4ffb235c ensuring set detector type is the first call 2017-07-03 13:32:10 +02:00
Dhanya Maliakal
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +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
8992d51787 correct binary jungfrau 2017-06-28 11:26:35 +02:00
Dhanya Maliakal
4905f49108 added updateversion into makefile while compiling 2017-06-28 11:23:19 +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
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
Dhanya Maliakal
57ae305c7d parallelized enabledatastreaming 2017-06-22 16:59:41 +02:00
Dhanya Maliakal
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
Dhanya Maliakal
cd86c708dc updaterev 2017-06-22 14:36:02 +02:00
Dhanya Maliakal
f66950d312 fixed the 9m master server having to be rebooted for hv to work 2017-06-22 14:32:24 +02:00
Dhanya Maliakal
fe73e09aa4 removing unnecessary printouts, ensuring lost packets are 0xff 2017-06-21 17:05:47 +02:00
Dhanya Maliakal
df71899244 fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector server udpated 2017-06-20 12:40:28 +02:00
Dhanya Maliakal
48f853aa1a fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets) 2017-06-20 12:38:59 +02:00
Dhanya Maliakal
e2e25f6e62 changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place 2017-06-19 14:29:45 +02:00
Dhanya Maliakal
c2af014dad new server 2017-06-14 12:07:58 +02:00
Dhanya Maliakal
a46a8cc686 updaterev 2017-06-14 11:41:11 +02:00
Dhanya Maliakal
9ab2c1eb1f new server 2017-06-14 11:40:35 +02:00
Dhanya Maliakal
84d07a3e0c updaterev 2017-06-14 11:39:07 +02:00
Dhanya Maliakal
5176ad521f merged with annas, removed a <<< head merge conflict 2017-06-14 11:36:44 +02:00
Dhanya Maliakal
feb1ef4ea5 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-06-14 11:28:24 +02:00
Dhanya Maliakal
00e742e0e0 took out also the ADC and serialspi 2017-06-14 11:28:16 +02:00
Dhanya Maliakal
a95dbd2215 made some functions common 2017-06-14 10:43:15 +02:00
Anna Bergamaschi
cbbdd8eeab Merged to developer 2017-06-13 15:30:33 +02:00
Anna Bergamaschi
8caab4e562 Modicfications for chiptestboard and moench03 module 2017-06-13 15:28:45 +02:00
Dhanya Maliakal
cb7b8713cf fixed the precision problem in converting double to long long int (0.0000325 *1E9), cant find another example 2017-06-13 12:58:56 +02:00
Dhanya Maliakal
3d8903b2da updaterev 2017-06-12 18:54:58 +02:00
Dhanya Maliakal
e1eba8dec3 new servers 2017-06-12 18:53:18 +02:00
Dhanya Maliakal
3fbbeea434 update rev 2017-06-12 18:51:52 +02:00
Dhanya Maliakal
d41abc2b1c added new jungfraustructure, wiht common detector tcp interface 2017-06-12 18:50:18 +02:00