diff --git a/ClassDigitizer2Gen.cpp b/ClassDigitizer2Gen.cpp index b0872ab..73b8d0a 100644 --- a/ClassDigitizer2Gen.cpp +++ b/ClassDigitizer2Gen.cpp @@ -1202,7 +1202,7 @@ void Digitizer2Gen::ReadAllSettings(){ // here TempSens is same for PHA and PSD if( ModelName == "VX2740" && boardSettings[i].GetPara() != PHA::DIG::TempSensADC0.GetPara()) continue; - if( ModelName == "VX2730" && + if( ModelName != "VX2740" && (boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() || boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara() ) @@ -1227,6 +1227,7 @@ void Digitizer2Gen::ReadAllSettings(){ for(int ch = 0; ch < nChannels ; ch++ ){ for( int i = 0; i < (int) chSettings[ch].size(); i++){ if( chSettings[ch][i].ReadWrite() == RW::WriteOnly) continue; + if( ModelName != "VX2730" && chSettings[ch][i].GetPara() == PSD::CH::ChGain.GetPara()) continue; ReadValue(chSettings[ch][i], ch); } } diff --git a/mainwindow.cpp b/mainwindow.cpp index dc02b35..ed961b7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -759,7 +759,11 @@ void MainWindow::OpenDigitizers(){ bnComment->setEnabled(false); bnOpenScope->setEnabled(true); chkSaveRun->setEnabled(true); - bnSyncHelper->setEnabled(true); + if( nDigiConnected == 1 ) { + bnSyncHelper->setEnabled(false); + }else{ + bnSyncHelper->setEnabled(true); + } bnOpenDigitizers->setEnabled(false); bnOpenDigitizers->setStyleSheet(""); cbAutoRun->setEnabled(true); @@ -1497,10 +1501,12 @@ void MainWindow::ProgramSettingsPanel(){ DatabaseIP = lDatbaseIP->text(); DatabaseName = lDatbaseName->text(); DatabaseToken = lDatbaseToken->text(); - ElogIP = lElogIP->text(); analysisPath = lAnalysisPath->text(); masterExpDataPath = lExpDataPath->text(); expName = lExpName->text(); + ElogIP = lElogIP->text(); + ElogUser = lElogUser->text(); + ElogPWD = lElogPWD->text(); SaveProgramSettings(); @@ -2426,6 +2432,8 @@ void MainWindow::WriteElog(QString htmlText, QString subject, QString category, arg << "-a" << "Subject=" + subject << "-n " << "2" << htmlText ; + // printf("Elog command: %s\n", arg.join(" ").toStdString().c_str()); + QProcess elogBash(this); elogBash.start("elog", arg); elogBash.waitForFinished();