diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index ef741ea56..527b68540 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -183,6 +183,7 @@ void qDetectorMain::SetUpWidgetWindow(){ // Default zoom Tool Tip zoomToolTip = dockWidgetPlot->toolTip(); + } @@ -207,9 +208,7 @@ void qDetectorMain::SetUpDetector(const string fName){ //if hostname doesnt exist even in shared memory if(!host.length()){ -#ifdef VERBOSE cout << endl << "No Detector Connected." << endl; -#endif qDefs::Message(qDefs::CRITICAL,"No Detectors Connected. ","qDetectorMain::SetUpDetector"); exit(-1); } @@ -237,6 +236,7 @@ void qDetectorMain::SetUpDetector(const string fName){ default: string detName = myDet->slsDetectorBase::getDetectorType(detType); qDefs::checkErrorMessage(myDet,"qDetectorMain::SetUpDetector"); + cout << "ERROR: " + host + " has unknown detector type \"" + detName + "\". Exiting GUI." << endl; string errorMess = host+string(" has unknown detector type \"")+ detName+string("\". Exiting GUI."); qDefs::Message(qDefs::CRITICAL,errorMess,"qDetectorMain::SetUpDetector"); diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index f07da9530..4a60b237a 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -177,6 +177,13 @@ void qTabAdvanced::SetupWidgetWindow(){ cout << "Getting ROI" << endl; updateROIList(); + + // print receiver configurations + if(myDet->getDetectorsType() != slsDetectorDefs::MYTHEN){ + cout << endl; + myDet->printReceiverConfiguration(); + } + Initialization(); qDefs::checkErrorMessage(det,"qTabAdvanced::SetupWidgetWindow"); diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index 258653f27..3c865bfa4 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -134,6 +134,7 @@ void qTabDeveloper::SetupWidgetWindow(){ break; default: + cout << "ERROR: Unknown detector type: " + myDet->slsDetectorBase::getDetectorType(detType) << endl; qDefs::Message(qDefs::CRITICAL,string("Unknown detector type:")+myDet->slsDetectorBase::getDetectorType(detType),"qTabDeveloper::SetupWidgetWindow"); exit(-1); break; @@ -388,6 +389,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){ } break; default: + cout << "Unknown detector type:" + myDet->slsDetectorBase::getDetectorType(detType) << endl; qDefs::Message(qDefs::CRITICAL,string("Unknown detector type:")+myDet->slsDetectorBase::getDetectorType(detType),"qTabDeveloper::getSLSIndex"); qDefs::checkErrorMessage(myDet,"qTabDeveloper::getSLSIndex"); exit(-1); diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 5e6952b56..eb0eb3095 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -152,6 +152,7 @@ void qTabMeasurement::SetupTimingMode(){ item[(int)Gated_Start]->setEnabled(false); break; default: + cout << "Unknown detector type." << endl; qDefs::Message(qDefs::CRITICAL,"Unknown detector type.","qTabMeasurement::SetupTimingMode"); exit(-1); break; @@ -683,6 +684,7 @@ void qTabMeasurement::SetTimingMode(int mode){ success = true; break; default: + cout << "Timing mode unknown to GUI" << endl; //This should never happen qDefs::Message(qDefs::CRITICAL,"Timing mode unknown to GUI","qTabMeasurement::SetTimingMode"); qDefs::checkErrorMessage(myDet,"qTabMeasurement::SetTimingMode"); diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index e886bc9ba..91d76cdb7 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -144,6 +144,7 @@ void qTabSettings::SetupDetectorSettings(){ item[(int)LowNoise]->setEnabled(false); break; default: + cout << "Unknown detector type. Exiting GUI." << endl; qDefs::Message(qDefs::CRITICAL,"Unknown detector type. Exiting GUI.","qTabSettings::SetupDetectorSettings"); exit(-1); break;