gotthard: everything done except gigabyte and adcwrite upto now

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@73 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2011-11-29 09:19:35 +00:00
parent 15a649c767
commit a77a6bac21
2 changed files with 5 additions and 3 deletions

View File

@ -944,10 +944,12 @@ int initConfGain(int val, int imod){
printf("Setting/Getting confgain of module:%d with val:%d\n",imod,val); printf("Setting/Getting confgain of module:%d with val:%d\n",imod,val);
#endif #endif
u_int32_t addr=GAIN_REG; u_int32_t addr=GAIN_REG;
if(val!=-1){
bus_w(addr,val); bus_w(addr,val);
#ifdef VERBOSE #ifdef VERBOSE
printf("Value sent to confGain reg is %d\n",val); printf("Value sent to confGain reg is %d\n",val);
#endif #endif
}
val=bus_r(addr); val=bus_r(addr);
#ifdef VERBOSE #ifdef VERBOSE
printf("Value read from confGain reg is %d\n",val); printf("Value read from confGain reg is %d\n",val);

View File

@ -931,7 +931,7 @@ int setSettings(int i)
} }
#ifdef VERBOSE #ifdef VERBOSE
printf("detector settings are %d\n",isett); printf("detector settings are %d and confGain is %d\n",isett,initConfGainByModule(-1,-1));
#endif #endif
if (isett==UNDEFINED && thisSettings==UNINITIALIZED) if (isett==UNDEFINED && thisSettings==UNINITIALIZED)
; ;