diff --git a/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c b/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c index 69c8ad98c..c2fcde194 100755 --- a/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c @@ -1982,7 +1982,7 @@ int startStateMachine(){ bus_w16(CONTROL_REG, FIFO_RESET_BIT); bus_w16(CONTROL_REG, 0x0); bus_w16(CONTROL_REG, START_ACQ_BIT | START_EXPOSURE_BIT); - usleep(20); + // usleep(20); bus_w16(CONTROL_REG, 0x0); //verify /* if(bus_r(STATUS_REG) & RUN_BUSY_BIT) */ @@ -1996,10 +1996,10 @@ int startStateMachine(){ /* if(i!=0) */ /* printf("tried to start state machine %d times\n",i); */ - if(i==100){ - printf("\n***********COULD NOT START STATE MACHINE***************\n"); - return FAIL; - } +/* if(i==100){ */ +/* printf("\n***********COULD NOT START STATE MACHINE***************\n"); */ +/* return FAIL; */ +/* } */ printf("statusreg=%08x\n",bus_r(STATUS_REG)); return OK; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index 7b5695cec..4bd1f0ef8 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -896,8 +896,8 @@ slsDetectorDefs::sls_detector_module* slsDetector::createModule(detectorType t) na=1; break; case JUNGFRAUCTB: - nch=1//32; - nm=32; + nch=32;//32; + nm=1; nc=1; nd=8; // dacs+adcs na=1;