detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-07 18:40:42 +02:00
Code Issues Actions Packages Releases Activity

may be changes to jungfrau detector server

Browse Source
This commit is contained in:
bergamaschi 2015-08-28 10:54:59 +02:00
parent 2b05ceb281
commit dc05e58a57
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.c
View File

@ -1982,7 +1982,7 @@ int startStateMachine(){
bus_w16(CONTROL_REG, FIFO_RESET_BIT); bus_w16(CONTROL_REG, FIFO_RESET_BIT);
bus_w16(CONTROL_REG, 0x0); bus_w16(CONTROL_REG, 0x0);
bus_w16(CONTROL_REG, START_ACQ_BIT | START_EXPOSURE_BIT); bus_w16(CONTROL_REG, START_ACQ_BIT | START_EXPOSURE_BIT);
usleep(20); // usleep(20);
bus_w16(CONTROL_REG, 0x0); bus_w16(CONTROL_REG, 0x0);
//verify //verify
/* if(bus_r(STATUS_REG) & RUN_BUSY_BIT) */ /* if(bus_r(STATUS_REG) & RUN_BUSY_BIT) */
@ -1996,10 +1996,10 @@ int startStateMachine(){
/* if(i!=0) */ /* if(i!=0) */
/* printf("tried to start state machine %d times\n",i); */ /* printf("tried to start state machine %d times\n",i); */
if(i==100){ /* if(i==100){ */
printf("\n***********COULD NOT START STATE MACHINE***************\n"); /* printf("\n***********COULD NOT START STATE MACHINE***************\n"); */
return FAIL; /* return FAIL; */
} /* } */
printf("statusreg=%08x\n",bus_r(STATUS_REG)); printf("statusreg=%08x\n",bus_r(STATUS_REG));
return OK; return OK;

4
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -896,8 +896,8 @@ slsDetectorDefs::sls_detector_module* slsDetector::createModule(detectorType t)
na=1; na=1;
break; break;
case JUNGFRAUCTB: case JUNGFRAUCTB:
nch=1//32; nch=32;//32;
nm=32; nm=1;
nc=1; nc=1;
nd=8; // dacs+adcs nd=8; // dacs+adcs
na=1; na=1;