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

fixed the dac problem

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@28 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-15 17:21:05 +00:00
parent 63bfdb9cb9
commit 30c11d7589
14 changed files with 214 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -182,11 +182,11 @@ void qTabDeveloper::CreateADCWidgets(){
void qTabDeveloper::SetDacValues(int id){
#ifdef VERYVERBOSE
#ifdef VERBOSE
cout << "Setting dac:" <<dacNames[id] << " : " << spinDacs[id]->value() << endl;
#endif
spinDacs[id]->setValue(myDet->setDAC(spinDacs[id]->value(),getSLSIndex(id)));
spinDacs[id]->setValue((double)myDet->setDAC(spinDacs[id]->value(),getSLSIndex(id)));
}
@ -246,7 +246,7 @@ void qTabDeveloper::RefreshAdcs(){
#endif
adcTimer->stop();
for(int i=0;i<NUM_ADC_WIDGETS;i++)
spinAdcs[i]->setValue(myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));
spinAdcs[i]->setValue((double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));
adcTimer->start(ADC_TIMEOUT);
}
@ -260,8 +260,7 @@ void qTabDeveloper::Refresh(){
#endif
//dacs
for(int i=0;i<NUM_DAC_WIDGETS;i++)
spinDacs[i]->setValue(myDet->setDAC(-1,getSLSIndex(i)));
spinDacs[i]->setValue((double)myDet->setDAC(-1,getSLSIndex(i)));
//adcs
RefreshAdcs();
}