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:
l_maliakal_d
2013-01-30 16:41:36 +00:00
parent 7d96d8b3af
commit 22bd638f64
12 changed files with 349 additions and 173 deletions

View File

@ -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;