diff --git a/slsDetectorGui/forms/form_tab_dataoutput.ui b/slsDetectorGui/forms/form_tab_dataoutput.ui
index 8fabbf474..0ebfddfe9 100644
--- a/slsDetectorGui/forms/form_tab_dataoutput.ui
+++ b/slsDetectorGui/forms/form_tab_dataoutput.ui
@@ -57,7 +57,7 @@
6
-
-
+
false
@@ -69,21 +69,7 @@ Compression using Root. Available only for Gotthard in Expert Mode.
</nobr>
- 10GbE
-
-
-
- -
-
-
- <nobr>
-Compression using Root. Available only for Gotthard in Expert Mode.
-</nobr><br><nobr>
- #r_compression#
-</nobr>
-
-
- Compression
+ Unused
@@ -104,6 +90,23 @@ Compression using Root. Available only for Gotthard in Expert Mode.
+ -
+
+
+ false
+
+
+ <nobr>
+Compression using Root. Available only for Gotthard in Expert Mode.
+</nobr><br><nobr>
+ #r_compression#
+</nobr>
+
+
+ 10GbE
+
+
+
diff --git a/slsDetectorGui/include/qTabDataOutput.h b/slsDetectorGui/include/qTabDataOutput.h
index d971e97ef..9f0957cd8 100644
--- a/slsDetectorGui/include/qTabDataOutput.h
+++ b/slsDetectorGui/include/qTabDataOutput.h
@@ -45,12 +45,6 @@ public:
*/
int VerifyOutputDirectory();
- /** To enable expert mode
- * @param enable to enable if true
- */
- void SetExpertMode(bool enable);
-
-
private:
/** The sls detector object */
multiSlsDetector *myDet;
@@ -86,9 +80,6 @@ private:
*/
void PopulateDetectors();
- /** Get Compression */
- void GetCompression();
-
/** update speed */
void UpdateSpeedFromServer();
@@ -140,9 +131,6 @@ void SetOutputDir();
/** set output directory*/
void GetOutputDir();
-/** set compression */
-void SetCompression(bool enable);
-
/** enable 10GbE */
void EnableTenGigabitEthernet(bool enable, int get=0);
diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp
index d83b52680..a084ca9f2 100644
--- a/slsDetectorGui/src/qDetectorMain.cpp
+++ b/slsDetectorGui/src/qDetectorMain.cpp
@@ -417,7 +417,6 @@ void qDetectorMain::EnableModes(QAction *action){
actionSaveCalibration->setVisible(enable);
tab_measurement->SetExpertMode(enable);
tab_settings->SetExpertMode(enable);
- tab_dataoutput->SetExpertMode(enable);
#ifdef VERBOSE
cout << "Setting Expert Mode to " << enable << endl;
#endif
diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp
index 38fb7e6ea..f8969d938 100644
--- a/slsDetectorGui/src/qTabDataOutput.cpp
+++ b/slsDetectorGui/src/qTabDataOutput.cpp
@@ -80,8 +80,8 @@ void qTabDataOutput::SetupWidgetWindow(){
outDirTip = lblOutputDir->toolTip();
- //expert mode is not enabled initially
- chkCompression->setEnabled(false);
+ //not used at all, later used for gappixels
+ chkUnused->setEnabled(false);
//enabling file format depending on detector type
SetupFileFormat();
@@ -167,8 +167,6 @@ void qTabDataOutput::Initialization(){
connect(chkAngular, SIGNAL(toggled(bool)), this, SLOT(SetAngularCorrection()));
//discard bad channels
connect(chkDiscardBad, SIGNAL(toggled(bool)), this, SLOT(DiscardBadChannels()));
- //compression
- connect(chkCompression, SIGNAL(toggled(bool)), this, SLOT(SetCompression(bool)));
//10GbE
connect(chkTenGiga, SIGNAL(toggled(bool)), this, SLOT(EnableTenGigabitEthernet(bool)));
@@ -186,18 +184,6 @@ void qTabDataOutput::Initialization(){
//-------------------------------------------------------------------------------------------------------------------------------------------------
-void qTabDataOutput::SetExpertMode(bool enable){
- if((detType == slsDetectorDefs::GOTTHARD) || (detType == slsDetectorDefs::MOENCH)){
- chkCompression->setEnabled(enable);
- GetCompression();
- }
-
-}
-
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------
-
-
void qTabDataOutput::BrowseOutputDir()
{
QString directory = QFileDialog::getExistingDirectory(this,tr("Choose Output Directory "),dispOutputDir->text());
@@ -737,34 +723,6 @@ void qTabDataOutput::SetOutputDir(){
//-------------------------------------------------------------------------------------------------------------------------------------------------
-void qTabDataOutput::GetCompression(){
- disconnect(chkCompression, SIGNAL(toggled(bool)), this, SLOT(SetCompression(bool)));
- int ret = myDet->enableReceiverCompression();
- if(ret > 0) chkCompression->setChecked(true);
- else chkCompression->setChecked(false);
- connect(chkCompression, SIGNAL(toggled(bool)), this, SLOT(SetCompression(bool)));
-
- qDefs::checkErrorMessage(myDet,"qTabDataOutput::GetCompression");
-}
-
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-void qTabDataOutput::SetCompression(bool enable){
- disconnect(chkCompression, SIGNAL(toggled(bool)), this, SLOT(SetCompression(bool)));
- int ret = myDet->enableReceiverCompression(enable);
- if(ret > 0) chkCompression->setChecked(true);
- else chkCompression->setChecked(false);
- connect(chkCompression, SIGNAL(toggled(bool)), this, SLOT(SetCompression(bool)));
-
- qDefs::checkErrorMessage(myDet,"qTabDataOutput::SetCompression");
-}
-
-
-//-------------------------------------------------------------------------------------------------------------------------------------------------
-
-
void qTabDataOutput::EnableTenGigabitEthernet(bool enable,int get){
#ifdef VERBOSE
cout << endl << "Enabling/Disabling 10GbE" << endl;
@@ -1102,14 +1060,6 @@ void qTabDataOutput::Refresh(){
btnOutputBrowse->setToolTip(dispOutputDir->toolTip());
}
- //getting compression
- if(chkCompression->isEnabled()){
-#ifdef VERBOSE
- cout << "Getting compression" << endl;
-#endif
- GetCompression();
- }
-
//getting 10GbE
if(chkTenGiga->isEnabled()){
#ifdef VERBOSE