Compare commits
46 Commits
377324888f
...
ce9d2d3063
Author | SHA1 | Date | |
---|---|---|---|
|
ce9d2d3063 | ||
|
ceb4cf4563 | ||
|
f8e60f94ce | ||
|
bd47bc4928 | ||
|
8dd9023b68 | ||
|
bc73eaa91d | ||
|
369d99524c | ||
|
5c62ccbc89 | ||
|
b5a974a38d | ||
|
daf8d133a9 | ||
|
2c039dc743 | ||
|
bcf73b4112 | ||
|
beb4cdef8e | ||
|
005c752772 | ||
|
aa60a0dbe3 | ||
|
66ba308d9b | ||
|
852f4b52f4 | ||
|
4b7ae83997 | ||
|
b7f2fcbc58 | ||
|
6571f93d9b | ||
|
844f14be5f | ||
|
ab94ef3dfa | ||
|
0c6db57f47 | ||
|
8b668cb8d5 | ||
|
378fffe4ec | ||
|
2fa22bbcc2 | ||
|
f0f25f860d | ||
|
95efe40ffa | ||
|
b7a23b4a7e | ||
|
119eb64fd2 | ||
|
bdf4208070 | ||
|
8d10d24d18 | ||
|
fdc155ed90 | ||
|
68d86c3618 | ||
|
d65c324119 | ||
|
29f551018e | ||
|
a8b87e70f4 | ||
|
b888a8ea63 | ||
|
d96ed2984e | ||
|
fbb20eff93 | ||
|
f5fd9174f9 | ||
|
20478c317e | ||
|
40230300fe | ||
|
6041a6880b | ||
|
ee3edbeba6 | ||
|
1186de195d |
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user