diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c index 2e4e29c21..14dd66871 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c @@ -1665,11 +1665,15 @@ u_int32_t* fifo_read_event() if (runBusy()==0) { t = bus_r(LOOK_AT_ME_REG); if ((t&0x1)==0) { +#ifdef VERBOSE printf("no frame found - exiting "); printf("%08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); +#endif return NULL; } else { +#ifdef VERBOSE printf("no frame found %x status %x\n", bus_r(LOOK_AT_ME_REG),runState()); +#endif break; } } @@ -1677,9 +1681,9 @@ u_int32_t* fifo_read_event() } -//#ifdef VERBOSE +#ifdef VERBOSE printf("before readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); -//#endif +#endif dma_memcpy(now_ptr,values ,dataBytes); @@ -1693,10 +1697,10 @@ u_int32_t* fifo_read_event() printf("********\n"); //memcpy(now_ptr, values, dataBytes); #endif -//#ifdef VERBOSE +#ifdef VERBOSE printf("Copying to ptr %08x %d\n",(unsigned int)(now_ptr), dataBytes); printf("after readout %08x %08x\n", runState(), bus_r(LOOK_AT_ME_REG)); -//#endif +#endif if (storeInRAM>0) { now_ptr+=dataBytes; diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 3205b84f9..ae3509ce5 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -69,7 +69,8 @@ int init_detector( int b) { if (b) { #ifdef MCB_FUNCS initDetector(); - printf("\n----initdetector done! new serverRdRR\n\n"); + printf("\n***initdetector done*** \n\n"); +#endif testFpga(); testRAM(); //gotthard specific @@ -85,10 +86,11 @@ int init_detector( int b) { setPeriod(1e9); setDelay(0); setGates(0); -#endif + setTiming(GET_EXTERNAL_COMMUNICATION_MODE); setMaster(GET_MASTER); setSynchronization(GET_SYNCHRONIZATION_MODE); + startReceiver(0); } strcpy(mess,"dummy message"); strcpy(lastClientIP,"none");