From fc31f1a65801dc6419793f789bdd73a81921cbe2 Mon Sep 17 00:00:00 2001
From: "Ryan@SOLARIS-DAQ" <rtang@fsu.edu>
Date: Sat, 27 Jul 2024 15:36:30 -0400
Subject: [PATCH] bug fix for VX2730

---
 ClassDigitizer2Gen.cpp | 10 +++++++++-
 digiSettingsPanel.cpp  | 26 ++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ClassDigitizer2Gen.cpp b/ClassDigitizer2Gen.cpp
index 3d2668f..56f779a 100644
--- a/ClassDigitizer2Gen.cpp
+++ b/ClassDigitizer2Gen.cpp
@@ -1208,12 +1208,20 @@ void Digitizer2Gen::ReadAllSettings(){
       boardSettings[i].GetPara() == PHA::DIG::TempSensADC6.GetPara()
      )
     ) continue;
+
+    if( ModelName == "VX2730" && 
+      (boardSettings[i].GetPara() == PHA::DIG::FreqSensCore.GetPara() ||  
+       boardSettings[i].GetPara() == PHA::DIG::DutyCycleSensDCDC.GetPara()
+      )
+    ) continue;
     ReadValue(boardSettings[i]);
   }
 
   if( ModelName == "VX2745") for(int i = 0; i < 4 ; i ++) ReadValue(VGASetting[i], i);
 
-  if( CupVer >= 2023091800 ) for( int idx = 0; idx < 16; idx++) ReadValue(InputDelay[idx], idx, false);
+  if( ModelName != "VX2730"){
+    if( CupVer >= 2023091800 ) for( int idx = 0; idx < 16; idx++) ReadValue(InputDelay[idx], idx, false);
+  }
 
   for( int index = 0; index < 4; index++){
     for( int i = 0; i < (int) LVDSSettings[index].size(); i++){
diff --git a/digiSettingsPanel.cpp b/digiSettingsPanel.cpp
index 1150530..f885194 100644
--- a/digiSettingsPanel.cpp
+++ b/digiSettingsPanel.cpp
@@ -788,17 +788,19 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer2Gen ** digi, unsigned short nDigi
       }
 
       {//^====================== Group = InputDelay
-        bdGroup[iDigi] = new QWidget(this);
-        bdTab->addTab(bdGroup[iDigi], "Input Delay");
-        QGridLayout * groupLayout = new QGridLayout(bdGroup[iDigi]);
-        groupLayout->setAlignment(Qt::AlignTop );
-        //LVDSLayout->setSpacing(2);
+        if( digi[iDigi]->GetModelName() != "VX2730") {
+          bdGroup[iDigi] = new QWidget(this);
+          bdTab->addTab(bdGroup[iDigi], "Input Delay");
+          QGridLayout * groupLayout = new QGridLayout(bdGroup[iDigi]);
+          groupLayout->setAlignment(Qt::AlignTop );
+          //LVDSLayout->setSpacing(2);
 
-        for(int k = 0; k < MaxNumberOfGroup; k ++){
-          SetupSpinBox(spbInputDelay[iDigi][k], PHA::GROUP::InputDelay, k, false, "ch : " + QString::number(4*k) + " - " + QString::number(4*k+3) + " [ns] ", groupLayout, k/4, 2*(k%4));
+          for(int k = 0; k < MaxNumberOfGroup; k ++){
+            SetupSpinBox(spbInputDelay[iDigi][k], PHA::GROUP::InputDelay, k, false, "ch : " + QString::number(4*k) + " - " + QString::number(4*k+3) + " [ns] ", groupLayout, k/4, 2*(k%4));
+          }
+
+          bdGroup[iDigi]->setEnabled(digi[iDigi]->GetCupVer() >= MIN_VERSION_GROUP);
         }
-
-        bdGroup[iDigi]->setEnabled(digi[iDigi]->GetCupVer() >= MIN_VERSION_GROUP);
       }
 
     }
@@ -2619,7 +2621,7 @@ void DigiSettingsPanel::UpdatePanelFromMemory(bool onlyStatus){
   }
 
   //------------ Group
-  if( digi[ID]->GetCupVer() >= MIN_VERSION_GROUP ){
+  if( digi[ID]->GetModelName() != "VX2730" && digi[ID]->GetCupVer() >= MIN_VERSION_GROUP ){
     for( int k = 0 ; k < MaxNumberOfGroup; k++){
       FillSpinBoxValueFromMemory(spbInputDelay[ID][k], PHA::GROUP::InputDelay, k); // PHA = PSD
     }
@@ -2748,12 +2750,12 @@ void DigiSettingsPanel::UpdatePanelFromMemory(bool onlyStatus){
       unsigned long haha = Utility::TenBase(digi[ID]->GetSettingValueFromMemory(PHA::CH::ChannelsTriggerMask, ch));
       if( mask != haha) {
         isSame = false;
-        leTriggerMask[ID][MaxNumberOfChannel]->setText("Diff. value");
+        leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("Diff. value");
         break;
       }
     }
 
-    if( isSame ) leTriggerMask[ID][MaxNumberOfChannel]->setText("0x" + QString::number(mask, 16).toUpper());
+    if( isSame ) leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("0x" + QString::number(mask, 16).toUpper());
   }else{
     unsigned long  mask = Utility::TenBase(digi[ID]->GetSettingValueFromMemory(PHA::CH::ChannelsTriggerMask, cbChPick[ID]->currentData().toInt()));
     leTriggerMask[ID][digi[ID]->GetNChannels()]->setText("0x" + QString::number(mask, 16).toUpper());