Compare commits

..

46 Commits

Author SHA1 Message Date
Ryan Tang ce9d2d3063 small fix, prepare for clean up the git image for the firmware 2025-05-15 13:29:15 -05:00
Ryan Tang ceb4cf4563 remove all firmwares due to too big, can donwload from FSU Fox'Lab wiki 2025-05-13 16:33:47 -05:00
Ryan@iMac f8e60f94ce add python scripts to extract parameters to JSON and compare the JSON 2025-05-13 16:30:34 -05:00
Ryan Tang bd47bc4928 various fix focused on PSD firmware for VX2730, aim to match firmware version 2024092000 2025-05-12 18:19:06 -05:00
Ryan@fischam 8dd9023b68 fix display for 32 channels model on the scaler 2025-05-06 11:33:27 -05:00
Ryan Tang bc73eaa91d Create LICENSE
Add GPL License.
2024-12-07 14:32:29 -05:00
Ryan Tang 369d99524c bug fix on DigiParameters::GetFullPara for all channels 2024-10-30 12:13:01 -04:00
Ryan Tang 5c62ccbc89 added Save-runs-in-subFolders setting 2024-10-15 10:59:26 -04:00
Ryan Tang b5a974a38d add support for 32 channel board in the DigiParameters.h 2024-09-27 14:17:22 -04:00
Ryan Tang daf8d133a9 edit test.cpp and Makefile for ClassInfluxDB 2024-07-31 15:02:12 -04:00
Ryan Tang 2c039dc743 update the influxdb class to ClassInfixDB to suppport influx 2.0 2024-07-31 14:54:50 -04:00
Ryan Tang bcf73b4112 bug fix for VX2730 2024-07-27 15:36:30 -04:00
Ryan Tang beb4cdef8e Add Run Time for EventBuilder 2024-07-04 20:09:17 -04:00
Ryan Tang 005c752772 slightly change the EventBuilder to compatable with Root DataFrame. 2024-07-04 20:07:58 -04:00
Ryan Tang aa60a0dbe3 when create new branch in analysis Path, check the branch exist, display raw data path fix 2024-07-04 20:07:58 -04:00
Ryan@MBA2024 66ba308d9b fix Hit.h for Mac 2024-07-04 18:30:21 -04:00
Ryan Tang 852f4b52f4 [Major] fully tested new folder arrangement. the programSettings.txt will be saved on current directory, can run without analysis path 2024-07-01 17:56:03 -04:00
Ryan Tang 4b7ae83997 snapshot, not finished 2024-07-01 17:19:23 -04:00
Ryan Tang b7f2fcbc58 improve the user experiment on program setting. add alot of fault proof 2024-07-01 13:33:49 -04:00
Ryan Tang 6571f93d9b re structure the file structure. now the daq work without eanalysis folder. 2024-06-28 18:30:35 -04:00
Ryan Tang 844f14be5f setting file inlcuded DPP type 2024-06-11 14:25:56 -04:00
Ryan Tang ab94ef3dfa add the make file in Aux, small change for Ubuntu 23.04 2024-04-11 19:29:23 -04:00
Ryan Tang 0c6db57f47 comment out some useless codes 2024-04-08 20:41:57 -04:00
Ryan Tang 8b668cb8d5 fixed repeat run problems 2024-04-08 20:17:26 -04:00
Ryan Tang 378fffe4ec Scope will set digitizer into self-trigger 2024-04-08 16:55:26 -04:00
Ryan Tang 2fa22bbcc2 Add text in Sync button to indicate Sync mode 2024-04-08 13:57:31 -04:00
Ryan Tang f0f25f860d test Pulse tab is only avalible when Global trigger source has test pulse 2024-04-08 13:53:39 -04:00
Ryan Tang 95efe40ffa fixed VGA setting crash; remove unless buttons in the main panel 2024-04-08 13:42:13 -04:00
Ryan Tang b7a23b4a7e small modification of Hit.h and SolReader.h 2024-04-05 12:17:13 -04:00
Ryan Tang 119eb64fd2 move Eventbuilder from SOLARIS_Analysis to here. Created Aux folder to store Auxilary code, like EventBuilder 2024-03-20 18:54:43 -04:00
Ryan Tang bdf4208070 make the RunTimeStamp good within 1 sec 2023-12-07 18:10:17 -05:00
Ryan Tang 8d10d24d18 bug fix on the RunTimestamp.dat. 2023-12-07 17:06:33 -05:00
Ryan Tang fdc155ed90 display bug in digiPanel 2023-11-15 12:45:59 -05:00
Ryan Tang 68d86c3618 bug fix for ClassDigitizer2Gen::ReadData() for PHA data format 2023-11-14 16:50:55 -05:00
Ryan Tang d65c324119 added min+fine_timestamo data format 2023-11-06 13:44:55 -05:00
Ryan Tang 29f551018e bug fix on BoardVetoPolarity and InputDelay Display 2023-11-06 13:13:42 -05:00
Ryan Tang a8b87e70f4 fixed using old firmware with new libraries 2023-10-26 17:03:23 -04:00
Ryan Tang b888a8ea63 improved the Input Delay 2023-10-26 16:37:29 -04:00
Ryan Tang d96ed2984e add CupVer protection for Input Delay setting 2023-10-25 15:06:33 -04:00
Ryan Tang fbb20eff93 added InputDelay for latest firmware 2023-10-25 14:57:07 -04:00
Ryan Tang f5fd9174f9 do the same when digitizer changed in scope 2023-10-20 12:10:22 -04:00
Ryan Tang 20478c317e in scope when channel change, disbale all other channel but the one selected 2023-10-20 12:05:03 -04:00
Ryan Tang 40230300fe fixed scope stop, only restore ch on/off for 1st digitizer, added more comment string support for Mapping.h, change color green to orange for some Combox 2023-10-20 11:47:39 -04:00
Ryan Tang 6041a6880b remove settings using Sample in setting file 2023-10-19 09:38:57 -04:00
Ryan Tang ee3edbeba6 update the DigiParameters.h and Digitizer Class for latest PHA firmware. new parameters are not implemented. Still supporting old firmware 2023-10-16 13:27:40 -04:00
Ryan Tang 1186de195d added firmwares folder and update README.md 2023-10-16 12:43:45 -04:00
2 changed files with 12 additions and 3 deletions

View File

@ -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);
}
}

View File

@ -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();