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

fixed moench dac error

Browse Source
This commit is contained in:
Maliakal Dhanya 2014-08-29 16:42:26 +02:00
parent c33657f04d
commit 705a25c9e0
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
slsDetectorGui/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorGui Path: slsDetectorsPackage/calibrationWizards
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git
Repsitory UUID: 8d8e3f9221be0f85c016a7d48e5d1abed5fdcc95 Repsitory UUID: f2467753988c780455e50953db2cb6b4e643e704
Revision: 272 Revision: 278
Branch: separate_receiver Branch: master
Last Changed Author: Maliakal_Dhanya Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 272 Last Changed Rev: 278
Last Changed Date: 2014-06-03 12:07:35 +0200 Last Changed Date: 2014-08-05 11:30:36 +0200

8
slsDetectorGui/include/gitInfoGui.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "8d8e3f9221be0f85c016a7d48e5d1abed5fdcc95" #define SVNREPUUID "f2467753988c780455e50953db2cb6b4e643e704"
//#define SVNREV 0x272 //#define SVNREV 0x278
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya" #define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x272 #define SVNREV 0x278
#define SVNDATE 0x20140603 #define SVNDATE 0x20140805
// //

27
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -316,7 +316,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){
case 4: return slsDetectorDefs::CALIBRATION_PULSE; case 4: return slsDetectorDefs::CALIBRATION_PULSE;
case 5: return slsDetectorDefs::PREAMP; case 5: return slsDetectorDefs::PREAMP;
default: default:
qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error","qTabDeveloper::getSLSIndex"); qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error Index:"+ index,"qTabDeveloper::getSLSIndex");
Refresh(); Refresh();
break; break;
} }
@ -343,12 +343,31 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){
default: default:
qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error","qTabDeveloper::getSLSIndex"); qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error Index:"+ index,"qTabDeveloper::getSLSIndex");
Refresh(); Refresh();
break; break;
} }
break; break;
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
switch(index){
case 0: return slsDetectorDefs::V_DAC0;
case 1: return slsDetectorDefs::V_DAC1;
case 2: return slsDetectorDefs::V_DAC2;
case 3: return slsDetectorDefs::V_DAC3;
case 4: return slsDetectorDefs::V_DAC4;
case 5: return slsDetectorDefs::V_DAC5;
case 6: return slsDetectorDefs::V_DAC6;
case 7: return slsDetectorDefs::V_DAC7;
case 8: return slsDetectorDefs::TEMPERATURE_ADC;
case 9:return slsDetectorDefs::TEMPERATURE_FPGA;
default:
qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error. Index:"+ index,"qTabDeveloper::getSLSIndex");
Refresh();
break;
}
break;
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
switch(index){ switch(index){
case 0: return slsDetectorDefs::G_VREF_DS; case 0: return slsDetectorDefs::G_VREF_DS;
@ -362,7 +381,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){
case 8: return slsDetectorDefs::TEMPERATURE_ADC; case 8: return slsDetectorDefs::TEMPERATURE_ADC;
case 9:return slsDetectorDefs::TEMPERATURE_FPGA; case 9:return slsDetectorDefs::TEMPERATURE_FPGA;
default: default:
qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error","qTabDeveloper::getSLSIndex"); qDefs::Message(qDefs::CRITICAL,"Unknown DAC/ADC Index. Weird Error Index:"+ index,"qTabDeveloper::getSLSIndex");
Refresh(); Refresh();
break; break;
} }
@ -387,6 +406,7 @@ void qTabDeveloper::RefreshAdcs(){
adcTimer->stop(); adcTimer->stop();
for(int i=0;i<NUM_ADC_WIDGETS;i++) for(int i=0;i<NUM_ADC_WIDGETS;i++)
spinAdcs[i]->setValue((double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))); spinAdcs[i]->setValue((double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS)));
adcTimer->start(ADC_TIMEOUT); adcTimer->start(ADC_TIMEOUT);
qDefs::checkErrorMessage(myDet,"qTabDeveloper::RefreshAdcs"); qDefs::checkErrorMessage(myDet,"qTabDeveloper::RefreshAdcs");
} }
@ -404,6 +424,7 @@ void qTabDeveloper::Refresh(){
cout << "Gettings DACs" << endl; cout << "Gettings DACs" << endl;
#endif #endif
//dacs //dacs
for(int i=0;i<NUM_DAC_WIDGETS;i++){ for(int i=0;i<NUM_DAC_WIDGETS;i++){
spinDacs[i]->setValue((double)myDet->setDAC(-1,getSLSIndex(i),0)); spinDacs[i]->setValue((double)myDet->setDAC(-1,getSLSIndex(i),0));
lblDacsmV[i]->setText(QString("%1mV").arg(myDet->setDAC(-1,getSLSIndex(i),1),-10)); lblDacsmV[i]->setText(QString("%1mV").arg(myDet->setDAC(-1,getSLSIndex(i),1),-10));