diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 129a7e955..0d8074016 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ -Path: slsDetectorsPackage/slsDetectorGui +Path: slsDetectorsPackage/calibrationWizards 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 -Repsitory UUID: 8d8e3f9221be0f85c016a7d48e5d1abed5fdcc95 -Revision: 272 -Branch: separate_receiver +Repsitory UUID: f2467753988c780455e50953db2cb6b4e643e704 +Revision: 278 +Branch: master Last Changed Author: Maliakal_Dhanya -Last Changed Rev: 272 -Last Changed Date: 2014-06-03 12:07:35 +0200 +Last Changed Rev: 278 +Last Changed Date: 2014-08-05 11:30:36 +0200 diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index ae315cd41..ead14bc8a 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "8d8e3f9221be0f85c016a7d48e5d1abed5fdcc95" -//#define SVNREV 0x272 +#define SVNREPUUID "f2467753988c780455e50953db2cb6b4e643e704" +//#define SVNREV 0x278 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Maliakal_Dhanya" -#define SVNREV 0x272 -#define SVNDATE 0x20140603 +#define SVNREV 0x278 +#define SVNDATE 0x20140805 // diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index 7280eb76f..e2470b20a 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -316,7 +316,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){ case 4: return slsDetectorDefs::CALIBRATION_PULSE; case 5: return slsDetectorDefs::PREAMP; 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(); break; } @@ -343,12 +343,31 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){ 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(); break; } break; 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: switch(index){ case 0: return slsDetectorDefs::G_VREF_DS; @@ -362,7 +381,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){ case 8: return slsDetectorDefs::TEMPERATURE_ADC; case 9:return slsDetectorDefs::TEMPERATURE_FPGA; 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(); break; } @@ -387,6 +406,7 @@ void qTabDeveloper::RefreshAdcs(){ adcTimer->stop(); for(int i=0;isetValue((double)myDet->getADC(getSLSIndex(i+NUM_DAC_WIDGETS))); + adcTimer->start(ADC_TIMEOUT); qDefs::checkErrorMessage(myDet,"qTabDeveloper::RefreshAdcs"); } @@ -404,6 +424,7 @@ void qTabDeveloper::Refresh(){ cout << "Gettings DACs" << endl; #endif //dacs + for(int i=0;isetValue((double)myDet->setDAC(-1,getSLSIndex(i),0)); lblDacsmV[i]->setText(QString("%1mV").arg(myDet->setDAC(-1,getSLSIndex(i),1),-10));