rtang/SOLARIS_QT6_DAQ
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

re structure the file structure. now the daq work without eanalysis folder.

Browse Source
This commit is contained in:
Ryan Tang 2024-06-28 18:30:35 -04:00
parent 3e043fa7a0
commit 602355a79d
6 changed files with 143 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClassDigitizer2Gen.cpp
View File

@ -266,7 +266,7 @@ int Digitizer2Gen::OpenDigitizer(const char * url){
printf("========== defining setting arrays for %s \n", FPGAType.c_str()); printf("========== defining setting arrays for %s \n", FPGAType.c_str());
boardSettings = PHA::DIG::AllSettings; boardSettings = PHA::DIG::AllSettings;
for( int ch = 0; ch < MaxNumberOfChannel ; ch ++) chSettings[ch] = PHA::CH::AllSettings; for( int ch = 0; ch < nChannels ; ch ++) chSettings[ch] = PHA::CH::AllSettings;
for( int index = 0 ; index < 4; index ++) { for( int index = 0 ; index < 4; index ++) {
VGASetting[index] = PHA::VGA::VGAGain; VGASetting[index] = PHA::VGA::VGAGain;
LVDSSettings[index] = PHA::LVDS::AllSettings; LVDSSettings[index] = PHA::LVDS::AllSettings;
@ -285,7 +285,7 @@ int Digitizer2Gen::OpenDigitizer(const char * url){
printf("========== defining setting arrays for %s \n", FPGAType.c_str()); printf("========== defining setting arrays for %s \n", FPGAType.c_str());
boardSettings = PSD::DIG::AllSettings; boardSettings = PSD::DIG::AllSettings;
for( int ch = 0; ch < MaxNumberOfChannel ; ch ++) chSettings[ch] = PSD::CH::AllSettings; for( int ch = 0; ch < nChannels ; ch ++) chSettings[ch] = PSD::CH::AllSettings;
for( int index = 0 ; index < 4; index ++) { for( int index = 0 ; index < 4; index ++) {
VGASetting[index] = PSD::VGA::VGAGain; VGASetting[index] = PSD::VGA::VGAGain;
LVDSSettings[index] = PSD::LVDS::AllSettings; LVDSSettings[index] = PSD::LVDS::AllSettings;

6
SOLARISpanel.cpp
View File

@ -28,7 +28,7 @@ SOLARISpanel::SOLARISpanel(Digitizer2Gen **digi, unsigned short nDigi,
this->digi = digi; this->digi = digi;
this->nDigi = nDigi; this->nDigi = nDigi;
if( this->nDigi > MaxNumberOfDigitizer ) { if( this->nDigi > MaxNumberOfDigitizer ) {
this->nDigi = MaxNumberOfChannel; this->nDigi = MaxNumberOfDigitizer;
qDebug() << "Please increase the MaxNumberOfChannel"; qDebug() << "Please increase the MaxNumberOfChannel";
} }
this->mapping = mapping; this->mapping = mapping;
@ -301,6 +301,8 @@ void SOLARISpanel::CreateDetGroup(int SettingID, QList<int> detIDArray, QGridLay
leDisplay[SettingID][digiID][chID] = new QLineEdit(this); leDisplay[SettingID][digiID][chID] = new QLineEdit(this);
leDisplay[SettingID][digiID][chID]->setFixedWidth(70); leDisplay[SettingID][digiID][chID]->setFixedWidth(70);
leDisplay[SettingID][digiID][chID]->setReadOnly(true);
leDisplay[SettingID][digiID][chID]->setStyleSheet("color : green;");
layout0->addWidget(leDisplay[SettingID][digiID][chID], 2*chIndex, 2); layout0->addWidget(leDisplay[SettingID][digiID][chID], 2*chIndex, 2);
sbSetting[SettingID][digiID][chID] = new RSpinBox(this); sbSetting[SettingID][digiID][chID] = new RSpinBox(this);
@ -471,6 +473,8 @@ void SOLARISpanel::CreateDetGroup(int SettingID, QList<int> detIDArray, QGridLay
connect(cbTrigger[detGroup][detID], &RComboBox::currentIndexChanged, this , [=](int index){ connect(cbTrigger[detGroup][detID], &RComboBox::currentIndexChanged, this , [=](int index){
if( !enableSignalSlot) return; if( !enableSignalSlot) return;
if( cbTrigger[detGroup][detID]->itemData(index).toInt() == -999 ) return;
if( chkAll[detGroup][SettingID]->isChecked() ){ if( chkAll[detGroup][SettingID]->isChecked() ){
for( int k = 0; k < detIDArrayList.size(); k++){ for( int k = 0; k < detIDArrayList.size(); k++){

2
digiSettingsPanel.cpp
View File

@ -69,7 +69,7 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
this->digi = digi; this->digi = digi;
this->nDigi = nDigi; this->nDigi = nDigi;
if( nDigi > MaxNumberOfDigitizer ) { if( nDigi > MaxNumberOfDigitizer ) {
this->nDigi = MaxNumberOfChannel; this->nDigi = MaxNumberOfDigitizer;
qDebug() << "Please increase the MaxNumberOfChannel"; qDebug() << "Please increase the MaxNumberOfChannel";
} }
this->digiSettingPath = analysisPath + "/working/Settings/"; this->digiSettingPath = analysisPath + "/working/Settings/";

213
mainwindow.cpp
View File

@ -295,7 +295,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent){
LogMsg("<font style=\"color: blue;\"><b>Welcome to SOLARIS DAQ.</b></font>"); LogMsg("<font style=\"color: blue;\"><b>Welcome to SOLARIS DAQ.</b></font>");
if( LoadProgramSettings() ) LoadExpSettings(); if( LoadProgramSettings() ) LoadExpNameSh();
} }
@ -452,11 +452,11 @@ int MainWindow::StartACQ(){
if( chkSaveRun->isChecked() ){ if( chkSaveRun->isChecked() ){
//Save setting to raw data with run ID //Save setting to raw data with run ID
QString fileSetting = rawDataFolder + "/" + expName + "_" + runIDStr + "XSetting_" + QString::number(digi[i]->GetSerialNumber()) + ".dat"; QString fileSetting = rawDataPath + "/" + expName + "_" + runIDStr + "XSetting_" + QString::number(digi[i]->GetSerialNumber()) + ".dat";
digi[i]->SaveSettingsToFile(fileSetting.toStdString().c_str()); digi[i]->SaveSettingsToFile(fileSetting.toStdString().c_str());
// name should be [ExpName]_[runID]_[digiID]_[digiSerialNumber]_[acculmulate_count].sol // name should be [ExpName]_[runID]_[digiID]_[digiSerialNumber]_[acculmulate_count].sol
QString outFileName = rawDataFolder + "/" + expName + "_" + runIDStr + "_" + QString::number(i).rightJustified(2, '0') + "_" + QString::number(digi[i]->GetSerialNumber()); QString outFileName = rawDataPath + "/" + expName + "_" + runIDStr + "_" + QString::number(i).rightJustified(2, '0') + "_" + QString::number(digi[i]->GetSerialNumber());
qDebug() << outFileName; qDebug() << outFileName;
digi[i]->OpenOutFile(outFileName.toStdString());// overwrite digi[i]->OpenOutFile(outFileName.toStdString());// overwrite
} }
@ -1187,7 +1187,7 @@ void MainWindow::SetUpScalar(){
lbFileSize[iDigi]->setAlignment(Qt::AlignCenter); lbFileSize[iDigi]->setAlignment(Qt::AlignCenter);
leTrigger[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()]; leTrigger[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()];
leAccept[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()]; leAccept[iDigi] = new QLineEdit *[digi[iDigi]->GetNChannels()];
for( int ch = 0; ch < MaxNumberOfChannel; ch++){ for( int ch = 0; ch < digi[iDigi]->GetNChannels(); ch++){
if( ch == 0 ){ if( ch == 0 ){
QLabel * lbDigi = new QLabel("Digi-" + QString::number(digi[iDigi]->GetSerialNumber()), scalar); QLabel * lbDigi = new QLabel("Digi-" + QString::number(digi[iDigi]->GetSerialNumber()), scalar);
@ -1340,15 +1340,17 @@ void MainWindow::ProgramSettingsPanel(){
helpInfo->appendHtml("These setting will be saved at the <font style=\"color : blue;\"> \ helpInfo->appendHtml("These setting will be saved at the <font style=\"color : blue;\"> \
Settings Save Path </font> as <b>programSettings.txt</b>. \ Settings Save Path </font> as <b>programSettings.txt</b>. \
If no such file exist, the program will create it."); If no such file exist, the program will create it.");
helpInfo->appendHtml("<p></p>"); helpInfo->appendHtml("<p></p>");
helpInfo->appendHtml("<font style=\"color : blue;\"> Analysis Path </font> is the path of \ helpInfo->appendHtml("<font style=\"color : blue;\"> Analysis Path </font> is the path of \
the folder of the analysis code. e.g. /home/<user>/analysis/"); the folder of the analysis code. Can be omitted.");
helpInfo->appendHtml("<font style=\"color : blue;\"> Data Path </font> is the path of the \ helpInfo->appendHtml("<font style=\"color : blue;\"> Data Path </font> is the path of the \
<b>parents folder</b> of Raw data will store. e.g. /mnt/data0/, \ <b>parents folder</b> of data will store. e.g. /mnt/data0/, \
experiment data will be saved under this folder. e.g. /mnt/data0/exp1"); experiment data will be saved under this folder. e.g. /mnt/data0/exp1");
helpInfo->appendHtml("<font style=\"color : blue;\"> Root Data Path </font> is the path of the \ helpInfo->appendHtml("<font style=\"color : blue;\"> Temp Exp Name </font> is the name of the experiment. \
<b>parents folder</b> of Root data will store. e.g. /mnt/data1/, \ This set the exp. folder under the <font style=\"color : blue;\"> Data Path </font>.\
root data will be saved under this folder. e.g. /mnt/data1/exp1"); This will override by <b>New/Change/Reload Exp</b>");
helpInfo->appendHtml("<p></p>"); helpInfo->appendHtml("<p></p>");
helpInfo->appendHtml("These 2 paths will be used when <font style=\"color : blue;\"> New/Change/Reload Exp </font>"); helpInfo->appendHtml("These 2 paths will be used when <font style=\"color : blue;\"> New/Change/Reload Exp </font>");
helpInfo->appendHtml("<p></p>"); helpInfo->appendHtml("<p></p>");
@ -1357,6 +1359,8 @@ void MainWindow::ProgramSettingsPanel(){
helpInfo->appendHtml("<p></p>"); helpInfo->appendHtml("<p></p>");
helpInfo->appendHtml("<font style=\"color : blue;\"> Database IP </font> or <font style=\"color : blue;\"> Elog IP </font> can be empty. In that case, no database and elog will be used."); helpInfo->appendHtml("<font style=\"color : blue;\"> Database IP </font> or <font style=\"color : blue;\"> Elog IP </font> can be empty. In that case, no database and elog will be used.");
helpInfo->appendHtml("<p></p>");
helpInfo->appendHtml(" * items can be ommitted");
layout->addWidget(helpInfo, rowID, 0, 1, 4); layout->addWidget(helpInfo, rowID, 0, 1, 4);
@ -1372,7 +1376,7 @@ void MainWindow::ProgramSettingsPanel(){
//-------- analysis Path //-------- analysis Path
rowID ++; rowID ++;
QLabel *lbAnalysisPath = new QLabel("Analysis Path", &dialog); QLabel *lbAnalysisPath = new QLabel("Analysis Path *", &dialog);
lbAnalysisPath->setAlignment(Qt::AlignRight | Qt::AlignCenter); lbAnalysisPath->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbAnalysisPath, rowID, 0); layout->addWidget(lbAnalysisPath, rowID, 0);
lAnalysisPath = new QLineEdit(analysisPath, &dialog); layout->addWidget(lAnalysisPath, rowID, 1, 1, 2); lAnalysisPath = new QLineEdit(analysisPath, &dialog); layout->addWidget(lAnalysisPath, rowID, 1, 1, 2);
@ -1385,20 +1389,27 @@ void MainWindow::ProgramSettingsPanel(){
QLabel *lbDataPath = new QLabel("Data Path", &dialog); QLabel *lbDataPath = new QLabel("Data Path", &dialog);
lbDataPath->setAlignment(Qt::AlignRight | Qt::AlignCenter); lbDataPath->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbDataPath, rowID, 0); layout->addWidget(lbDataPath, rowID, 0);
lDataPath = new QLineEdit(dataPath, &dialog); layout->addWidget(lDataPath, rowID, 1, 1, 2); lExpDataPath = new QLineEdit(expDataPath, &dialog); layout->addWidget(lExpDataPath, rowID, 1, 1, 2);
QPushButton * bnDataPath = new QPushButton("browser", &dialog); layout->addWidget(bnDataPath, rowID, 3); QPushButton * bnDataPath = new QPushButton("browser", &dialog); layout->addWidget(bnDataPath, rowID, 3);
connect(bnDataPath, &QPushButton::clicked, this, [=](){this->OpenDirectory(2);}); connect(bnDataPath, &QPushButton::clicked, this, [=](){this->OpenDirectory(2);});
//-------- root data Path //-------- root data Path
rowID ++; // rowID ++;
QLabel *lbRootDataPath = new QLabel("Root Data Path", &dialog); // QLabel *lbRootDataPath = new QLabel("Root Data Path", &dialog);
lbRootDataPath->setAlignment(Qt::AlignRight | Qt::AlignCenter); // lbRootDataPath->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbRootDataPath, rowID, 0); // layout->addWidget(lbRootDataPath, rowID, 0);
lRootDataPath = new QLineEdit(rootDataPath, &dialog); layout->addWidget(lRootDataPath, rowID, 1, 1, 2); // lRootDataPath = new QLineEdit(rootDataPath, &dialog); layout->addWidget(lRootDataPath, rowID, 1, 1, 2);
QPushButton * bnRootDataPath = new QPushButton("browser", &dialog); layout->addWidget(bnRootDataPath, rowID, 3); // QPushButton * bnRootDataPath = new QPushButton("browser", &dialog); layout->addWidget(bnRootDataPath, rowID, 3);
connect(bnRootDataPath, &QPushButton::clicked, this, [=](){this->OpenDirectory(3);}); // connect(bnRootDataPath, &QPushButton::clicked, this, [=](){this->OpenDirectory(3);});
//-------- Exp Name Temp
rowID ++;
QLabel *lbExpNameTemp = new QLabel("Temp. Exp Name *", &dialog);
lbExpNameTemp->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbExpNameTemp, rowID, 0);
lExpNameTemp = new QLineEdit(expName, &dialog); layout->addWidget(lExpNameTemp, rowID, 1, 1, 2);
//-------- IP Domain //-------- IP Domain
rowID ++; rowID ++;
@ -1408,19 +1419,19 @@ void MainWindow::ProgramSettingsPanel(){
lIPDomain = new QLineEdit(IPListStr, &dialog); layout->addWidget(lIPDomain, rowID, 1, 1, 2); lIPDomain = new QLineEdit(IPListStr, &dialog); layout->addWidget(lIPDomain, rowID, 1, 1, 2);
//-------- DataBase IP //-------- DataBase IP
rowID ++; rowID ++;
QLabel *lbDatbaseIP = new QLabel("Database IP", &dialog); QLabel *lbDatbaseIP = new QLabel("Database IP *", &dialog);
lbDatbaseIP->setAlignment(Qt::AlignRight | Qt::AlignCenter); lbDatbaseIP->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbDatbaseIP, rowID, 0); layout->addWidget(lbDatbaseIP, rowID, 0);
lDatbaseIP = new QLineEdit(DatabaseIP, &dialog); layout->addWidget(lDatbaseIP, rowID, 1, 1, 2); lDatbaseIP = new QLineEdit(DatabaseIP, &dialog); layout->addWidget(lDatbaseIP, rowID, 1, 1, 2);
//-------- DataBase name //-------- DataBase name
rowID ++; rowID ++;
QLabel *lbDatbaseName = new QLabel("Database Name", &dialog); QLabel *lbDatbaseName = new QLabel("Database Name *", &dialog);
lbDatbaseName->setAlignment(Qt::AlignRight | Qt::AlignCenter); lbDatbaseName->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbDatbaseName, rowID, 0); layout->addWidget(lbDatbaseName, rowID, 0);
lDatbaseName = new QLineEdit(DatabaseName, &dialog); layout->addWidget(lDatbaseName, rowID, 1, 1, 2); lDatbaseName = new QLineEdit(DatabaseName, &dialog); layout->addWidget(lDatbaseName, rowID, 1, 1, 2);
//-------- Elog IP //-------- Elog IP
rowID ++; rowID ++;
QLabel *lbElogIP = new QLabel("Elog IP", &dialog); QLabel *lbElogIP = new QLabel("Elog IP *", &dialog);
lbElogIP->setAlignment(Qt::AlignRight | Qt::AlignCenter); lbElogIP->setAlignment(Qt::AlignRight | Qt::AlignCenter);
layout->addWidget(lbElogIP, rowID, 0); layout->addWidget(lbElogIP, rowID, 0);
lElogIP = new QLineEdit(ElogIP, &dialog); layout->addWidget(lElogIP, rowID, 1, 1, 2); lElogIP = new QLineEdit(ElogIP, &dialog); layout->addWidget(lElogIP, rowID, 1, 1, 2);
@ -1471,8 +1482,8 @@ bool MainWindow::LoadProgramSettings(){
switch (count){ switch (count){
case 0 : programSettingsPath = line; break; case 0 : programSettingsPath = line; break;
case 1 : analysisPath = line; break; case 1 : analysisPath = line; break;
case 2 : dataPath = line; break; case 2 : expDataPath = line; break;
case 3 : rootDataPath = line; break; case 3 : expName = line; break;
case 4 : IPListStr = line; break; case 4 : IPListStr = line; break;
case 5 : DatabaseIP = line; break; case 5 : DatabaseIP = line; break;
case 6 : DatabaseName = line; break; case 6 : DatabaseName = line; break;
@ -1487,14 +1498,17 @@ bool MainWindow::LoadProgramSettings(){
logMsgHTMLMode = false; logMsgHTMLMode = false;
LogMsg("Setting File Path : " + programSettingsPath); LogMsg("Setting File Path : " + programSettingsPath);
LogMsg(" Analysis Path : " + analysisPath); LogMsg(" Analysis Path : " + analysisPath);
LogMsg(" Data Path : " + dataPath); LogMsg(" Exp Data Path : " + expDataPath);
LogMsg(" Root Data Path : " + rootDataPath); LogMsg(" Temp Exp. Name : " + expName);
LogMsg(" Digi. IP List : " + IPListStr); LogMsg(" Digi. IP List : " + IPListStr);
LogMsg(" Database IP : " + DatabaseIP); LogMsg(" Database IP : " + DatabaseIP);
LogMsg(" Database Name : " + DatabaseName); LogMsg(" Database Name : " + DatabaseName);
LogMsg(" ElogIP : " + ElogIP); LogMsg(" ElogIP : " + ElogIP);
logMsgHTMLMode = true; logMsgHTMLMode = true;
rawDataPath = expDataPath + "/" + expName + "/data_raw/";
rootDataPath = expDataPath + "/" + expName + "/root_data/";
ret = true; ret = true;
}else{ }else{
LogMsg("Settings are not complete."); LogMsg("Settings are not complete.");
@ -1502,11 +1516,17 @@ bool MainWindow::LoadProgramSettings(){
} }
} }
if( ret ){ if( ret ){
DecodeIPList(); DecodeIPList();
SetupInflux(); SetupInflux();
CheckElog();
leRawDataPath->setText(rawDataPath);
leExpName->setText(expName);
if(analysisPath.isEmpty()) bnNewExp->setEnabled(false);
return true; return true;
}else{ }else{
@ -1527,8 +1547,8 @@ void MainWindow::SaveProgramSettings(){
programSettingsPath = lSaveSettingPath->text(); programSettingsPath = lSaveSettingPath->text();
analysisPath = lAnalysisPath->text(); analysisPath = lAnalysisPath->text();
dataPath = lDataPath->text(); expDataPath = lExpDataPath->text();
rootDataPath = lRootDataPath->text(); expName = leExpName->text();
QFile file(programSettingsPath + "/programSettings.txt"); QFile file(programSettingsPath + "/programSettings.txt");
@ -1536,8 +1556,8 @@ void MainWindow::SaveProgramSettings(){
file.write((programSettingsPath+"\n").toStdString().c_str()); file.write((programSettingsPath+"\n").toStdString().c_str());
file.write((analysisPath+"\n").toStdString().c_str()); file.write((analysisPath+"\n").toStdString().c_str());
file.write((dataPath+"\n").toStdString().c_str()); file.write((expDataPath+"\n").toStdString().c_str());
file.write((rootDataPath+"\n").toStdString().c_str()); file.write((expName+"\n").toStdString().c_str());
file.write((IPListStr+"\n").toStdString().c_str()); file.write((IPListStr+"\n").toStdString().c_str());
file.write((DatabaseIP+"\n").toStdString().c_str()); file.write((DatabaseIP+"\n").toStdString().c_str());
file.write((DatabaseName+"\n").toStdString().c_str()); file.write((DatabaseName+"\n").toStdString().c_str());
@ -1553,8 +1573,16 @@ void MainWindow::SaveProgramSettings(){
DecodeIPList(); DecodeIPList();
SetupInflux(); SetupInflux();
CheckElog();
LoadExpSettings(); rawDataPath = expDataPath + "/" + expName + "/data_raw/";
rootDataPath = expDataPath + "/" + expName + "/root_data/";
leRawDataPath->setText(rawDataPath);
leExpName->setText(expName);
if(analysisPath.isEmpty()) bnNewExp->setEnabled(false);
// LoadExpNameSh();
} }
@ -1568,8 +1596,8 @@ void MainWindow::OpenDirectory(int id){
switch (id){ switch (id){
case 0 : lSaveSettingPath->setText(fileDialog.selectedFiles().at(0)); break; case 0 : lSaveSettingPath->setText(fileDialog.selectedFiles().at(0)); break;
case 1 : lAnalysisPath->setText(fileDialog.selectedFiles().at(0)); break; case 1 : lAnalysisPath->setText(fileDialog.selectedFiles().at(0)); break;
case 2 : lDataPath->setText(fileDialog.selectedFiles().at(0)); break; case 2 : lExpDataPath->setText(fileDialog.selectedFiles().at(0)); break;
case 3 : lRootDataPath->setText(fileDialog.selectedFiles().at(0)); break; // case 3 : lRootDataPath->setText(fileDialog.selectedFiles().at(0)); break;
} }
} }
@ -1641,25 +1669,25 @@ void MainWindow::SetupNewExpPanel(){
le1->setReadOnly(true); le1->setReadOnly(true);
layout->addWidget(le1, rowID, 1, 1, 3); layout->addWidget(le1, rowID, 1, 1, 3);
//------- Data Path // //------- Data Path
rowID ++; // rowID ++;
QLabel * l2 = new QLabel("Data Path ", &dialog); // QLabel * l2 = new QLabel("Raw Data Path ", &dialog);
l2->setAlignment(Qt::AlignCenter | Qt::AlignRight); // l2->setAlignment(Qt::AlignCenter | Qt::AlignRight);
layout->addWidget(l2, rowID, 0); // layout->addWidget(l2, rowID, 0);
QLineEdit * le2 = new QLineEdit(dataPath, &dialog); // QLineEdit * le2 = new QLineEdit(rawDataPath, &dialog);
le2->setReadOnly(true); // le2->setReadOnly(true);
layout->addWidget(le2, rowID, 1, 1, 3); // layout->addWidget(le2, rowID, 1, 1, 3);
//------- Root Data Path // //------- Root Data Path
rowID ++; // rowID ++;
QLabel * l2a = new QLabel("Root Data Path ", &dialog); // QLabel * l2a = new QLabel("Root Data Path ", &dialog);
l2a->setAlignment(Qt::AlignCenter | Qt::AlignRight); // l2a->setAlignment(Qt::AlignCenter | Qt::AlignRight);
layout->addWidget(l2a, rowID, 0); // layout->addWidget(l2a, rowID, 0);
QLineEdit * le2a = new QLineEdit(rootDataPath, &dialog); // QLineEdit * le2a = new QLineEdit(rootDataPath, &dialog);
le2a->setReadOnly(true); // le2a->setReadOnly(true);
layout->addWidget(le2a, rowID, 1, 1, 3); // layout->addWidget(le2a, rowID, 1, 1, 3);
//------- get harddisk space; //------- get harddisk space;
rowID ++; rowID ++;
@ -1851,19 +1879,19 @@ void MainWindow::SetupNewExpPanel(){
layout->setRowStretch(0, 1); layout->setRowStretch(0, 1);
for( int i = 1; i < rowID; i++) layout->setRowStretch(i, 2); for( int i = 1; i < rowID; i++) layout->setRowStretch(i, 2);
LoadExpSettings(); LoadExpNameSh();
dialog.exec(); dialog.exec();
} }
bool MainWindow::LoadExpSettings(){ bool MainWindow::LoadExpNameSh(){
//this method set the analysis setting ann symbloic link to raw data //this method set the analysis setting ann symbloic link to raw data
//ONLY load file, not check the git //ONLY load file, not check the git
if( analysisPath == "") return false; if( rawDataPath == "") return false;
QString settingFile = analysisPath + "/working/expName.sh"; QString settingFile = rawDataPath + "/expName.sh";
LogMsg("Loading <b>" + settingFile + "</b> for Experiment."); LogMsg("Loading <b>" + settingFile + "</b> for Experiment.");
@ -1892,45 +1920,44 @@ bool MainWindow::LoadExpSettings(){
switch (count){ switch (count){
case 0 : expName = haha; break; case 0 : expName = haha; break;
case 1 : rawDataFolder = haha; break; // case 1 : expDataPath = haha; break;
case 2 : rootDataFolder = haha; break; case 1 : runID = haha.toInt(); break;
case 3 : runID = haha.toInt(); break; case 2 : elogID = haha.toInt(); break;
case 4 : elogID = haha.toInt(); break;
} }
count ++; count ++;
line = in.readLine(); line = in.readLine();
} }
leRawDataPath->setText(rawDataFolder); rawDataPath = expDataPath + "/" + expName + "/data_raw/";
rootDataPath = expDataPath + "/" + expName + "/root_data/";
leRawDataPath->setText(rawDataPath);
leExpName->setText(expName); leExpName->setText(expName);
leRunID->setText(QString::number(runID)); leRunID->setText(QString::number(runID));
bnOpenDigitizers->setStyleSheet("color:red;"); bnOpenDigitizers->setStyleSheet("color:red;");
CheckElog();
return true; return true;
} }
void MainWindow::WriteExpNameSh(){ void MainWindow::WriteExpNameSh(){
QDir dir(analysisPath + "/working/"); QDir dir(rawDataPath);
if( !dir.exists() ) dir.mkpath("."); if( !dir.exists() ) dir.mkpath(".");
//----- create the expName.sh //----- create the expName.sh
QFile file2(analysisPath + "/working/expName.sh"); QFile file2(rawDataPath + "/expName.sh");
file2.open(QIODevice::Text | QIODevice::WriteOnly); file2.open(QIODevice::Text | QIODevice::WriteOnly);
file2.write(("expName="+ expName + "\n").toStdString().c_str()); file2.write(("expName="+ expName + "\n").toStdString().c_str());
file2.write(("rawDataPath="+ rawDataFolder + "\n").toStdString().c_str()); // file2.write(("ExpDataPath="+ expDataPath + "\n").toStdString().c_str());
file2.write(("rootDataPath="+ rootDataFolder + "\n").toStdString().c_str());
file2.write(("runID="+std::to_string(runID)+"\n").c_str()); file2.write(("runID="+std::to_string(runID)+"\n").c_str());
file2.write(("elogID="+std::to_string(elogID)+"\n").c_str()); file2.write(("elogID="+std::to_string(elogID)+"\n").c_str());
file2.write("#------------end of file."); file2.write("#------------end of file.");
file2.close(); file2.close();
LogMsg("Saved expName.sh to <b>"+ analysisPath + "/working/expName.sh<b>."); LogMsg("Saved expName.sh to <b>"+ rawDataPath + "/expName.sh<b>.");
} }
@ -1997,7 +2024,10 @@ void MainWindow::CreateNewExperiment(const QString newExpName){
logMsgHTMLMode = true; logMsgHTMLMode = true;
LogMsg("<font style=\"color red;\"> !!!! Please Create a new Elog with name <b>" + newExpName + "</b>. </font>"); LogMsg("<font style=\"color red;\"> !!!! Please Create a new Elog with name <b>" + newExpName + "</b>. </font>");
leRawDataPath->setText(rawDataFolder); rawDataPath = expDataPath + "/" + newExpName + "/raw_data/";
rootDataPath = expDataPath + "/" + newExpName + "/root_data/";
leRawDataPath->setText(rawDataPath);
leExpName->setText(expName); leExpName->setText(expName);
leRunID->setText(QString::number(runID)); leRunID->setText(QString::number(runID));
@ -2033,7 +2063,7 @@ void MainWindow::ChangeExperiment(const QString newExpName){
LogMsg("Swicted to branch : <b>" + expName + "</b>"); LogMsg("Swicted to branch : <b>" + expName + "</b>");
CreateRawDataFolderAndLink(); CreateRawDataFolderAndLink();
LoadExpSettings(); LoadExpNameSh();
if( influx ){ if( influx ){
influx->ClearDataPointsBuffer(); influx->ClearDataPointsBuffer();
@ -2047,29 +2077,27 @@ void MainWindow::ChangeExperiment(const QString newExpName){
void MainWindow::CreateRawDataFolderAndLink(){ void MainWindow::CreateRawDataFolderAndLink(){
//----- create data folder //----- create data folder
rawDataFolder = dataPath + "/" + expName;
QDir dir; QDir dir;
if( !dir.exists(rawDataFolder)){ if( !dir.exists(rawDataPath)){
if( dir.mkdir(rawDataFolder)){ if( dir.mkdir(rawDataPath)){
LogMsg("Created folder <b>" + rawDataFolder + "</b> for storing raw data." ); LogMsg("Created folder <b>" + rawDataPath + "</b> for storing raw data." );
}else{ }else{
LogMsg("<font style=\"color:red;\"><b>" + rawDataFolder + "</b> cannot be created. Access right problem? </font>" ); LogMsg("<font style=\"color:red;\"><b>" + rawDataPath + "</b> cannot be created. Access right problem? </font>" );
} }
}else{ }else{
LogMsg("<b>" + rawDataFolder + "</b> already exist." ); LogMsg("<b>" + rawDataPath + "</b> already exist." );
} }
//----- create root data folder //----- create root data folder
rootDataFolder = rootDataPath + "/" + expName;
QDir rootDir; QDir rootDir;
if( !rootDir.exists(rootDataFolder)) { if( !rootDir.exists(rootDataPath)) {
if( rootDir.mkdir(rootDataFolder) ){ if( rootDir.mkdir(rootDataPath) ){
LogMsg("Created folder <b>" + rootDataFolder + "</b> for storing root files."); LogMsg("Created folder <b>" + rootDataPath + "</b> for storing root files.");
}else{ }else{
LogMsg("<font style=\"color:red;\"><b>" + rootDataFolder + "</b> cannot be created. Access right problem? </font>" ); LogMsg("<font style=\"color:red;\"><b>" + rootDataPath + "</b> cannot be created. Access right problem? </font>" );
} }
}else{ }else{
LogMsg("<b>" + rootDataFolder + "</b> already exist." ); LogMsg("<b>" + rootDataPath + "</b> already exist." );
} }
//----- create analysis Folder //----- create analysis Folder
@ -2093,10 +2121,10 @@ void MainWindow::CreateRawDataFolderAndLink(){
LogMsg("removing existing Link"); LogMsg("removing existing Link");
} }
if (file.link(rawDataFolder, linkName)) { if (file.link(rawDataPath, linkName)) {
LogMsg("Symbolic link <b>" + linkName +"</b> -> " + rawDataFolder + " created."); LogMsg("Symbolic link <b>" + linkName +"</b> -> " + rawDataPath + " created.");
} else { } else {
LogMsg("<font style=\"color:red;\">Symbolic link <b>" + linkName +"</b> -> " + rawDataFolder + " cannot be created. </font>"); LogMsg("<font style=\"color:red;\">Symbolic link <b>" + linkName +"</b> -> " + rawDataPath + " cannot be created. </font>");
} }
linkName = analysisPath + "/root_data"; linkName = analysisPath + "/root_data";
@ -2105,10 +2133,10 @@ void MainWindow::CreateRawDataFolderAndLink(){
LogMsg("removing existing Link"); LogMsg("removing existing Link");
} }
if (file.link(rawDataFolder, linkName)) { if (file.link(rootDataPath, linkName)) {
LogMsg("Symbolic link <b>" + linkName +"</b> -> " + rootDataFolder + " created."); LogMsg("Symbolic link <b>" + linkName +"</b> -> " + rootDataPath + " created.");
} else { } else {
LogMsg("<font style=\"color:red;\">Symbolic link <b>" + linkName +"</b> -> " + rootDataFolder + " cannot be created. </font>"); LogMsg("<font style=\"color:red;\">Symbolic link <b>" + linkName +"</b> -> " + rootDataPath + " cannot be created. </font>");
} }
} }
@ -2135,6 +2163,12 @@ void MainWindow::SetupInflux(){
delete influx; delete influx;
influx = NULL; influx = NULL;
} }
if( DatabaseIP.isEmpty() || DatabaseName.isEmpty() ){
LogMsg("No Database IP or Name. No database will be used.");
return;
}
if( DatabaseIP != ""){ if( DatabaseIP != ""){
influx = new InfluxDB(DatabaseIP.toStdString(), false); influx = new InfluxDB(DatabaseIP.toStdString(), false);
@ -2180,6 +2214,11 @@ void MainWindow::SetupInflux(){
void MainWindow::CheckElog(){ void MainWindow::CheckElog(){
if( ElogIP.isEmpty() ) {
LogMsg("No Elog IP. No elog will be used.");
return;
}
WriteElog("Checking elog writing", "Testing communication", "checking"); WriteElog("Checking elog writing", "Testing communication", "checking");
if( elogID > 0 ){ if( elogID > 0 ){
@ -2288,7 +2327,7 @@ void MainWindow::AppendElog(QString appendHtmlText, int screenID){
void MainWindow::WriteRunTimeStampDat(bool isStartRun, QString timeStr){ void MainWindow::WriteRunTimeStampDat(bool isStartRun, QString timeStr){
QFile file(dataPath + "/" + expName + "/RunTimeStamp.dat"); QFile file(expDataPath + "/" + expName + "/data_raw/RunTimeStamp.dat");
if( file.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append) ){ if( file.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append) ){
@ -2302,7 +2341,7 @@ void MainWindow::WriteRunTimeStampDat(bool isStartRun, QString timeStr){
} }
QFile fileCSV(dataPath + "/" + expName + "/RunTimeStamp.csv"); QFile fileCSV(expDataPath + "/" + expName + "/data_raw/RunTimeStamp.csv");
if( fileCSV.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append) ){ if( fileCSV.open(QIODevice::Text | QIODevice::WriteOnly | QIODevice::Append) ){

16
mainwindow.h
View File

@ -70,7 +70,7 @@ private slots:
void OpenDirectory(int id); void OpenDirectory(int id);
void SetupNewExpPanel(); void SetupNewExpPanel();
bool LoadExpSettings(); bool LoadExpNameSh();
void CreateNewExperiment(const QString newExpName); void CreateNewExperiment(const QString newExpName);
void ChangeExperiment(const QString newExpName); void ChangeExperiment(const QString newExpName);
void WriteExpNameSh(); void WriteExpNameSh();
@ -164,10 +164,11 @@ private:
QStringList detGroupName; QStringList detGroupName;
//@----- Program settings //@----- Program settings
QLineEdit * lSaveSettingPath; // only live in ProgramSettigns() QLineEdit * lSaveSettingPath;
QLineEdit * lAnalysisPath; // only live in ProgramSettigns() QLineEdit * lAnalysisPath; //for git
QLineEdit * lDataPath; // only live in ProgramSettigns() QLineEdit * lExpDataPath;
QLineEdit * lRootDataPath; // only live in ProgramSettigns()
QLineEdit * lExpNameTemp;
QLineEdit * lIPDomain; QLineEdit * lIPDomain;
QLineEdit * lDatbaseIP; QLineEdit * lDatbaseIP;
@ -176,7 +177,8 @@ private:
QString programSettingsPath; QString programSettingsPath;
QString analysisPath; QString analysisPath;
QString dataPath; QString expDataPath;
QString rawDataPath;
QString rootDataPath; QString rootDataPath;
QString IPListStr; QString IPListStr;
QStringList IPList; QStringList IPList;
@ -188,8 +190,6 @@ private:
bool isGitExist; bool isGitExist;
bool useGit; bool useGit;
QString expName; QString expName;
QString rawDataFolder;
QString rootDataFolder;
int runID; int runID;
QString runIDStr; QString runIDStr;
int elogID; // 0 = ready, -1 = disable, >1 = elogID int elogID; // 0 = ready, -1 = disable, >1 = elogID

2
scope.cpp
View File

@ -12,7 +12,7 @@ Scope::Scope(Digitizer2Gen **digi, unsigned int nDigi, ReadDataThread ** readDat
this->digi = digi; this->digi = digi;
this->nDigi = nDigi; this->nDigi = nDigi;
if( nDigi > MaxNumberOfDigitizer ) { if( nDigi > MaxNumberOfDigitizer ) {
this->nDigi = MaxNumberOfChannel; this->nDigi = MaxNumberOfDigitizer;
qDebug() << "Please increase the MaxNumberOfChannel"; qDebug() << "Please increase the MaxNumberOfChannel";
} }
this->readDataThread = readDataThread; this->readDataThread = readDataThread;