Dhanya Maliakal
|
6da59ca382
|
somewhere, but weird threads
|
2016-10-05 15:26:58 +02:00 |
|
Dhanya Maliakal
|
39baeade37
|
Merge branch 'developer' into zmqdata
|
2016-10-04 14:43:31 +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
|
7ead69a761
|
merged with developer after it merged with 2.1.1-rc(deactivate)
|
2016-10-04 14:10:52 +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
|
984698efad
|
merged with developer a lot of bug fixes from 14 sep to 30 sep
|
2016-10-04 13:36:04 +02:00 |
|
Dhanya Maliakal
|
0979d04693
|
works for deactivated server and receiver
|
2016-10-04 07:35:52 +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 |
|
Dhanya Maliakal
|
5f4a4b0d90
|
maybe fixed 16 bit rate corr eiger
|
2016-09-23 17:15:16 +02:00 |
|
Dhanya Maliakal
|
d904f7b32e
|
adding 16 bit rate correction in eiger
|
2016-09-23 14:28:20 +02:00 |
|
Dhanya Maliakal
|
1263e80d21
|
done
|
2016-09-16 12:49:27 +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
|
56a559090d
|
ratecorrection error def fixed
|
2016-08-11 13:59:05 +02:00 |
|
Dhanya Maliakal
|
56aaaaf182
|
fixed rate correction to not include 16 bit dr
|
2016-08-08 15:52:09 +02:00 |
|
Dhanya Maliakal
|
ef9d64de64
|
got rid of <0.00015 rate correction error check
|
2016-08-04 17:27:45 +02:00 |
|
Dhanya Maliakal
|
29ba1f4042
|
changed transmission delay commands to go through network parameters and included 10g flow control
|
2016-08-04 17:21:16 +02:00 |
|
Dhanya Maliakal
|
d28d737fb9
|
transmission delay added
|
2016-08-03 17:03:37 +02:00 |
|
Dhanya Maliakal
|
1db5ef4fd4
|
added 2 gain settings to eigeR
|
2016-08-03 10:35:11 +02:00 |
|
Dhanya Maliakal
|
c0db1a89a8
|
deactivate for eiger
|
2016-08-02 10:32:37 +02:00 |
|
Dhanya Maliakal
|
ac7063a1a5
|
check firmware version and api version upon server startup
|
2016-07-22 15:26:26 +02:00 |
|
Dhanya Maliakal
|
ee26339fd7
|
added more accurate temperature sensors for eiger, and to gui
|
2016-07-22 10:40:58 +02:00 |
|
Dhanya Maliakal
|
4939e47305
|
fixed dimensions, fixed rate corr bug, moved rate corr to server because config resets memory and ratecorr depends on client variables
|
2016-07-14 16:23:03 +02:00 |
|
Dhanya Maliakal
|
35b02c9cf0
|
added burst_trigger mode for eiger to replace trigger_readout mode
|
2016-07-04 15:47:32 +02:00 |
|
Dhanya Maliakal
|
db26135e89
|
undefined enum changed
|
2016-03-15 17:13:37 +01:00 |
|
Dhanya Maliakal
|
26933bd8bd
|
fixed undefined gain enum to a large number
|
2016-03-15 16:50:44 +01:00 |
|
Dhanya Maliakal
|
7b7d42f253
|
fixed the 8 byte iodelay trimfile bug, now writes as 4 bytes
|
2016-03-14 14:39:40 +01:00 |
|
|
|
d8007477b5
|
High Voltage index changed for jungfrau
|
2016-02-22 15:11:30 +01:00 |
|
Dhanya Maliakal
|
4eba07ca90
|
added error message tau/subexptime to error list
|
2016-02-17 18:01:58 +01:00 |
|
Dhanya Maliakal
|
3c4b0c24c8
|
rate correction for eiger implemented
|
2016-02-10 11:24:49 +01:00 |
|
Dhanya Maliakal
|
5029eb0c86
|
bug fixed maximum sub exposure time is in 10 ns and not ns
|
2016-02-08 15:25:28 +01:00 |
|
Dhanya Maliakal
|
f0c4a4a7e4
|
almost done
|
2016-02-08 15:20:19 +01:00 |
|
Dhanya Maliakal
|
07f1bd5c82
|
mid way, had to change to fix bug
|
2016-02-08 10:40:54 +01:00 |
|
Dhanya Maliakal
|
1fae912cb2
|
jungfrau server making it uniform, left to do: register confirmation and server_defs
|
2016-02-04 16:18:01 +01:00 |
|
Dhanya Maliakal
|
bef8d413d6
|
jungfrau done but not merged
|
2016-01-21 14:43:44 +01:00 |
|
Dhanya Maliakal
|
532ac38ad5
|
dont know
|
2015-12-09 16:15:23 +01:00 |
|
Dhanya Maliakal
|
61f0506c2c
|
settings for jungfrau
|
2015-12-01 16:43:23 +01:00 |
|
Dhanya Maliakal
|
c097dfc8b3
|
two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc
|
2015-11-20 16:28:48 +01:00 |
|
Dhanya Maliakal
|
e0464ef782
|
pulsing client side, and bug fix server side for reset partially
|
2015-11-19 16:15:59 +01:00 |
|
Dhanya Maliakal
|
8b0895add0
|
reset counter bit in eiger detector partially or completely
|
2015-11-17 16:39:36 +01:00 |
|
Dhanya Maliakal
|
66db11421f
|
implemented fifo depth configurable from client
|
2015-11-17 10:30:53 +01:00 |
|
Dhanya Maliakal
|
816543f358
|
detector ip for eiger is replaced by hardware ip for 1g
|
2015-11-06 11:10:51 +01:00 |
|
|
|
8972fa1143
|
EigerDetectorServer for firmware version 11, changes: direct write into udp block ram
|
2015-10-08 17:29:13 +02:00 |
|
Dhanya Maliakal
|
271838b2b5
|
changes to includes clkdivider and flags in gui and modify the server for proper checks
|
2015-09-10 11:29:15 +02:00 |
|
Dhanya Maliakal
|
584b9e6036
|
added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger
|
2015-09-04 15:54:12 +02:00 |
|
Dhanya Maliakal
|
cae286941a
|
added subframe exposure time settable
|
2015-09-03 15:16:48 +02:00 |
|
Dhanya Maliakal
|
0d83346943
|
continuous and storeinram variable
|
2015-07-24 09:21:38 +02:00 |
|
|
|
ba377ec273
|
Command adcreg added to write to adc registers
|
2015-05-04 13:48:46 +02:00 |
|
|
|
1edcdff936
|
Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1
|
2015-03-31 13:54:59 +02:00 |
|
|
|
9ac08e5e76
|
supports frames with many samples for jctb - obtained by faking number of chips in case of many samples
|
2015-01-30 12:58:53 +01:00 |
|
|
|
d10335e4a9
|
pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency
|
2014-11-25 11:38:19 +01:00 |
|
