 Dhanya Maliakal
|
7046d2ad6e
|
fixed merge
|
2015-05-28 14:46:46 +02:00 |
|
|
cartier_s
|
88ec090ee6
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration
Conflicts:
slsDetectorData.h
|
2015-05-28 14:29:45 +02:00 |
|
|
cartier_s
|
7e8cf810fb
|
main in moenchReadDataMT [multi threading]
|
2015-05-28 14:28:17 +02:00 |
|
|
Dhanya Maliakal
|
4f88e831c4
|
checks if receiver udp object was created before executing functions and hence always returns a ret
|
2015-05-26 17:01:42 +02:00 |
|
|
Dhanya Maliakal
|
c0dac6fd27
|
receiver can return fail for a get and a message
|
2015-05-26 17:00:07 +02:00 |
|
|
Dhanya Maliakal
|
cb51de145b
|
Merge branch 'startlater'
|
2015-05-26 12:31:51 +02:00 |
|
|
Dhanya Maliakal
|
99196aa272
|
ignore 16 byte messages
|
2015-05-26 12:08:21 +02:00 |
|
|
Dhanya Maliakal
|
ee4fa791be
|
interleaving request messages to different ports of eiger detector
|
2015-05-26 12:07:43 +02:00 |
|
|
Dhanya Maliakal
|
ee8b0b2ee7
|
knowing which repo
|
2015-05-22 10:22:53 +02:00 |
|
|
Dhanya Maliakal
|
c840305189
|
starting receiver only at set detector type works
|
2015-05-21 17:39:17 +02:00 |
|
|
Dhanya Maliakal
|
2cd2dbadc0
|
included scripts for diff and status
|
2015-05-21 11:18:04 +02:00 |
|
|
Dhanya Maliakal
|
9c66e96770
|
receiver stop command line should not have receiver readout, acquire doesnt hacve it anymore
|
2015-05-21 11:11:17 +02:00 |
|
|
Dhanya Maliakal
|
302d9ca0ed
|
added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well
|
2015-05-20 12:01:49 +02:00 |
|
|
Dhanya Maliakal
|
bbcd984df0
|
mapping of bottom and top for all bit modes work
|
2015-05-19 10:12:57 +02:00 |
|
|
Dhanya Maliakal
|
92dfb366f6
|
gemma offline reading works
|
2015-05-19 10:12:09 +02:00 |
|
|
Dhanya Maliakal
|
1f1581a1fa
|
no_serial was merged to master
|
2015-05-13 14:41:25 +02:00 |
|
|
Dhanya Maliakal
|
49b0dce727
|
not significant
|
2015-05-13 10:30:39 +02:00 |
|
|
Dhanya Maliakal
|
11f6d883be
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software
|
2015-05-12 14:28:48 +02:00 |
|
|
Dhanya Maliakal
|
d9809925af
|
debugging statements
|
2015-05-12 14:28:13 +02:00 |
|
 bergamaschi
|
bd3466b04f
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-05-04 13:49:10 +02:00 |
|
|
bergamaschi
|
ba377ec273
|
Command adcreg added to write to adc registers
|
2015-05-04 13:48:46 +02:00 |
|
 brueckner_m
|
9f8ed3a4b5
|
Added more debug messages for DMARTIN flag
|
2015-04-28 17:19:04 +02:00 |
|
|
bergamaschi
|
992a298abc
|
added dunny implementation as an example to combine TCPIP interface and custom UDP reciever
|
2015-04-21 15:09:50 +02:00 |
|
|
brueckner_m
|
7f7e7ca727
|
Fixed serial assignment. If top=1, serial=0 and vice versa.
|
2015-04-21 11:57:31 +02:00 |
|
|
brueckner_m
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
31f06fb567
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2015-04-10 10:08:34 +02:00 |
|
|
bergamaschi
|
0c7f2bdceb
|
Changes to pattern generator and jungfrau server
|
2015-04-10 10:08:12 +02:00 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
db4e6ea678
|
still messing up
|
2015-03-31 14:50:45 +02:00 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
5e59c86d72
|
Jungfrau10ModuleData modified
|
2015-03-31 14:41:06 +02:00 |
|