mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-17 15:27:13 +02:00
the gotthard receiver works for short frames, gui commented out for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
@ -78,6 +78,7 @@ int init_detector( int b) {
|
||||
|
||||
prepareADC();
|
||||
setDAQRegister(-1);
|
||||
cleanFifo();
|
||||
setSettings(GET_SETTINGS,-1);
|
||||
//Initialization
|
||||
setFrames(1);
|
||||
@ -2604,7 +2605,8 @@ int configure_mac(int file_des) {
|
||||
if (ret==OK){
|
||||
if(runBusy()){
|
||||
ret=stopStateMachine();
|
||||
strcpy(mess,"could not stop detector acquisition to configure mac");
|
||||
if(ret==FAIL)
|
||||
strcpy(mess,"could not stop detector acquisition to configure mac");
|
||||
}
|
||||
|
||||
if(ret==OK)
|
||||
@ -2614,6 +2616,8 @@ int configure_mac(int file_des) {
|
||||
#endif
|
||||
if (ret==FAIL)
|
||||
printf("configuring MAC of mod %d failed\n", imod);
|
||||
else
|
||||
printf("Configuremac successful of mod %d and adc %d\n",imod,retval);
|
||||
|
||||
if (differentClients)
|
||||
ret=FORCE_UPDATE;
|
||||
|
Reference in New Issue
Block a user