finished boardSetting, not tested

DigitizerPHA.cpp

@@ -143,7 +143,7 @@ void DigitizerPHA::SetSetting(Setting::PHA settingName, float value, int ch){
 
     case Setting::PHA::EventPreAggregate_G_max1023:              input = value; WriteRegister(Register::DPP::NumberEventsPerAggregate_G,   input, ch) ; break;
     case Setting::PHA::AggregateOrganization_board_3bit:         input = value; WriteRegister(Register::DPP::AggregateOrganization ,       input, ch) ; break;
-    case Setting::PHA::MaxAggregatePreBlockTransfer_board_10bit: input = value; WriteRegister(Register::DPP::MaxAggregatePerBlockTransfer, input, ch) ; break;
+    case Setting::PHA::MaxAggregatePerBlockTransfer_board_10bit: input = value; WriteRegister(Register::DPP::MaxAggregatePerBlockTransfer, input, ch) ; break;
     
     case Setting::PHA::VetoWidth_ns:{
       unsigned int input = 0 ;
@@ -289,7 +289,7 @@ double DigitizerPHA::GetSetting(Setting::PHA settingName, int ch){
       value = ((temp & 0x007) < 2 ? 0 : (int)pow(2, temp & 7));
       break;
     }
-    case Setting::PHA::MaxAggregatePreBlockTransfer_board_10bit: temp = ReadRegister(Register::DPP::MaxAggregatePerBlockTransfer , ch); value = temp; break;
+    case Setting::PHA::MaxAggregatePerBlockTransfer_board_10bit: temp = ReadRegister(Register::DPP::MaxAggregatePerBlockTransfer , ch); value = temp; break;
 
     case Setting::PHA::TriggerThreshold_LSD:               temp = ReadRegister(Register::DPP::PHA::TriggerThreshold , ch);     value = temp; break;
     case Setting::PHA::TriggerHoldOffWidth_ns:             temp = ReadRegister(Register::DPP::PHA::TriggerHoldOffWidth , ch);  value = temp * 4 * ch2ns; break;

FSUDAQ.cpp

@@ -230,9 +230,15 @@ void MainWindow::HandleMenu(Int_t id){
       break;
     
     ///========================= Board setting
-    case M_BOARD_SETTINGS:
+    case M_BOARD_SETTINGS:{
+      if( boardSetting == NULL ) {
         boardSetting = new BoardSetting(gClient->GetRoot(), 600, 600, digi, nDigi);
-      break;
+      }else{
+        if ( boardSetting->IsOpen() == false ){
+            boardSetting = new BoardSetting(gClient->GetRoot(), 600, 600, digi, nDigi);
+        }
+      }
+    }break;
       
     ///========================= Program setting
     case M_PROGRAM_SETTINGS:{

RegisterAddress.h

@@ -274,7 +274,7 @@ namespace Setting{
     VetoWidth_ns,
     EventPreAggregate_G_max1023,
     AggregateOrganization_board_3bit,
-    MaxAggregatePreBlockTransfer_board_10bit,
+    MaxAggregatePerBlockTransfer_board_10bit,
     
     TriggerThreshold_LSD,
     TriggerHoldOffWidth_ns,

boardSetting.h

@@ -44,7 +44,8 @@ class BoardSetting{
     TGCheckButton * bDualTrace;
     TGComboBox * cbAP1;
     TGComboBox * cbAP2; /// for ComboBox for analog probe 2 
-    TGComboBox * cbDP;
+    TGComboBox * cbDP1;
+    TGComboBox * cbDP2;
     TGComboBox * cbAggOrg;
     TGNumberEntry * numAggBLT; /// number of Agg pre Block transfer
     TGComboBox * cbFanCtrl;
@@ -86,9 +87,6 @@ class BoardSetting{
     TGNumberEntry * TRGMajorLevel;
     TGNumberEntry * TRGOUTMajorLevel;
 
-    TGCheckButton * bGLBLVDSTrigger;
-    TGCheckButton * bTRGOUTLVDSTrigger;
-
     TGCheckButton * bGLBExtTrigger;
     TGCheckButton * bTRGExtTrigger;
     TGCheckButton * bTRGOUTExtTrigger;
@@ -105,7 +103,7 @@ class BoardSetting{
     /// Front Panel IO Control
     TGComboBox * cbLEMOIO;
     TGComboBox * cbTRGOUTmode;
-    TGCheckButton * bTRGOUTImp;
+    //TGCheckButton * bTRGOUTImp;
     TGComboBox * cbTRGINCtrl;
     TGComboBox * cbTRGINMezzanines;
     TGComboBox * cbAnaMonitor;
@@ -125,38 +123,56 @@ class BoardSetting{
     static TGTextEntry *  txtVMEFIFO;
 
     TThread * readStatusThread;
+    static bool isOpened;
 
   public:
     BoardSetting(const TGWindow *p, UInt_t w, UInt_t h, Digitizer ** digi, int nBoard);
     virtual ~BoardSetting();
 
+    bool IsOpen() {return isOpened;}
+    
     void CloseWindow() { 
-      printf("close BoardSetting window\n"); 
+
-      for( int i = 0; i < nDigi; i++) digi[i] = NULL;
       delete this; 
     }
     void ChangeBoard();
     
     static void * ReadStatus(void * ptr); /// thread. 
 
+    ///=== Button 
+    void ResetSettingToDefault();
+    void ClearBuffer();
+
     ///=== Board Configure
-    void SetAutoDataFlush();
+    void SetBoardConfiguration();
-    void SetDecimateWF();
-    void SetWaveFormRecord();
-    void SetDualTrace();
-    void SetTriggerPropagation();
-    void SetEnableExtra2();
-    void SetAnalogProbe1();
-    void SetAnalogProbe2();
-    void SetDigitalProbe();
-    void SoftwareReset();
 
     void SetAggregateOrganization();
     void SetReadOutAggregate();
+    void SetFanSpeedControl();
 
+    ///=== ACQ Control
+    void SetACQControl();
+
+    void SendSoftwareTriggerSignal();
+    void SendSoftwareClockSyncSignal();
+    void SetRunStartStopDelay();
+
+    ///==== Trigger
+    void SetGlobalTriggerMask();
+    void SetTriggerValidMask();
+    void SetTRGOUTMask();
+
+    void SetEnableExternalTrigger();
+    void SetExtendedVetoDelay();
+
+    ///==== FrontPanelIO
+    void SetFrontPanelIO();
     void SetAnalogMonitorMode();
 
-    bool isOpened;
+    ///==== Readout Control
+    void SetReadOutControl();
+
+
   
 };
 #endif