Dhanya Maliakal
|
1b61e10e36
|
forgot to add eiger binary
|
2016-09-23 14:32:21 +02:00 |
|
Dhanya Maliakal
|
d904f7b32e
|
adding 16 bit rate correction in eiger
|
2016-09-23 14:28:20 +02:00 |
|
Dhanya Maliakal
|
c678199802
|
Merge branch '2.1-rc' into developer
|
2016-09-22 17:19:10 +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
|
d0501c3139
|
creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc)
|
2016-09-21 16:37:29 +02:00 |
|
Dhanya Maliakal
|
a1df8bdc15
|
done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc
|
2016-09-20 15:11:39 +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 |
|
Dhanya Maliakal
|
d751c626b3
|
done with eiger
|
2016-09-20 10:42:43 +02:00 |
|
Dhanya Maliakal
|
904d21d0be
|
only missing data left to be handled in zmqthread in receiver
|
2016-09-19 17:21:23 +02:00 |
|
Dhanya Maliakal
|
38d477a1ad
|
bug fixed, rapidjson parse error
|
2016-09-19 12:34:31 +02:00 |
|
Dhanya Maliakal
|
f517eb7a41
|
included json example with dummy values
|
2016-09-16 17:19:37 +02:00 |
|
Dhanya Maliakal
|
c16f251442
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata
|
2016-09-16 15:41:05 +02:00 |
|
Dhanya Maliakal
|
1263e80d21
|
done
|
2016-09-16 12:49:27 +02:00 |
|
Dhanya Maliakal
|
1da4b07e73
|
works, need to do json header and send dataready
|
2016-09-15 17:15:55 +02:00 |
|
Dhanya Maliakal
|
a821442b1a
|
almosst
|
2016-09-15 12:16:01 +02:00 |
|
Dhanya Maliakal
|
0f9a841c4a
|
almost done
|
2016-09-15 10:17:16 +02:00 |
|
Gemma Tinti
|
7a55866966
|
manual
|
2016-09-14 17:41:07 +02:00 |
|
Dhanya Maliakal
|
a80da4f677
|
Merge branch 'developer' into cmake
|
2016-09-14 14:38:54 +02:00 |
|
|
|
721249231f
|
add missing preprocessor macro
|
2016-09-14 12:03:39 +02:00 |
|
Dhanya Maliakal
|
33807b7fac
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata
|
2016-09-14 10:43:33 +02:00 |
|
Dhanya Maliakal
|
557eccb74d
|
almost there
|
2016-09-14 10:42:51 +02:00 |
|
Dhanya Maliakal
|
652d29f2d9
|
almost done
|
2016-09-09 17:51:36 +02:00 |
|
|
|
988426dc96
|
Added adc command for chiptestboard
|
2016-09-05 10:49:47 +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 |
|
|
|
0807e130e4
|
optionally build calibrationWizards
|
2016-09-01 11:14:29 +02:00 |
|
|
|
1a0550301b
|
cmake config file from ROOT with compatibility fixes
|
2016-09-01 11:13:27 +02:00 |
|
|
|
f8b62bba64
|
add cmake configuration
|
2016-08-31 20:54:06 +02:00 |
|
|
|
316ed783a8
|
add cmake configuration
|
2016-08-31 20:49:58 +02:00 |
|
Dhanya Maliakal
|
6adc373e18
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-08-30 16:14:13 +02:00 |
|
Dhanya Maliakal
|
aad1885bf5
|
updaterev
|
2016-08-30 16:13:18 +02:00 |
|
|
|
13aa48e3ec
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-08-30 09:30:53 +02:00 |
|
|
|
d5f80831dd
|
Changes to jctb server to correctly change the power supplies
|
2016-08-30 09:30:31 +02:00 |
|
Dhanya Maliakal
|
cf34103d1f
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-08-24 16:47:14 +02:00 |
|
Dhanya Maliakal
|
079c7dc169
|
removed setup_beb.txt not required
|
2016-08-24 16:47:05 +02:00 |
|
Dhanya Maliakal
|
1f7fbcfae2
|
adding the git ignore change for the .log, .aux etc and for the jctbgui
|
2016-08-24 12:02:01 +02:00 |
|
|
|
511d3e3970
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-08-22 14:33:09 +02:00 |
|
|
|
c6c11f6740
|
Added v_a command for chiptestboard
|
2016-08-22 14:32:42 +02:00 |
|
|
|
3703d06684
|
Added section on GOTTHARD data format to the manual
|
2016-08-18 11:53:37 +02:00 |
|
Dhanya Maliakal
|
08fd848504
|
updatereveiger
|
2016-08-18 10:31:10 +02:00 |
|
|
|
4ac7df5b90
|
Added section on GOTTHARD data format to the manual
|
2016-08-18 09:09:35 +02:00 |
|
