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

I tested with QDC AMC version 135.17, the Overthreshold is working.

Browse Source
This commit is contained in:
Ryan Tang 2024-11-21 18:40:07 -05:00
parent d3f97358e2
commit 770d2c5af4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ClassDigitizer.cpp
View File

@ -144,23 +144,23 @@ int Digitizer::OpenDigitizer(int boardID, int portID, bool program, bool verbose
ModelType = ModelTypeCode::VME; ModelType = ModelTypeCode::VME;
tick2ns = 16.0; ///ns -> 62.5 MSamples/s tick2ns = 16.0; ///ns -> 62.5 MSamples/s
std::string ROC = BoardInfo.ROC_FirmwareRel; // std::string ROC = BoardInfo.ROC_FirmwareRel;
std::string AMC = BoardInfo.AMC_FirmwareRel; // std::size_t pos = ROC.find(" - ");
// std::string versionROCStr = (pos != std::string::npos) ? ROC.substr(0, pos) : "";
// double versionROC = 0.0;
// if (!versionROCStr.empty()) versionROC = std::stod(versionROCStr);
// printf(" QDC ROC version : %.2f \n", versionROC);
std::size_t pos = ROC.find(" - "); std::string AMC = BoardInfo.AMC_FirmwareRel;
std::string versionROCStr = (pos != std::string::npos) ? ROC.substr(0, pos) : ""; std::size_t pos = AMC.find(" - ");
pos = AMC.find(" - ");
std::string versionAMCStr = (pos != std::string::npos) ? AMC.substr(0, pos) : ""; std::string versionAMCStr = (pos != std::string::npos) ? AMC.substr(0, pos) : "";
double versionROC = 0.0;
double versionAMC = 0.0; double versionAMC = 0.0;
if (!versionROCStr.empty()) versionROC = std::stod(versionROCStr);
if (!versionAMCStr.empty()) versionAMC = std::stod(versionAMCStr); if (!versionAMCStr.empty()) versionAMC = std::stod(versionAMCStr);
printf(" QDC ROC version : %.2f \n", versionROC);
printf(" QDC AMC version : %.2f \n", versionAMC); printf(" QDC AMC version : %.2f \n", versionAMC);
if( versionROC <= 4.25 || versionAMC <= 135.15 ){ if( versionAMC < 135.17 ){
printf(" QDC ROC or AMC version not support OverThreshold Width.\n"); printf(" QDC AMC version not support OverThreshold Width.\n");
hasOverThresholdWidth = false; hasOverThresholdWidth = false;
}else{ }else{
hasOverThresholdWidth = true; hasOverThresholdWidth = true;