detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 15:27:13 +02:00
Code Issues Actions Packages Releases Activity

Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1

Browse Source
This commit is contained in:
bergamaschi
2015-03-31 13:54:59 +02:00
parent f461ddf2b7
commit 1edcdff936
9 changed files with 362 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/jungfrauDetectorServer/mcb_funcs.c
View File

@ -1985,7 +1985,7 @@ int testExtPulse(int imod) {
//startStateMachine();
startReadOut();
usleep(100);
val1=(int*)(decode_data((int*)(fifo_read_event())));
val1=(int*)(decode_data((int*)(fifo_read_event(0))));
// val1=fifo_read_event();
//imod=0;
//for (imod=0; imod<nModX; imod++) {
@ -2054,7 +2054,7 @@ int testExtPulseMux(int imod, int ow) {
startReadOut();
usleep(100);
v1=(int*)(fifo_read_event());
v1=(int*)(fifo_read_event(0));
if (v1)
values=(int*)(decode_data(v1));
else {
@ -2129,7 +2129,7 @@ int testDataInOutMux(int imod, int ow, int num) {
printf("mux %d\n",ow);
startReadOut();
usleep(100);
v1=(int*)(fifo_read_event());
v1=(int*)(fifo_read_event(0));
if (v1)
values=(int*)(decode_data(v1));
else {