|
|
bd3466b04f
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-05-04 13:49:10 +02:00 |
|
|
|
ba377ec273
|
Command adcreg added to write to adc registers
|
2015-05-04 13:48:46 +02:00 |
|
|
|
9f8ed3a4b5
|
Added more debug messages for DMARTIN flag
|
2015-04-28 17:19:04 +02:00 |
|
|
|
992a298abc
|
added dunny implementation as an example to combine TCPIP interface and custom UDP reciever
|
2015-04-21 15:09:50 +02:00 |
|
|
|
7f7e7ca727
|
Fixed serial assignment. If top=1, serial=0 and vice versa.
|
2015-04-21 11:57:31 +02:00 |
|
|
|
8a8e1b7130
|
Remove -DMARTIN as default flag
|
2015-04-21 11:11:32 +02:00 |
|
l_brueckner_m
|
399ae4e669
|
Added colors for MARTIN debug prints
|
2015-04-20 18:22:29 +02:00 |
|
l_brueckner_m
|
39cd82f0b8
|
Added Backend board FPGA temperature support
|
2015-04-20 18:20:02 +02:00 |
|
Dhanya Maliakal
|
0c2bd83e96
|
moved getchannel back to slsdetectordata as it doesnt work for eiger
|
2015-04-15 15:49:52 +02:00 |
|
Dhanya Maliakal
|
e483141a15
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-04-15 14:49:32 +02:00 |
|
Dhanya Maliakal
|
8f4c2001ae
|
warning fixed
|
2015-04-15 14:49:06 +02:00 |
|
Dhanya Maliakal
|
83a766914f
|
not necessary merge
|
2015-04-15 14:48:27 +02:00 |
|
Dhanya Maliakal
|
6b38ad10d1
|
eiger mapping of top
|
2015-04-15 14:43:37 +02:00 |
|
Dhanya Maliakal
|
5731ead4cb
|
eiger top mapping done. bottom doesnt work
|
2015-04-15 14:38:32 +02:00 |
|
|
|
a513ff2c79
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-04-15 10:16:44 +02:00 |
|
Dhanya Maliakal
|
1f6c5c26b4
|
eiger mapping for 32 bit done
|
2015-04-14 17:13:09 +02:00 |
|
Dhanya Maliakal
|
15bbb099d3
|
for mapping 32 bit eiger
|
2015-04-14 17:11:56 +02:00 |
|
Dhanya Maliakal
|
6cd28165ca
|
top image reconstruct works with make flga
|
2015-04-10 17:11:26 +02:00 |
|
|
|
31f06fb567
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-04-10 10:08:34 +02:00 |
|
|
|
0c7f2bdceb
|
Changes to pattern generator and jungfrau server
|
2015-04-10 10:08:12 +02:00 |
|
|
|
904462b582
|
xmap, ymap added again to slsDetectorData
|
2015-04-01 13:04:27 +02:00 |
|
Dhanya Maliakal
|
e0de23dd45
|
threshold to set all vcmp dacs for eiger
|
2015-04-01 12:17:55 +02:00 |
|
Dhanya Maliakal
|
85416acbea
|
indiviual dac control for each detector enabled in gui
|
2015-04-01 12:05:09 +02:00 |
|
|
|
48d672b918
|
Moved eiger related stuff from slsDetectorData to eigerHalfModule data, added xmap and ymap to slsDetectorData calss
|
2015-03-31 15:07:53 +02:00 |
|
Dhanya Maliakal
|
ee0c6c4a05
|
1 sec usleep to stop receiver for eiger
|
2015-03-31 15:00:57 +02:00 |
|
Dhanya Maliakal
|
b4f995084c
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-03-31 14:59:49 +02:00 |
|
Dhanya Maliakal
|
9d3a171a28
|
1 sec usleep to stop receiver for eiger
|
2015-03-31 14:59:26 +02:00 |
|
|
|
db4e6ea678
|
still messing up
|
2015-03-31 14:50:45 +02:00 |
|
|
|
3c363d82e8
|
messing up while updating and merging
|
2015-03-31 14:45:45 +02:00 |
|
Dhanya Maliakal
|
b5e8c104db
|
printouts for eigermapping
|
2015-03-31 14:45:41 +02:00 |
|
|
|
5e59c86d72
|
Jungfrau10ModuleData modified
|
2015-03-31 14:41:06 +02:00 |
|
|
|
714e1a7f72
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-03-31 13:55:21 +02:00 |
|
|
|
1edcdff936
|
Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1
|
2015-03-31 13:54:59 +02:00 |
|
Dhanya Maliakal
|
e35867227f
|
writing frame number to the file for eiger
|
2015-03-30 17:16:31 +02:00 |
|
Dhanya Maliakal
|
031ccdf070
|
change to server for no serial to work
|
2015-03-30 15:36:55 +02:00 |
|
Dhanya Maliakal
|
70c98a663d
|
eiger mapping done
|
2015-03-27 17:42:23 +01:00 |
|
Dhanya Maliakal
|
ea4f596077
|
removed conflicts
|
2015-03-26 11:29:29 +01:00 |
|
Dhanya Maliakal
|
1611dde9d4
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detectors_package
|
2015-03-25 15:37:31 +01:00 |
|
Dhanya Maliakal
|
24bcb04372
|
included flag for eiger fifo debug
|
2015-03-25 15:37:07 +01:00 |
|
Dhanya Maliakal
|
1ad0bc56e7
|
included slsDetectorUsers
|
2015-03-25 15:26:38 +01:00 |
|
Dhanya Maliakal
|
7924989fb1
|
some more changes for eiger mapping
|
2015-03-25 15:14:03 +01:00 |
|
Dhanya Maliakal
|
9b11df1c31
|
a trial version of eiger mapping data
|
2015-03-24 10:42:22 +01:00 |
|
|
|
248848c666
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-03-24 09:49:41 +01:00 |
|
|
|
f461ddf2b7
|
slsDetectorUSers re-added to Makefile - don't remove it again
|
2015-03-23 15:42:12 +01:00 |
|
|
|
1df89d4ce2
|
test
|
2015-03-23 11:41:19 +01:00 |
|
|
|
9e78bae614
|
solved bad_alloc
|
2015-03-23 11:18:24 +01:00 |
|
Dhanya Maliakal
|
c9269d0f21
|
included a cstring include for compilation in slsReceiverData.h
|
2015-03-16 17:53:54 +01:00 |
|
|
|
36191396b2
|
added pull.sh and fetch.sh
|
2015-03-13 13:35:40 +01:00 |
|
Dhanya Maliakal
|
5c14453c5d
|
fixed histogram issues
|
2015-03-13 11:20:00 +01:00 |
|
Dhanya Maliakal
|
477b2fb467
|
acquire works properly now
|
2015-03-12 16:47:20 +01:00 |
|
