|
|
5ededf9be4
|
Merge branch 'main-rc' into b2.1.1
2.1.1
|
2020-11-30 15:16:57 +01:00 |
|
|
|
3e8774798a
|
Merge branch 'main-rc' into b2.1.0
2.1.0
|
2020-11-30 15:13:43 +01:00 |
|
Dhanya Maliakal
|
a2986784d3
|
Merge remote branch 'slsDetectorCalibration/2.1.1' into 2.1.1
|
2017-12-12 11:13:34 +01:00 |
|
Dhanya Maliakal
|
975cbb576e
|
Merge remote branch 'slsDetectorCalibration/2.1' into 2.1
|
2017-12-12 11:06:15 +01:00 |
|
Dhanya Maliakal
|
e48a92d9cd
|
Merge remote branch 'slsDetectorCalibration/2.0.5' into 2.0.5
2.0.5
|
2017-12-12 11:02:57 +01:00 |
|
Dhanya Maliakal
|
308d44e452
|
Merge remote branch 'slsDetectorGui/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
Dhanya Maliakal
|
69da61b1fb
|
Merge remote branch 'slsReceiverSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:22 +01:00 |
|
Dhanya Maliakal
|
460168ce04
|
Merge remote branch 'slsDetectorSoftware/2.1.1' into 2.1.1
|
2017-12-04 16:47:21 +01:00 |
|
Dhanya Maliakal
|
4e429c0d77
|
Merge remote branch 'slsDetectorGui/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
Dhanya Maliakal
|
bf4fab549d
|
Merge remote branch 'slsReceiverSoftware/2.1' into 2.1
|
2017-12-04 16:45:34 +01:00 |
|
Dhanya Maliakal
|
f7705eb1da
|
Merge remote branch 'slsDetectorSoftware/2.1' into 2.1
|
2017-12-04 16:45:32 +01:00 |
|
Dhanya Maliakal
|
a2217e2066
|
Merge remote branch 'slsReceiverSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:33:33 +01:00 |
|
Dhanya Maliakal
|
aaa02706fc
|
Merge remote branch 'slsDetectorSoftware/2.0.5' into 2.0.5
|
2017-12-04 15:31:52 +01:00 |
|
Dhanya Maliakal
|
dd0a1f60c6
|
proper update of progressfile bug
|
2016-10-20 08:30:38 +02:00 |
|
Dhanya Maliakal
|
e819ed26e1
|
proper update of progressfile bug
|
2016-10-20 08:24:54 +02:00 |
|
Dhanya Maliakal
|
09c853ae26
|
fixed the print file packet loss progress bug
|
2016-10-20 07:55:56 +02:00 |
|
Dhanya Maliakal
|
839896c7e6
|
fixed the print file packet loss progress bug
|
2016-10-19 15:53:26 +02:00 |
|
Dhanya Maliakal
|
44a69e2aee
|
improved locking a bit
|
2016-10-19 10:46:03 +02:00 |
|
Dhanya Maliakal
|
121e9faf56
|
trying with the actual 1 getframescaught
|
2016-10-19 10:32:11 +02:00 |
|
Dhanya Maliakal
|
673e7c8f20
|
removed asking only 1 for framescaugh
|
2016-10-19 10:22:35 +02:00 |
|
Dhanya Maliakal
|
4a7e246604
|
removed asking only 1 for framescaugh
|
2016-10-19 10:21:29 +02:00 |
|
Dhanya Maliakal
|
749c64204e
|
done showing error when detectors not added in sharedmemory due to connect failure
|
2016-10-19 08:15:52 +02:00 |
|
Dhanya Maliakal
|
7f293115c4
|
moved f_activate to receiver funcs from detectors funcs
|
2016-10-10 08:43:18 +02:00 |
|
Dhanya Maliakal
|
f59f40a659
|
ask only 1 for frames caught for 9m
|
2016-10-10 08:41:03 +02:00 |
|
Dhanya Maliakal
|
64fd82f92c
|
fixed bug in gui that overwrites the individual sls file path values with the multi value, included a febl and febr temp read
|
2016-10-10 08:39:46 +02:00 |
|
Dhanya Maliakal
|
cd232fd732
|
fixed bug in gui that overwrites the individual sls file path values with the multi value
|
2016-10-10 08:17:34 +02:00 |
|
Dhanya Maliakal
|
03cdda99ae
|
fixed bug in temp front fpga
|
2016-10-07 15:54:46 +02:00 |
|
Dhanya Maliakal
|
28f96f4b51
|
included a febl and febr temp read
|
2016-10-07 15:44:13 +02:00 |
|
Dhanya Maliakal
|
dce9911164
|
ask only 1 for frames caught for 9m
|
2016-10-07 13:48:45 +02:00 |
|
Dhanya Maliakal
|
2fdc4389e2
|
Merge branch '2.1' into 2.1.1-rc
|
2016-10-06 08:51:06 +02:00 |
|
Dhanya Maliakal
|
5082435501
|
fixed bug in gui that overwrites the individual sls file path values with the multi value
|
2016-10-06 08:50:08 +02:00 |
|
Dhanya Maliakal
|
94667c5dde
|
got rif of unnecessary usleep in lisetning
|
2016-10-04 15:15:08 +02:00 |
|
Dhanya Maliakal
|
2a4bd8022e
|
works for deactivated server and receiver
|
2016-10-04 07:36:00 +02:00 |
|
Dhanya Maliakal
|
0979d04693
|
works for deactivated server and receiver
|
2016-10-04 07:35:52 +02:00 |
|
Dhanya Maliakal
|
572047b72d
|
was making 3 threads for each set detector type command, because it created standard receiver object each time
|
2016-09-30 15:13:12 +02:00 |
|
Gemma Tinti
|
4b7743b8ad
|
update manual
|
2016-09-28 14:25:24 +02:00 |
|
Dhanya Maliakal
|
953e513a2d
|
updatereveiger
|
2016-09-22 17:18:35 +02:00 |
|
Dhanya Maliakal
|
a7c180eb1c
|
settings initially at UNINITIALIZED in eiger server
|
2016-09-22 17:16:49 +02:00 |
|
Dhanya Maliakal
|
7745bf5e0c
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer
|
2016-09-20 10:44:11 +02:00 |
|
Dhanya Maliakal
|
8c88de899a
|
added in gitignore to ignore build and tests
|
2016-09-20 10:43:59 +02:00 |
|
Gemma Tinti
|
7a55866966
|
manual
|
2016-09-14 17:41:07 +02:00 |
|
|
|
1044fc68ab
|
Merge branch 'cmake' of git.psi.ch:sls_detectors_software/sls_detectors_package into cmake
|
2016-09-02 16:28:28 +02:00 |
|
|
|
36904db3ca
|
now GUI is compatible with qwt 6.1
|
2016-09-02 16:28:01 +02:00 |
|
Dhanya Maliakal
|
4a7d7ec9e1
|
Merge branch 'developer' into cmake
|
2016-09-02 16:00:04 +02:00 |
|
Gemma Tinti
|
c940607088
|
Merge branch '2.1-rc' into developer
|
2016-09-01 18:12:59 +02:00 |
|
Gemma Tinti
|
d2240884b4
|
settings dir for eiger
|
2016-09-01 18:10:49 +02:00 |
|
Gemma Tinti
|
90d2e6b82a
|
eiger manual
|
2016-09-01 15:50:36 +02:00 |
|
|
|
61d347b45d
|
FindQwt returns qwt verison
This can be used to check compatibility
|
2016-09-01 14:42:47 +02:00 |
|
|
|
13aa0599af
|
add variable for GUI libraries
|
2016-09-01 12:05:59 +02:00 |
|
|
|
59d8584a9e
|
README for compilation
|
2016-09-01 11:16:17 +02:00 |
|
