From 770d2c5af445f413110a88e44f479a0f3a28ba44 Mon Sep 17 00:00:00 2001 From: "Ryan@SOLARIS_testStation" Date: Thu, 21 Nov 2024 18:40:07 -0500 Subject: [PATCH] I tested with QDC AMC version 135.17, the Overthreshold is working. --- ClassDigitizer.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ClassDigitizer.cpp b/ClassDigitizer.cpp index f15514e..918c0bf 100644 --- a/ClassDigitizer.cpp +++ b/ClassDigitizer.cpp @@ -144,23 +144,23 @@ int Digitizer::OpenDigitizer(int boardID, int portID, bool program, bool verbose ModelType = ModelTypeCode::VME; tick2ns = 16.0; ///ns -> 62.5 MSamples/s - std::string ROC = BoardInfo.ROC_FirmwareRel; - std::string AMC = BoardInfo.AMC_FirmwareRel; + // std::string ROC = BoardInfo.ROC_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 versionROCStr = (pos != std::string::npos) ? ROC.substr(0, pos) : ""; - pos = AMC.find(" - "); + std::string AMC = BoardInfo.AMC_FirmwareRel; + std::size_t pos = AMC.find(" - "); std::string versionAMCStr = (pos != std::string::npos) ? AMC.substr(0, pos) : ""; - double versionROC = 0.0; double versionAMC = 0.0; - if (!versionROCStr.empty()) versionROC = std::stod(versionROCStr); if (!versionAMCStr.empty()) versionAMC = std::stod(versionAMCStr); - printf(" QDC ROC version : %.2f \n", versionROC); printf(" QDC AMC version : %.2f \n", versionAMC); - if( versionROC <= 4.25 || versionAMC <= 135.15 ){ - printf(" QDC ROC or AMC version not support OverThreshold Width.\n"); + if( versionAMC < 135.17 ){ + printf(" QDC AMC version not support OverThreshold Width.\n"); hasOverThresholdWidth = false; }else{ hasOverThresholdWidth = true;