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

propix integrated into gui

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-07-22 10:06:38 +02:00
parent a5e18833de
commit db5412e599
9 changed files with 65 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -230,8 +230,9 @@ void qDetectorMain::SetUpDetector(const string fName){
switch(detType){ switch(detType){
case slsDetectorDefs::MYTHEN: break; case slsDetectorDefs::MYTHEN: break;
case slsDetectorDefs::EIGER: break; case slsDetectorDefs::EIGER: break;
case slsDetectorDefs::GOTTHARD: actionLoadTrimbits->setText("Load Settings"); actionSaveTrimbits->setText("Save Settings"); break; case slsDetectorDefs::GOTTHARD:
case slsDetectorDefs::AGIPD: actionLoadTrimbits->setText("Load Settings"); actionSaveTrimbits->setText("Save Settings"); break; case slsDetectorDefs::AGIPD:
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::MOENCH: actionLoadTrimbits->setText("Load Settings"); actionSaveTrimbits->setText("Save Settings"); break; case slsDetectorDefs::MOENCH: actionLoadTrimbits->setText("Load Settings"); actionSaveTrimbits->setText("Save Settings"); break;
default: default:
string detName = myDet->slsDetectorBase::getDetectorType(detType); string detName = myDet->slsDetectorBase::getDetectorType(detType);
@ -603,7 +604,7 @@ void qDetectorMain::ExecuteUtilities(QAction *action){
void qDetectorMain::ExecuteHelp(QAction *action){ void qDetectorMain::ExecuteHelp(QAction *action){
if(action==actionAbout){ if(action==actionAbout){
#ifdef VERBOSE #ifdef VERBOSE
cout << "About: Common GUI for Mythen, Eiger, Gotthard and Agipd detectors" << endl; cout << "About: Common GUI for Mythen, Eiger, Gotthard and Propix detectors" << endl;
#endif #endif
char version[200]; char version[200];
int64_t retval= SVNREV; int64_t retval= SVNREV;
@ -620,7 +621,7 @@ void qDetectorMain::ExecuteHelp(QAction *action){
"SLS Detector GUI version:&nbsp;&nbsp;&nbsp;" + thisGUIVersion+"<br>" "SLS Detector GUI version:&nbsp;&nbsp;&nbsp;" + thisGUIVersion+"<br>"
"SLS Detector Client version: "+thisClientVersion+"<br><br>" "SLS Detector Client version: "+thisClientVersion+"<br><br>"
"Common GUI to control the SLS Detectors: " "Common GUI to control the SLS Detectors: "
"Mythen, Eiger, Gotthard and Agipd.<br><br>" "Mythen, Eiger, Gotthard and Propix.<br><br>"
"It can be operated in parallel with the command line interface:<br>" "It can be operated in parallel with the command line interface:<br>"
"sls_detector_put,<br>sls_detector_get,<br>sls_detector_acquire and<br>sls_detector_help.<br><br>" "sls_detector_put,<br>sls_detector_get,<br>sls_detector_acquire and<br>sls_detector_help.<br><br>"
"The GUI Software is still in progress. " "The GUI Software is still in progress. "

1
slsDetectorGui/src/qDrawPlot.cpp
View File

@ -67,6 +67,7 @@ void qDrawPlot::SetupWidgetWindow(){
case slsDetectorDefs::MYTHEN: originally2D = false; break; case slsDetectorDefs::MYTHEN: originally2D = false; break;
case slsDetectorDefs::EIGER: originally2D = true; break; case slsDetectorDefs::EIGER: originally2D = true; break;
case slsDetectorDefs::GOTTHARD: originally2D = false; break; case slsDetectorDefs::GOTTHARD: originally2D = false; break;
case slsDetectorDefs::PROPIX: originally2D = true; break;
case slsDetectorDefs::MOENCH: originally2D = true; break; case slsDetectorDefs::MOENCH: originally2D = true; break;
default: default:
cout << "ERROR: Detector Type is Generic" << endl; cout << "ERROR: Detector Type is Generic" << endl;

5
slsDetectorGui/src/qTabActions.cpp
View File

@ -181,7 +181,10 @@ void qTabActions::SetupWidgetWindow(){
//Number of positions is only for mythen or gotthard //Number of positions is only for mythen or gotthard
detType = myDet->getDetectorsType(); detType = myDet->getDetectorsType();
if((detType == slsDetectorDefs::EIGER) || (detType == slsDetectorDefs::AGIPD) || (detType == slsDetectorDefs::MOENCH)) { if((detType == slsDetectorDefs::EIGER) ||
(detType == slsDetectorDefs::AGIPD) ||
(detType == slsDetectorDefs::PROPIX) ||
(detType == slsDetectorDefs::MOENCH)) {
lblName[NumPositions]->setEnabled(false); lblName[NumPositions]->setEnabled(false);
btnExpand[NumPositions]->setEnabled(false); btnExpand[NumPositions]->setEnabled(false);
}else{ }else{

10
slsDetectorGui/src/qTabAdvanced.cpp
View File

@ -238,7 +238,10 @@ void qTabAdvanced::Initialization(){
connect(spinStopPort, SIGNAL(valueChanged(int)), this, SLOT(SetStopPort(int))); connect(spinStopPort, SIGNAL(valueChanged(int)), this, SLOT(SetStopPort(int)));
connect(comboOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetOnline(int))); connect(comboOnline, SIGNAL(currentIndexChanged(int)), this, SLOT(SetOnline(int)));
if((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH) || (detType==slsDetectorDefs::EIGER)){ if((detType==slsDetectorDefs::GOTTHARD) ||
(detType==slsDetectorDefs::MOENCH) ||
(detType==slsDetectorDefs::PROPIX) ||
(detType==slsDetectorDefs::EIGER)){
//network //network
connect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int))); connect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int)));
@ -1185,7 +1188,10 @@ void qTabAdvanced::Refresh(){
#ifdef VERBOSE #ifdef VERBOSE
cout << "Getting Receiver Network Information" << endl; cout << "Getting Receiver Network Information" << endl;
#endif #endif
if ((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH)|| (detType==slsDetectorDefs::EIGER)){ if ((detType==slsDetectorDefs::GOTTHARD) ||
(detType==slsDetectorDefs::MOENCH)||
(detType==slsDetectorDefs::PROPIX)||
(detType==slsDetectorDefs::EIGER)){
//disconnect //disconnect
disconnect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int))); disconnect(spinTCPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrTCPPort(int)));
disconnect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int))); disconnect(spinUDPPort, SIGNAL(valueChanged(int)), this, SLOT(SetRxrUDPPort(int)));

27
slsDetectorGui/src/qTabDebugging.cpp
View File

@ -73,6 +73,7 @@ void qTabDebugging::SetupWidgetWindow(){
chkChip->setEnabled(false); chkChip->setEnabled(false);
chkModuleFirmware->setEnabled(false); chkModuleFirmware->setEnabled(false);
break; break;
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
lblDetector->setText("Module:"); lblDetector->setText("Module:");
chkDetectorFirmware->setText("Module Firmware:"); chkDetectorFirmware->setText("Module Firmware:");
@ -295,6 +296,29 @@ void qTabDebugging::GetInfo(){
case slsDetectorDefs::PROPIX:
//display widget
formLayout->addWidget(new QLabel("Module:"),0,0);
formLayout->addItem(new QSpacerItem(15,20,QSizePolicy::Fixed,QSizePolicy::Fixed),0,1);
formLayout->addWidget(lblDetectorId,0,2);
formLayout->addWidget(new QLabel("Module MAC Address:"),1,0);
formLayout->addWidget(lblDetectorSerial,1,2);
formLayout->addWidget(new QLabel("Module Firmware Version:"),2,0);
formLayout->addWidget(lblDetectorFirmware,2,2);
formLayout->addWidget(new QLabel("Module Software Version:"),3,0);
formLayout->addWidget(lblDetectorSoftware,3,2);
//tree widget
treeDet->setHeaderLabel("Propix Detector");
//gets det names
for (int i=0;i<comboDetector->count();i++)
items.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("Module (%1)").arg(comboDetector->itemText(i)))));
treeDet->insertTopLevelItems(0, items);
break;
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
//display widget //display widget
@ -425,7 +449,7 @@ void qTabDebugging::SetParameters(QTreeWidgetItem *item){
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
//find index //find index
@ -474,6 +498,7 @@ void qTabDebugging::TestDetector(){
break; break;
case slsDetectorDefs::EIGER: Detector = "Half Module"; break; case slsDetectorDefs::EIGER: Detector = "Half Module"; break;
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::GOTTHARD: Detector = "Module"; break; case slsDetectorDefs::GOTTHARD: Detector = "Module"; break;
default: break; default: break;
} }

20
slsDetectorGui/src/qTabDeveloper.cpp
View File

@ -104,6 +104,7 @@ void qTabDeveloper::SetupWidgetWindow(){
break; break;
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
NUM_DAC_WIDGETS = 8; NUM_DAC_WIDGETS = 8;
NUM_ADC_WIDGETS = 2; NUM_ADC_WIDGETS = 2;
@ -174,7 +175,9 @@ void qTabDeveloper::SetupWidgetWindow(){
CreateDACWidgets(); CreateDACWidgets();
//HV for gotthard //HV for gotthard
if ((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH)){ if ((detType==slsDetectorDefs::GOTTHARD) ||
(detType==slsDetectorDefs::PROPIX) ||
(detType==slsDetectorDefs::MOENCH)){
boxDacs->setFixedHeight(boxDacs->height()+35); boxDacs->setFixedHeight(boxDacs->height()+35);
lblHV = new QLabel("High Voltage",boxDacs); lblHV = new QLabel("High Voltage",boxDacs);
@ -198,7 +201,9 @@ void qTabDeveloper::SetupWidgetWindow(){
//adcs //adcs
if((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH)){ if((detType==slsDetectorDefs::GOTTHARD) ||
(detType==slsDetectorDefs::PROPIX) ||
(detType==slsDetectorDefs::MOENCH)){
setFixedHeight(20+(50+(NUM_DAC_WIDGETS/2)*35)+(50+(NUM_ADC_WIDGETS/2)*35)); setFixedHeight(20+(50+(NUM_DAC_WIDGETS/2)*35)+(50+(NUM_ADC_WIDGETS/2)*35));
boxAdcs = new QGroupBox("ADCs",this); boxAdcs = new QGroupBox("ADCs",this);
boxAdcs->setFixedHeight(25+(NUM_ADC_WIDGETS/2)*35); boxAdcs->setFixedHeight(25+(NUM_ADC_WIDGETS/2)*35);
@ -265,7 +270,10 @@ void qTabDeveloper::CreateADCWidgets(){
lblAdcs[i] = new QLabel(QString(adcNames[i].c_str()),boxAdcs); lblAdcs[i] = new QLabel(QString(adcNames[i].c_str()),boxAdcs);
spinAdcs[i] = new QDoubleSpinBox(boxAdcs); spinAdcs[i] = new QDoubleSpinBox(boxAdcs);
spinAdcs[i]->setMaximum(10000); spinAdcs[i]->setMaximum(10000);
if((detType==slsDetectorDefs::GOTTHARD) || (detType==slsDetectorDefs::MOENCH)) spinAdcs[i]->setSuffix(0x00b0+QString("C")); if((detType==slsDetectorDefs::GOTTHARD) ||
(detType==slsDetectorDefs::PROPIX) ||
(detType==slsDetectorDefs::MOENCH))
spinAdcs[i]->setSuffix(0x00b0+QString("C"));
adcLayout->addWidget(lblAdcs[i],(int)(i/2),((i%2)==0)?1:4); adcLayout->addWidget(lblAdcs[i],(int)(i/2),((i%2)==0)?1:4);
adcLayout->addWidget(spinAdcs[i],(int)(i/2),((i%2)==0)?2:5); adcLayout->addWidget(spinAdcs[i],(int)(i/2),((i%2)==0)?2:5);
@ -416,7 +424,7 @@ slsDetectorDefs::dacIndex qTabDeveloper::getSLSIndex(int index){
break; break;
} }
break; break;
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
switch(index){ switch(index){
case 0: return slsDetectorDefs::G_VREF_DS; case 0: return slsDetectorDefs::G_VREF_DS;
@ -510,7 +518,9 @@ void qTabDeveloper::Refresh(){
if(NUM_ADC_WIDGETS) RefreshAdcs(); if(NUM_ADC_WIDGETS) RefreshAdcs();
//gotthard -high voltage //gotthard -high voltage
if((detType == slsDetectorDefs::GOTTHARD) || (detType == slsDetectorDefs::MOENCH)){ if((detType == slsDetectorDefs::GOTTHARD) ||
(detType == slsDetectorDefs::PROPIX) ||
(detType == slsDetectorDefs::MOENCH)){
disconnect(comboHV, SIGNAL(currentIndexChanged(int)), this, SLOT(SetHighVoltage())); disconnect(comboHV, SIGNAL(currentIndexChanged(int)), this, SLOT(SetHighVoltage()));
//default should be correct //default should be correct

1
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -145,6 +145,7 @@ void qTabMeasurement::SetupTimingMode(){
item[(int)Gated_Start]->setEnabled(false); item[(int)Gated_Start]->setEnabled(false);
break; break;
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
item[(int)Trigger_Exp_Series]->setEnabled(true); item[(int)Trigger_Exp_Series]->setEnabled(true);
item[(int)Trigger_Readout]->setEnabled(false); item[(int)Trigger_Readout]->setEnabled(false);

5
slsDetectorGui/src/qTabPlot.cpp
View File

@ -175,6 +175,7 @@ void qTabPlot::SetupWidgetWindow(){
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
isOriginallyOneD = true; isOriginallyOneD = true;
break; break;
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
isOriginallyOneD = false; isOriginallyOneD = false;
break; break;
@ -761,7 +762,9 @@ void qTabPlot::EnableScanBox(){
chkSuperimpose->setEnabled(true); chkSuperimpose->setEnabled(true);
pageAccumulate->setEnabled(true); pageAccumulate->setEnabled(true);
pageAccumulate_2->setEnabled(true); pageAccumulate_2->setEnabled(true);
if((myDet->getDetectorsType() == slsDetectorDefs::GOTTHARD) || (myDet->getDetectorsType() == slsDetectorDefs::MOENCH)){ if((myDet->getDetectorsType() == slsDetectorDefs::GOTTHARD) ||
(myDet->getDetectorsType() == slsDetectorDefs::PROPIX) ||
(myDet->getDetectorsType() == slsDetectorDefs::MOENCH)){
pagePedestal->setEnabled(true); pagePedestal->setEnabled(true);
pagePedestal_2->setEnabled(true); pagePedestal_2->setEnabled(true);
chkBinary->setEnabled(true); chkBinary->setEnabled(true);

1
slsDetectorGui/src/qTabSettings.cpp
View File

@ -133,6 +133,7 @@ void qTabSettings::SetupDetectorSettings(){
item[(int)LowNoise]->setEnabled(true); item[(int)LowNoise]->setEnabled(true);
break; break;
case slsDetectorDefs::MOENCH: case slsDetectorDefs::MOENCH:
case slsDetectorDefs::PROPIX:
case slsDetectorDefs::GOTTHARD: case slsDetectorDefs::GOTTHARD:
item[(int)Standard]->setEnabled(false); item[(int)Standard]->setEnabled(false);
item[(int)Fast]->setEnabled(false); item[(int)Fast]->setEnabled(false);