Dhanya Maliakal
|
fa7536e1d1
|
merge with 2.1.1-rc to be latest
|
2016-10-20 07:38:08 +02:00 |
|
Dhanya Maliakal
|
81d96a047d
|
slsDetector/slsDetectorCommand.cpp
|
2016-10-20 07:31:53 +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
|
749c64204e
|
done showing error when detectors not added in sharedmemory due to connect failure
|
2016-10-19 08:15:52 +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
|
13cff71faf
|
got rid of activate function definition redeclaration in receiver funcs
|
2016-10-04 14:43:02 +02:00 |
|
Dhanya Maliakal
|
a4bb3fe4dd
|
merged with 2.1.1-rc inclding deactivate detectr and receiver
|
2016-10-04 14:06:47 +02:00 |
|
Dhanya Maliakal
|
0979d04693
|
works for deactivated server and receiver
|
2016-10-04 07:35:52 +02:00 |
|
Dhanya Maliakal
|
f513fb06fb
|
switching the gpio definitions into function implementation
|
2016-09-30 07:56:54 +02:00 |
|
Dhanya Maliakal
|
d3c4d52118
|
updaterev
|
2016-09-29 10:29:48 +02:00 |
|
Dhanya Maliakal
|
5ae3522028
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-09-29 10:28:37 +02:00 |
|
Dhanya Maliakal
|
813b7ba6e7
|
added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits
|
2016-09-29 10:28:27 +02:00 |
|
Gemma Tinti
|
8a80cb489d
|
change server with new boundary for counts above teh max
|
2016-09-27 20:47:59 +02:00 |
|
Dhanya Maliakal
|
5c81abdce0
|
jungfrau programming change
|
2016-09-26 12:00:23 +02:00 |
|
Dhanya Maliakal
|
5f4a4b0d90
|
maybe fixed 16 bit rate corr eiger
|
2016-09-23 17:15:16 +02:00 |
|
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
|
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 |
|
|
|
988426dc96
|
Added adc command for chiptestboard
|
2016-09-05 10:49:47 +02:00 |
|
|
|
f8b62bba64
|
add cmake configuration
|
2016-08-31 20:54:06 +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 |
|
|
|
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 |
|
Dhanya Maliakal
|
08fd848504
|
updatereveiger
|
2016-08-18 10:31:10 +02:00 |
|
Dhanya Maliakal
|
d13a76af25
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2016-08-17 10:30:15 +02:00 |
|
Dhanya Maliakal
|
e0c45f4afd
|
solved paralel start bug. due to handshaking deficit in thread start
|
2016-08-17 10:29:47 +02:00 |
|
|
|
b90ca7b864
|
Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench
|
2016-08-16 15:15:24 +02:00 |
|
Dhanya Maliakal
|
fb8f49985b
|
changes to test
|
2016-08-15 15:14:15 +02:00 |
|
Dhanya Maliakal
|
597f5e5d2a
|
got rid of unnecesaary handshaking for -1 in dynamic range in receiver
|
2016-08-15 11:15:52 +02:00 |
|
Dhanya Maliakal
|
1f9dc775f6
|
ensure receiver is updated when detector timer values are updated (force_update)
|
2016-08-12 17:44:28 +02:00 |
|
Dhanya Maliakal
|
332b0d221b
|
removed unnecessary logs
|
2016-08-12 12:13:43 +02:00 |
|
Dhanya Maliakal
|
7239ce083b
|
updaterev
|
2016-08-12 11:17:39 +02:00 |
|
Dhanya Maliakal
|
6f5e15f60a
|
changed executable name
|
2016-08-12 11:08:03 +02:00 |
|
Dhanya Maliakal
|
04f2a5c5ed
|
temporarily removed parallel start to debug bug, fixed flat channel bug, fixed bad channel bug
|
2016-08-12 10:53:26 +02:00 |
|
Dhanya Maliakal
|
56a559090d
|
ratecorrection error def fixed
|
2016-08-11 13:59:05 +02:00 |
|
