Compare commits
45 Commits
ce9d2d3063
...
377324888f
Author | SHA1 | Date | |
---|---|---|---|
|
377324888f | ||
|
623ff33536 | ||
|
e2fb04a0c2 | ||
|
f7c26dc0ae | ||
|
4047ecf079 | ||
|
2573de66c1 | ||
|
b21e0fe37b | ||
|
7092ceaa84 | ||
|
7c16a69466 | ||
|
04e62777c3 | ||
|
fc31f1a658 | ||
|
4a5fd7a769 | ||
|
8474bc9fbb | ||
|
9bb4abec5d | ||
|
3a79c40b32 | ||
|
2e287f4496 | ||
|
cab61e0d61 | ||
|
9144b065a7 | ||
|
602355a79d | ||
|
3e043fa7a0 | ||
|
15493870cf | ||
|
04a877fc51 | ||
|
17657d7d7e | ||
|
4f10519089 | ||
|
db35119a56 | ||
|
e95e45a5d6 | ||
|
c921d75620 | ||
|
79a8fc548b | ||
|
b673dcd700 | ||
|
b0acaeaa07 | ||
|
2caf5e7a9b | ||
|
ff02193537 | ||
|
3f01b3cf95 | ||
|
937bed699a | ||
|
876ae26450 | ||
|
e3edb4e9d7 | ||
|
abc0c99d6e | ||
|
c215d3cea1 | ||
|
7c1314d009 | ||
|
b79e125e88 | ||
|
5f3b3909a0 | ||
|
9010673a4f | ||
|
f95796e4da | ||
|
ee05797c75 | ||
|
b2bfcad833 |
|
@ -1202,7 +1202,7 @@ void Digitizer2Gen::ReadAllSettings(){
|
||||||
// here TempSens is same for PHA and PSD
|
// here TempSens is same for PHA and PSD
|
||||||
if( ModelName == "VX2740" && boardSettings[i].GetPara() != PHA::DIG::TempSensADC0.GetPara()) continue;
|
if( ModelName == "VX2740" && boardSettings[i].GetPara() != PHA::DIG::TempSensADC0.GetPara()) continue;
|
||||||
|
|
||||||
if( ModelName != "VX2740" &&
|
if( ModelName == "VX2730" &&
|
||||||
(boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() ||
|
(boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() ||
|
||||||
boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara()
|
boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara()
|
||||||
)
|
)
|
||||||
|
@ -1227,7 +1227,6 @@ void Digitizer2Gen::ReadAllSettings(){
|
||||||
for(int ch = 0; ch < nChannels ; ch++ ){
|
for(int ch = 0; ch < nChannels ; ch++ ){
|
||||||
for( int i = 0; i < (int) chSettings[ch].size(); i++){
|
for( int i = 0; i < (int) chSettings[ch].size(); i++){
|
||||||
if( chSettings[ch][i].ReadWrite() == RW::WriteOnly) continue;
|
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);
|
ReadValue(chSettings[ch][i], ch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -759,11 +759,7 @@ void MainWindow::OpenDigitizers(){
|
||||||
bnComment->setEnabled(false);
|
bnComment->setEnabled(false);
|
||||||
bnOpenScope->setEnabled(true);
|
bnOpenScope->setEnabled(true);
|
||||||
chkSaveRun->setEnabled(true);
|
chkSaveRun->setEnabled(true);
|
||||||
if( nDigiConnected == 1 ) {
|
|
||||||
bnSyncHelper->setEnabled(false);
|
|
||||||
}else{
|
|
||||||
bnSyncHelper->setEnabled(true);
|
bnSyncHelper->setEnabled(true);
|
||||||
}
|
|
||||||
bnOpenDigitizers->setEnabled(false);
|
bnOpenDigitizers->setEnabled(false);
|
||||||
bnOpenDigitizers->setStyleSheet("");
|
bnOpenDigitizers->setStyleSheet("");
|
||||||
cbAutoRun->setEnabled(true);
|
cbAutoRun->setEnabled(true);
|
||||||
|
@ -1501,12 +1497,10 @@ void MainWindow::ProgramSettingsPanel(){
|
||||||
DatabaseIP = lDatbaseIP->text();
|
DatabaseIP = lDatbaseIP->text();
|
||||||
DatabaseName = lDatbaseName->text();
|
DatabaseName = lDatbaseName->text();
|
||||||
DatabaseToken = lDatbaseToken->text();
|
DatabaseToken = lDatbaseToken->text();
|
||||||
|
ElogIP = lElogIP->text();
|
||||||
analysisPath = lAnalysisPath->text();
|
analysisPath = lAnalysisPath->text();
|
||||||
masterExpDataPath = lExpDataPath->text();
|
masterExpDataPath = lExpDataPath->text();
|
||||||
expName = lExpName->text();
|
expName = lExpName->text();
|
||||||
ElogIP = lElogIP->text();
|
|
||||||
ElogUser = lElogUser->text();
|
|
||||||
ElogPWD = lElogPWD->text();
|
|
||||||
|
|
||||||
SaveProgramSettings();
|
SaveProgramSettings();
|
||||||
|
|
||||||
|
@ -2432,8 +2426,6 @@ void MainWindow::WriteElog(QString htmlText, QString subject, QString category,
|
||||||
arg << "-a" << "Subject=" + subject
|
arg << "-a" << "Subject=" + subject
|
||||||
<< "-n " << "2" << htmlText ;
|
<< "-n " << "2" << htmlText ;
|
||||||
|
|
||||||
// printf("Elog command: %s\n", arg.join(" ").toStdString().c_str());
|
|
||||||
|
|
||||||
QProcess elogBash(this);
|
QProcess elogBash(this);
|
||||||
elogBash.start("elog", arg);
|
elogBash.start("elog", arg);
|
||||||
elogBash.waitForFinished();
|
elogBash.waitForFinished();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user