diff --git a/ClassDigitizer2Gen.cpp b/ClassDigitizer2Gen.cpp
index 11fe370..b1943bc 100644
--- a/ClassDigitizer2Gen.cpp
+++ b/ClassDigitizer2Gen.cpp
@@ -1,8 +1,5 @@
 #include "ClassDigitizer2Gen.h"
 
-
-unsigned short Digitizer2Gen::TraceStep = 8; //? should be variable?
-
 Digitizer2Gen::Digitizer2Gen(){  
   printf("======== %s \n",__func__);
   Initialization();
@@ -100,6 +97,11 @@ std::string Digitizer2Gen::ReadValue(const char * parameter, bool verbose){
   return retValue;
 }
 
+std::string Digitizer2Gen::ReadDigValue(std::string shortPara, bool verbose){
+  std::string haha = "/par/" + shortPara;
+  return ReadValue(haha.c_str(), verbose);
+}
+
 std::string Digitizer2Gen::ReadChValue(std::string ch, std::string shortPara, bool verbose){
   std::string haha = "/ch/" + ch + "/par/" + shortPara;
   return ReadValue(haha.c_str(), verbose);
@@ -115,6 +117,11 @@ void Digitizer2Gen::WriteValue(const char * parameter, std::string value){
   }
 }
 
+void Digitizer2Gen::WriteDigValue(std::string shortPara, std::string value){
+  std::string haha = "/par/" + shortPara;
+  WriteValue(haha.c_str(), value);
+}
+
 void Digitizer2Gen::WriteChValue(std::string ch, std::string shortPara, std::string value){
   std::string haha = "/ch/" + ch + "/par/" + shortPara;
   WriteValue(haha.c_str(), value);
@@ -130,6 +137,11 @@ void Digitizer2Gen::SendCommand(const char * parameter){
   }
 }
 
+void Digitizer2Gen::SendCommand(std::string shortPara){
+  std::string haha = "/cmd/" + shortPara;
+  SendCommand(haha.c_str());
+}
+
 //########################################### Open digitizer
 int Digitizer2Gen::OpenDigitizer(const char * url){
   
@@ -175,9 +187,10 @@ int Digitizer2Gen::OpenDigitizer(const char * url){
   printf("     ADC rate : %d Msps, ch2ns : %d ns\n", adcRate, ch2ns);
   printf("     Channels : %d\n", nChannels);
 
-  ReadValue("/par/InputRange", true);
-  ReadValue("/par/InputType", true);
-  ReadValue("/par/Zin", true);
+  //ReadValue("/par/InputRange", true);
+  //ReadValue("/par/InputType", true);
+  //ReadValue("/par/Zin", true);
+  printf("====================== \n");
 
   return 0;
 }
@@ -214,6 +227,8 @@ void Digitizer2Gen::StopACQ(){
 
 void Digitizer2Gen::SetPHADataFormat(unsigned short dataFormat){
   
+  printf("%s : %d\n", __func__, dataFormat);
+
   ///========== get endpoint and endpoint folder handle
   if( dataFormat < 15 ){
 
diff --git a/ClassDigitizer2Gen.h b/ClassDigitizer2Gen.h
index 4f77409..027bb2c 100644
--- a/ClassDigitizer2Gen.h
+++ b/ClassDigitizer2Gen.h
@@ -7,11 +7,13 @@
 #include <string>
 
 #include "Event.h"
-//#include "Parameter.h"
 
 #define MaxOutFileSize 2*1024*1024*1024
 #define MaxNumberOfChannel 64
 
+#include "DigiParameters.h"
+
+//^=================== Digitizer Class
 class Digitizer2Gen {
   private:
     uint64_t handle;    
@@ -74,10 +76,13 @@ class Digitizer2Gen {
     int GetRet() const {return ret;};
   
     std::string  ReadValue(const char * parameter, bool verbose = false);
+    std::string  ReadDigValue(std::string shortPara, bool verbose = false);
     std::string  ReadChValue(std::string ch, std::string shortPara, bool verbose = false);
     void         WriteValue(const char * parameter, std::string value);
+    void         WriteDigValue(std::string shortPara, std::string value);
     void         WriteChValue(std::string ch, std::string shortPara, std::string value);
     void         SendCommand(const char * parameter);
+    void         SendCommand(std::string shortPara);
 
     uint64_t    GetHandle(const char * parameter);
     uint64_t    GetParentHandle(uint64_t handle);
@@ -112,8 +117,6 @@ class Digitizer2Gen {
     void SaveDataToFile();
     unsigned int GetFileSize() {return outFileSize;}
 
-    static unsigned short TraceStep;
-
 };
 
 #endif
diff --git a/DigiParameters.h b/DigiParameters.h
new file mode 100644
index 0000000..c06c81a
--- /dev/null
+++ b/DigiParameters.h
@@ -0,0 +1,366 @@
+#ifndef  DIGITIZER_PARAMETER_H
+#define  DIGITIZER_PARAMETER_H
+
+#include <cstdlib>
+#include <vector>
+
+enum RW { ReadOnly, WriteOnly, ReadWrite};
+
+//^==================== Register Class
+class Reg {
+  private:
+    std::string name;
+    RW readWrite; // true for read/write, false for read-only
+    
+  public:
+    Reg(std::string para, RW readwrite){
+      this->name = para;
+      this->readWrite = readwrite;
+    }
+    ~Reg(){};
+
+    std::string GetPara()   const {return name;}
+    RW          ReadWrite() const {return readWrite;}
+
+    operator std::string () const {return name;} // this allow Reg kaka("XYZ", true); std::string haha = kaka;
+
+};
+
+
+//^==================== Some digitizer parameters
+
+// To avoid typo
+
+namespace DIGIPARA{
+
+  const unsigned short TraceStep = 8;
+
+  namespace DIG{
+    
+    ///============== read only
+    const Reg CupVer                   ("CupVer", RW::ReadOnly);
+    const Reg FPGA_firmwareVersion     ("FPGA_FwVer", RW::ReadOnly);
+    const Reg FirmwareType             ("FwType", RW::ReadOnly);
+    const Reg ModelCode                ("ModelCode", RW::ReadOnly);
+    const Reg PBCode                   ("PBCode", RW::ReadOnly);
+    const Reg ModelName                ("ModelName", RW::ReadOnly);
+    const Reg FromFactor               ("FormFactor", RW::ReadOnly);
+    const Reg FamilyCode               ("FamilyCode", RW::ReadOnly);
+    const Reg SerialNumber             ("SerialNum", RW::ReadOnly);
+    const Reg PCBrev_MB                ("PCBrev_MB", RW::ReadOnly);
+    const Reg PCBrev_PB                ("PCBrev_PB", RW::ReadOnly);
+    const Reg DPP_License              ("License", RW::ReadOnly);
+    const Reg DPP_LicenseStatus        ("LicenseStatus", RW::ReadOnly);
+    const Reg DPP_LicenseRemainingTime ("LicenseRemainingTime", RW::ReadOnly);
+    const Reg NumberOfChannel          ("NumCh", RW::ReadOnly);
+    const Reg ADC_SampleRate           ("ADC_SamplRate", RW::ReadOnly);
+    const Reg InputDynamicRange        ("InputRange", RW::ReadOnly);
+    const Reg InputType                ("InputType", RW::ReadOnly);
+    const Reg InputImpedance           ("Zin", RW::ReadOnly);
+    const Reg IPAddress                ("IPAddress", RW::ReadOnly);
+    const Reg NetMask                  ("Netmask", RW::ReadOnly);
+    const Reg Gateway                  ("Gateway", RW::ReadOnly);
+    const Reg LED_status               ("LedStatus", RW::ReadOnly);
+    const Reg ACQ_status               ("AcquistionStatus", RW::ReadOnly);
+    const Reg MaxRawDataSize           ("MaxRawDataSize", RW::ReadOnly);
+    const Reg TempSensAirIn            ("TempSensAirIn", RW::ReadOnly);
+    const Reg TempSensAirOut           ("TempSensAirOut", RW::ReadOnly);
+    const Reg TempSensCore             ("TempSensCore", RW::ReadOnly);
+    const Reg TempSensFirstADC         ("TempSensFirstADC", RW::ReadOnly);
+    const Reg TempSensLastADC          ("TempSensLastADC", RW::ReadOnly);
+    const Reg TempSensHottestADC       ("TempSensHottestADC", RW::ReadOnly);
+    const Reg TempSensADC0             ("TempSensADC0", RW::ReadOnly);
+    const Reg TempSensADC1             ("TempSensADC1", RW::ReadOnly);
+    const Reg TempSensADC2             ("TempSensADC2", RW::ReadOnly);
+    const Reg TempSensADC3             ("TempSensADC3", RW::ReadOnly);
+    const Reg TempSensADC4             ("TempSensADC4", RW::ReadOnly);
+    const Reg TempSensADC5             ("TempSensADC5", RW::ReadOnly);
+    const Reg TempSensADC6             ("TempSensADC6", RW::ReadOnly);
+    const Reg TempSensADC7             ("TempSensADC7", RW::ReadOnly);
+
+    const std::vector<Reg> TempSenseADC = {TempSensADC0,TempSensADC1,TempSensADC2,TempSensADC3,TempSensADC4,TempSensADC5,TempSensADC6,TempSensADC7};
+
+    const Reg TempSensDCDC             ("TempSensDCDC", RW::ReadOnly);
+    const Reg VInSensDCDC              ("VInSensDCDC", RW::ReadOnly);
+    const Reg VOutSensDCDC             ("VOutSensDCDC", RW::ReadOnly);
+    const Reg IOutSensDCDC             ("IOutSensDCDC", RW::ReadOnly);
+    const Reg FreqSensCore             ("FreqSensCore", RW::ReadOnly);
+    const Reg DutyCycleSensDCDC        ("DutyCycleSensDCDC", RW::ReadOnly);
+    const Reg SpeedSensFan1            ("SpeedSensFan1", RW::ReadOnly);
+    const Reg SpeedSensFan2            ("SpeedSensFan2", RW::ReadOnly);
+    const Reg ErrorFlags               ("ErrorFlags", RW::ReadOnly);
+    const Reg BoardReady               ("BoardReady", RW::ReadOnly);
+  
+    ///============= read write
+    const Reg ClockSource              ("ClockSource", RW::ReadWrite);
+    const Reg IO_Level                 ("IOlevel", RW::ReadWrite);
+    const Reg StartSource              ("StartSource", RW::ReadWrite);
+    const Reg GlobalTriggerSource      ("GlobalTriggerSource", RW::ReadWrite);
+
+    const Reg BusyInSource             ("BusyInSource", RW::ReadWrite);
+    const Reg EnableClockOutBackplane  ("EnClockOutP0", RW::ReadWrite);
+    const Reg EnableClockOutFrontPanel ("EnClockOutFP", RW::ReadWrite);
+    const Reg TrgOutMode               ("TrgOutMode", RW::ReadWrite);
+    const Reg GPIOMode                 ("GPIOMode", RW::ReadWrite);
+    const Reg SyncOutMode              ("SyncOutMode", RW::ReadWrite);
+
+    const Reg BoardVetoSource          ("BoardVetoSource", RW::ReadWrite);
+    const Reg BoardVetoWidth           ("BoardVetoWidth", RW::ReadWrite);
+    const Reg BoardVetoPolarity        ("BoardVetoPolarity", RW::ReadWrite);
+    const Reg RunDelay                 ("RunDelay", RW::ReadWrite);
+    const Reg EnableAutoDisarmACQ      ("EnAutoDisarmAcq", RW::ReadWrite);
+    const Reg EnableDataReduction      ("EnDataReduction", RW::ReadWrite);
+    const Reg EnableStatisticEvents    ("EnStatEvents", RW::ReadWrite);
+    const Reg VolatileClockOutDelay    ("VolatileClockOutDelay", RW::ReadWrite);
+    const Reg PermanentClockOutDelay   ("PermanentClockOutDelay", RW::ReadWrite);
+    const Reg TestPulsePeriod          ("TestPulsePeriod", RW::ReadWrite);
+    const Reg TestPulseWidth           ("TestPulseWidth", RW::ReadWrite);
+    const Reg TestPulseLowLevel        ("TestPulseLowLevel", RW::ReadWrite);
+    const Reg TestPulseHighLevel       ("TestPulseHighLevel", RW::ReadWrite);
+    const Reg ErrorFlagMask            ("ErrorFlagMask", RW::ReadWrite);
+    const Reg ErrorFlagDataMask        ("ErrorFlagDataMask", RW::ReadWrite);
+    const Reg DACoutMode               ("DACoutMode", RW::ReadWrite);
+    const Reg DACoutStaticLevel        ("DACoutStaticLevel", RW::ReadWrite);
+    const Reg DACoutChSelect           ("DACoutChSelect", RW::ReadWrite);
+    const Reg EnableOffsetCalibration  ("EnOffsetCalibration", RW::ReadWrite);
+
+    /// ========== command
+    const Reg Reset               ("Reset", RW::WriteOnly);
+    const Reg ClearData           ("ClearData", RW::WriteOnly); // clear memory, setting not affected
+    const Reg ArmACQ              ("ArmAcquisition", RW::WriteOnly);
+    const Reg DisarmACQ           ("DisarmAcquisition", RW::WriteOnly);
+    const Reg SoftwareStartACQ    ("SwStartAcquisition", RW::WriteOnly); // only when SwStart in StartSource
+    const Reg SoftwareStopACQ     ("SwStopAcquisition", RW::WriteOnly); // stop ACQ, whatever start source
+    const Reg SendSoftwareTrigger ("SendSWTrigger", RW::WriteOnly); // only work when Swtrg in the GlobalTriggerSource
+    const Reg ReloadCalibration   ("ReloadCalibration", RW::WriteOnly); 
+
+
+    const std::vector<Reg> AllSettings = {
+      CupVer                   ,
+      FPGA_firmwareVersion     ,
+      FirmwareType             ,
+      ModelCode                ,
+      PBCode                   ,
+      ModelName                ,
+      FromFactor               ,
+      FamilyCode               ,
+      SerialNumber             ,
+      PCBrev_MB                ,
+      PCBrev_PB                ,
+      DPP_License              ,
+      DPP_LicenseStatus        ,
+      DPP_LicenseRemainingTime ,
+      NumberOfChannel          ,
+      ADC_SampleRate           ,
+      InputDynamicRange        ,
+      InputType                ,
+      InputImpedance           ,
+      IPAddress                ,
+      NetMask                  ,
+      Gateway                  ,
+      LED_status               ,
+      ACQ_status               ,
+      MaxRawDataSize           ,
+      TempSensAirIn            ,
+      TempSensAirOut           ,
+      TempSensCore             ,
+      TempSensFirstADC         ,
+      TempSensLastADC          ,
+      TempSensHottestADC       ,
+      TempSensADC0             ,
+      TempSensADC1             ,
+      TempSensADC2             ,
+      TempSensADC3             ,
+      TempSensADC4             ,
+      TempSensADC5             ,
+      TempSensADC6             ,
+      TempSensADC7             ,
+      TempSensDCDC             ,
+      VInSensDCDC              ,
+      VOutSensDCDC             ,
+      IOutSensDCDC             ,
+      FreqSensCore             ,
+      DutyCycleSensDCDC        ,
+      SpeedSensFan1            ,
+      SpeedSensFan2            ,
+      ErrorFlags               ,
+      BoardReady               ,
+      ClockSource              ,
+      IO_Level                 ,
+      StartSource              ,
+      GlobalTriggerSource      ,
+      BusyInSource             ,
+      EnableClockOutBackplane  ,
+      EnableClockOutFrontPanel ,
+      TrgOutMode               ,
+      GPIOMode                 ,
+      SyncOutMode              ,
+      BoardVetoSource          ,
+      BoardVetoWidth           ,
+      BoardVetoPolarity        ,
+      RunDelay                 ,
+      EnableAutoDisarmACQ      ,
+      EnableDataReduction      ,
+      EnableStatisticEvents    ,
+      VolatileClockOutDelay    ,
+      PermanentClockOutDelay   ,
+      TestPulsePeriod          ,
+      TestPulseWidth           ,
+      TestPulseLowLevel        ,
+      TestPulseHighLevel       ,
+      ErrorFlagMask            ,
+      ErrorFlagDataMask        ,
+      DACoutMode               ,
+      DACoutStaticLevel        ,
+      DACoutChSelect           ,
+      EnableOffsetCalibration  
+    };
+
+
+  }
+
+  namespace VGA{
+    const Reg VGAGain ("VGAGain", RW::ReadWrite); // VX2745 only
+  }
+
+  namespace CH{
+
+    /// ========= red only
+    const Reg SelfTrgRate          ("SelfTrgRate", RW::ReadOnly);
+    const Reg ChannelStatus        ("ChStatus", RW::ReadOnly);
+    const Reg GainFactor           ("GainFactor", RW::ReadOnly);
+    const Reg ADCToVolts           ("ADCToVolts", RW::ReadOnly);
+    const Reg Energy_Nbit          ("Energy_Nbit", RW::ReadOnly);
+    const Reg ChannelRealtime      ("ChRealtimeMonitor", RW::ReadOnly); // when called, update DeadTime, TriggerCount, SaveCount, and WaveCount
+    const Reg ChannelDeadtime      ("ChDeadtimeMonitor", RW::ReadOnly);
+    const Reg ChannelTriggerCount  ("ChTriggerCnt", RW::ReadOnly);
+    const Reg ChannelSavedCount    ("ChSavedEventCnt", RW::ReadOnly);
+    const Reg ChannelWaveCount     ("ChWaveCnt", RW::ReadOnly);
+
+    /// ======= read write
+    const Reg ChannelEnable    ("ChEnable", RW::ReadWrite);
+    const Reg DC_Offset        ("DCOffset", RW::ReadWrite);
+    const Reg TriggerThreshold ("TriggerThr", RW::ReadWrite);
+    const Reg Polarity         ("Pulse Polarity", RW::ReadWrite);
+
+    const Reg WaveDataSource              ("WaveDataSouce", RW::ReadWrite);
+    const Reg RecordLength                ("ChRecordLengthT", RW::ReadWrite);
+    const Reg PreTrigger                  ("ChPreTriggerT", RW::ReadWrite);
+    const Reg WaveSaving                  ("WaveSaving", RW::ReadWrite);
+    const Reg WaveResolution              ("WaveResolution", RW::ReadWrite);
+    const Reg TimeFilterRiseTime          ("TimeFilterRiseTimeT", RW::ReadWrite);
+    const Reg TimeFilterRetriggerGuard    ("TimeFilterRetriggerGuardT", RW::ReadWrite);
+    const Reg EnergyFilterRiseTime        ("EnergyFilterRiseTimeT", RW::ReadWrite);
+    const Reg EnergyFilterFlatTop         ("EnergyFilterFlatTopT", RW::ReadWrite);
+    const Reg EnergyFilterPoleZero        ("EnergyFilterPoleZeroT", RW::ReadWrite);
+    const Reg EnergyFilterBaselineGuard   ("EnergyFilterBaselineGuardT", RW::ReadWrite);
+    const Reg EnergyFilterPileUpGuard     ("EnergyFilterPileUpGuardT", RW::ReadWrite);
+    const Reg EnergyFilterPeakingPosition ("EnergyFilterPeakingPosition", RW::ReadWrite);
+    const Reg EnergyFilterPeakingAvg      ("EnergyFilterPeakingAvg", RW::ReadWrite);
+    const Reg EnergyFilterFineGain        ("EnergyFilterFineGain", RW::ReadWrite);
+    const Reg EnergyFilterLowFreqFilter   ("EnergyFilterLFLimitation", RW::ReadWrite);
+    const Reg EnergyFilterBaselineAvg     ("EnergyFilterBaselineAvg", RW::ReadWrite);
+    const Reg WaveAnalogProbe0            ("WaveAnalogProbe0", RW::ReadWrite);
+    const Reg WaveAnalogProbe1            ("WaveAnalogProbe1", RW::ReadWrite);
+    const Reg WaveDigitalProbe0           ("WaveDigitalProbe0", RW::ReadWrite);
+    const Reg WaveDigitalProbe1           ("WaveDigitalProbe1", RW::ReadWrite);
+    const Reg WaveDigitalProbe2           ("WaveDigitalProbe2", RW::ReadWrite);
+    const Reg WaveDigitalProbe3           ("WaveDigitalProbe3", RW::ReadWrite);
+
+    const std::vector<Reg> AnalogProbe  = {WaveAnalogProbe0, WaveAnalogProbe1};
+    const std::vector<Reg> DigitalProbe = {WaveDigitalProbe0, WaveDigitalProbe1, WaveDigitalProbe2, WaveDigitalProbe3};
+
+    const Reg EventTriggerSource      ("EventTriggerSource", RW::ReadWrite);
+    const Reg ChannelsTriggerMask     ("ChannelsTriggerMask", RW::ReadWrite);
+    const Reg ChannelVetoSource       ("ChannelVetoSource", RW::ReadWrite);
+    const Reg WaveTriggerSource       ("WaveTriggerSource", RW::ReadWrite);
+    const Reg EventSelector           ("EventSelector", RW::ReadWrite);
+    const Reg WaveSelector            ("WaveSelector", RW::ReadWrite);
+    const Reg CoincidenceMask         ("CoincidenceMask", RW::ReadWrite);
+    const Reg AntiCoincidenceMask     ("AntiCoincidenceMask", RW::ReadWrite);
+    const Reg CoincidenceLength       ("CoincidenceLengthT", RW::ReadWrite);
+    const Reg CoincidenceLengthSample ("CoincidenceLengthS", RW::ReadWrite);
+
+    const Reg ADCVetoWidth       ("ADCVetoWidth", RW::ReadWrite);
+
+    const Reg EnergySkimLowDiscriminator  ("EnergySkimLowDiscriminator", RW::ReadWrite);
+    const Reg EnergySkimHighDiscriminator ("EnergySkimHighDiscriminator", RW::ReadWrite);
+
+    const Reg RecordLengthSample              ("ChRecordLengthS", RW::ReadWrite);
+    const Reg PreTriggerSample                ("ChPreTriggerS", RW::ReadWrite);
+    const Reg TimeFilterRiseTimeSample        ("TimeFilterRiseTimeS", RW::ReadWrite);
+    const Reg TimeFilterRetriggerGuardSample  ("TimeFilterRetriggerGuardS", RW::ReadWrite);
+    const Reg EnergyFilterRiseTimeSample      ("EnergyFilterRiseTimeS", RW::ReadWrite);
+    const Reg EnergyFilterFlatTopSample       ("EnergyFilterFlatTopS", RW::ReadWrite);
+    const Reg EnergyFilterPoleZeroSample      ("EnergyFilterPoleZeroS", RW::ReadWrite);
+    const Reg EnergyFilterBaselineGuardSample ("EnergyFilterBaselineGuardS", RW::ReadWrite);
+    const Reg EnergyFilterPileUpGuardSample   ("EnergyFilterPileUpGuardS", RW::ReadWrite);
+
+    const std::vector<Reg> AllSettings = {
+      SelfTrgRate                ,
+      ChannelStatus              ,
+      GainFactor                 ,
+      ADCToVolts                 ,
+      Energy_Nbit                ,
+      ChannelRealtime            ,
+      ChannelDeadtime            ,
+      ChannelTriggerCount        ,
+      ChannelSavedCount          ,
+      ChannelWaveCount           ,
+      ChannelEnable              ,
+      DC_Offset                  ,
+      TriggerThreshold           ,
+      Polarity                   ,
+      WaveDataSource             ,
+      RecordLength               ,
+      WaveSaving                 ,
+      WaveResolution             ,
+      PreTrigger                 ,
+      TimeFilterRiseTime         ,
+      TimeFilterRetriggerGuard   ,
+      EnergyFilterRiseTime       ,
+      EnergyFilterFlatTop        ,
+      EnergyFilterPoleZero       ,
+      EnergyFilterBaselineGuard  ,
+      EnergyFilterPileUpGuard    ,
+      EnergyFilterPeakingPosition,
+      EnergyFilterPeakingAvg     ,
+      EnergyFilterFineGain       ,
+      EnergyFilterLowFreqFilter  ,
+      EnergyFilterBaselineAvg    ,
+      WaveAnalogProbe0           ,
+      WaveAnalogProbe1           ,
+      WaveDigitalProbe0          ,
+      WaveDigitalProbe1          ,
+      WaveDigitalProbe2          ,
+      WaveDigitalProbe3          ,
+      EventTriggerSource         ,
+      ChannelsTriggerMask        ,
+      ChannelVetoSource          ,
+      WaveTriggerSource          ,
+      EventSelector              ,
+      WaveSelector               ,
+      CoincidenceMask            ,
+      AntiCoincidenceMask        ,
+      CoincidenceLength          ,
+      CoincidenceLengthSample    ,
+      ADCVetoWidth               ,
+      EnergySkimLowDiscriminator ,
+      EnergySkimHighDiscriminator,
+      RecordLengthSample         ,
+      PreTriggerSample           ,
+      TimeFilterRiseTimeSample   ,
+      TimeFilterRetriggerGuardSample   ,
+      EnergyFilterRiseTimeSample       ,
+      EnergyFilterFlatTopSample        ,
+      EnergyFilterPoleZeroSample       ,
+      EnergyFilterBaselineGuardSample  ,
+      EnergyFilterPileUpGuardSample    
+    };
+
+  }
+
+};
+
+
+#endif
\ No newline at end of file
diff --git a/SOLARIS_Qt6_DAQ.pro b/SOLARIS_Qt6_DAQ.pro
index b1e26a6..53c9659 100644
--- a/SOLARIS_Qt6_DAQ.pro
+++ b/SOLARIS_Qt6_DAQ.pro
@@ -18,5 +18,5 @@ LIBS += -lcurl -lCAEN_FELib
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
 # Input
-HEADERS += ClassDigitizer2Gen.h Event.h influxdb.h mainwindow.h digiSettings.h
+HEADERS += ClassDigitizer2Gen.h Event.h influxdb.h mainwindow.h digiSettings.h Digiparameters.h
 SOURCES += ClassDigitizer2Gen.cpp influxdb.cpp main.cpp mainwindow.cpp digiSettings.cpp
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1d40834..e3565da 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -293,6 +293,16 @@ void MainWindow::OpenDigitizers(){
   bnCloseDigitizers->setEnabled(true);
   bnOpenDigitizers->setEnabled(false);
   bnOpenDigitizers->setStyleSheet("");
+
+  /// set scope digitizer
+  allowChange = false;
+  cbScopeDigi->clear(); ///this will also trigger QComboBox::currentIndexChanged
+  cbScopeCh->clear();
+  for( int i = 0 ; i < nDigi; i++) {
+    cbScopeDigi->addItem("Digi-" + QString::number(digi[i]->GetSerialNumber()), i);
+  }
+  allowChange = true;
+
 }
 
 void MainWindow::CloseDigitizers(){
@@ -332,66 +342,20 @@ void MainWindow::CloseDigitizers(){
 }
 
 //^###################################################################### Open Scope
+
+//TODO ==== seperate Scope into a Scrop Panel class.
+
 void MainWindow::OpenScope(){
 
-  cbScopeDigi->clear(); ///thsi will also trigger QComboBox::currentIndexChanged
-  cbScopeCh->clear();
   if( digi ) {
-
-    for( int i = 0 ; i < nDigi; i++) {
-      cbScopeDigi->addItem("Digi-" + QString::number(digi[i]->GetSerialNumber()), i);
-    }
-
     //*---- get digi setting
     int iDigi = cbScopeDigi->currentIndex();
-    int ch = cbScopeCh->currentIndex();
-
     if( digi[iDigi]->IsDummy() ) return;
 
-    int index;
-    std::string ans;
+    //digi[iDigi]->Reset();
+    //digi[iDigi]->ProgramPHA(false);
 
-    std::vector<std::string> haha = {"WaveAnalogProbe0", "WaveAnalogProbe1"};
-
-    for( int i = 0 ; i < 2; i++){
-      ans = digi[iDigi]->ReadChValue(std::to_string(ch), haha[i]);
-      index = cbAnaProbe[i]->findData(QString::fromStdString(ans));
-      
-      if( index >= 0 ) {
-        cbAnaProbe[i]->setCurrentIndex(index);
-      }else{
-        qDebug() << QString::fromStdString(ans);
-      }
-    }
-
-    haha.clear();
-    haha = {"WaveDigitalProbe0", "WaveDigitalProbe1", "WaveDigitalProbe2", "WaveDigitalProbe3"};
-
-    for( int i = 0 ; i < 4; i++){
-      ans = digi[iDigi]->ReadChValue(std::to_string(ch), haha[i]);
-      index = cbDigProbe[i]->findData(QString::fromStdString(ans));
-      if( index >= 0 ) {
-        cbDigProbe[i]->setCurrentIndex(index);
-      }else{
-        qDebug() << QString::fromStdString(ans);
-      }
-    }
-
-    ans = digi[iDigi]->ReadChValue(std::to_string(ch), "ChRecordLengthT");
-    sbRL->setValue(atoi(ans.c_str()));
-
-    ans = digi[iDigi]->ReadChValue(std::to_string(ch), "ChPreTriggerT");
-    sbPT->setValue(atoi(ans.c_str()));
-    
-    //TODO ===== Reset and ProgramPHA should be removed
-    digi[iDigi]->Reset();
-    digi[iDigi]->ProgramPHA(false);
-
-    digi[iDigi]->WriteChValue("0..63", "ChEnable", "false");
-    digi[iDigi]->WriteChValue(std::to_string(ch), "ChEnable", "true");
-    digi[iDigi]->SetPHADataFormat(0);
-
-    StartScope();
+    StartScope(iDigi);
 
     bnStartACQ->setEnabled(false);
     bnStopACQ->setEnabled(false);
@@ -402,26 +366,81 @@ void MainWindow::OpenScope(){
 
 }
 
-void MainWindow::StartScope(){
+void MainWindow::ReadScopeSettings(int iDigi, int ch){
+  if( !digi[iDigi] && digi[iDigi]->IsDummy() ) return;
+
+  printf("%s\n", __func__);
+
+  int index;
+  std::string ans;
+
+  allowChange = false;
+
+  for( int i = 0 ; i < 2; i++){
+    ans = digi[iDigi]->ReadChValue(std::to_string(ch), DIGIPARA::CH::AnalogProbe[i]);
+    index = cbAnaProbe[i]->findData(QString::fromStdString(ans));
+    
+    if( index >= 0 ) {
+      cbAnaProbe[i]->setCurrentIndex(index);
+    }else{
+      qDebug() << QString::fromStdString(ans);
+    }
+  }
+
+  for( int i = 0 ; i < 4; i++){
+    ans = digi[iDigi]->ReadChValue(std::to_string(ch), DIGIPARA::CH::DigitalProbe[i]);
+    index = cbDigProbe[i]->findData(QString::fromStdString(ans));
+    if( index >= 0 ) {
+      cbDigProbe[i]->setCurrentIndex(index);
+    }else{
+      qDebug() << QString::fromStdString(ans);
+    }
+  }
+
+  ans = digi[iDigi]->ReadChValue(std::to_string(ch), DIGIPARA::CH::RecordLength);
+  sbRL->setValue(atoi(ans.c_str()));
+
+  ans = digi[iDigi]->ReadChValue(std::to_string(ch), DIGIPARA::CH::PreTrigger);
+  sbPT->setValue(atoi(ans.c_str()));
+  
+  ans = digi[iDigi]->ReadChValue(std::to_string(ch), DIGIPARA::CH::DC_Offset);
+  sbDCOffset->setValue(atoi(ans.c_str()));
+  
+  allowChange = true;
+}
+
+void MainWindow::StartScope(int iDigi){
 
   if( !digi ) return; 
+  if( digi[iDigi]->IsDummy() ) return;
+
+  printf("%s\n", __func__);
+
+  int ch = cbScopeCh->currentIndex();
 
   //*---- set digitizer to take full trace; since in scope mode, no data saving, speed would be fast (How fast?)
   //* when the input rate is faster than trigger rate, Digitizer will stop data taking.
-  
-  int iDigi = cbScopeDigi->currentIndex();
+
+  ReadScopeSettings(iDigi, ch);
+
+  digi[iDigi]->WriteChValue("0..63", DIGIPARA::CH::ChannelEnable, "false");
+  digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::ChannelEnable, "true");
+  digi[iDigi]->SetPHADataFormat(0);
 
   digi[iDigi]->StartACQ();
 
   readDataThread[iDigi]->SetScopeRun(true);
   readDataThread[iDigi]->start();
-  
+
   updateTraceThread->start();
 
   bnScopeStart->setEnabled(false);
   bnScopeStop->setEnabled(true);
 
   sbRL->setEnabled(false);
+  sbPT->setEnabled(false);
+  sbDCOffset->setEnabled(false);
+  bnScopeReset->setEnabled(false);
 
   allowChange = true;
 
@@ -429,6 +448,8 @@ void MainWindow::StartScope(){
 
 void MainWindow::StopScope(){
 
+  printf("%s\n", __func__);
+
   updateTraceThread->Stop();
   updateTraceThread->quit();
   updateTraceThread->wait();
@@ -438,7 +459,7 @@ void MainWindow::StopScope(){
       if( digi[i]->IsDummy() ) continue;
       digiMTX.lock();
       digi[i]->StopACQ();
-      digi[i]->WriteChValue("0..63", "ChEnable", "true");
+      digi[i]->WriteChValue("0..63", DIGIPARA::CH::ChannelEnable, "true");
       digiMTX.unlock();
 
       readDataThread[i]->quit();
@@ -453,6 +474,9 @@ void MainWindow::StopScope(){
   bnScopeStop->setEnabled(false);
 
   sbRL->setEnabled(true);
+  sbPT->setEnabled(true);
+  sbDCOffset->setEnabled(true);
+  bnScopeReset->setEnabled(true);
 
 }
 
@@ -472,14 +496,14 @@ void MainWindow::UpdateScope(){
     for( int j = 0; j < 6; j++ ) dataTrace[j]->removePoints(0, dataLength);
 
     for( unsigned int i = 0 ; i < traceLength; i++){ 
-      for( int j = 0; j < 2; j++) dataTrace[j]->append(Digitizer2Gen::TraceStep * i, digi[iDigi]->evt->analog_probes[j][i]);
-      for( int j = 2; j < 6; j++) dataTrace[j]->append(Digitizer2Gen::TraceStep * i, (j-1)*1000 + 4000 * digi[iDigi]->evt->digital_probes[j-2][i]);
+      for( int j = 0; j < 2; j++) dataTrace[j]->append(DIGIPARA::TraceStep * i, digi[iDigi]->evt->analog_probes[j][i]);
+      for( int j = 2; j < 6; j++) dataTrace[j]->append(DIGIPARA::TraceStep * i, (j-1)*1000 + 4000 * digi[iDigi]->evt->digital_probes[j-2][i]);
     }
-    
+
     digiMTX.unlock();
 
     //plot->axes(Qt::Vertical).first()->setRange(-1, 16000); /// this must be after createDefaultAxes();
-    //plot->axes(Qt::Horizontal).first()->setRange(-10, traceLength*1.1);
+    plot->axes(Qt::Horizontal).first()->setRange(0, DIGIPARA::TraceStep* traceLength);
   }
 
 }
@@ -540,9 +564,18 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
   dataTrace[5]->setPen(QPen(Qt::darkBlue, 1));
 
   plot->createDefaultAxes(); /// this must be after addSeries();
-  plot->axes(Qt::Vertical).first()->setRange(-2000, 16000); /// this must be after createDefaultAxes();
-  plot->axes(Qt::Horizontal).first()->setRange(0, 5000);
-  plot->axes(Qt::Horizontal).first()->setTitleText("Time [ns]");
+  /// this must be after createDefaultAxes();
+  QValueAxis * yaxis = qobject_cast<QValueAxis*> (plot->axes(Qt::Vertical).first());
+  QValueAxis * xaxis = qobject_cast<QValueAxis*> (plot->axes(Qt::Horizontal).first());
+  yaxis->setTickCount(6);
+  yaxis->setTickInterval(16384);
+  yaxis->setRange(-16384, 65536);
+  yaxis->setLabelFormat("%.0f");
+
+  xaxis->setRange(0, 5000);
+  xaxis->setTickCount(10);
+  xaxis->setLabelFormat("%.0f");
+  xaxis->setTitleText("Time [ns]");
 
   updateTraceThread = new UpdateTraceThread();
   connect(updateTraceThread, &UpdateTraceThread::updateTrace, this, &MainWindow::UpdateScope);
@@ -562,11 +595,13 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
   layout->addWidget(cbScopeCh, rowID, 1);
 
   connect(cbScopeDigi, &QComboBox::currentIndexChanged, this, [=](){
+    //if( allowChange ) StopScope();
     int index = cbScopeDigi->currentIndex();
     if( index == -1 ) return;
     for( int i = 0; i < digi[index]->GetNChannels(); i++){
       cbScopeCh->addItem("ch-" + QString::number(i), i);
     }
+    //if( allowChange )StartScope(index);
   });
 
   connect(cbScopeCh, &QComboBox::currentIndexChanged, this, [=](){
@@ -574,13 +609,23 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue("0..63", "ChEnable", "false");
-    digi[iDigi]->WriteChValue(std::to_string(ch), "ChEnable", "true");
+    digi[iDigi]->WriteChValue("0..63", DIGIPARA::CH::ChannelEnable, "false");
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::ChannelEnable, "true");
+    ReadScopeSettings(iDigi, ch);
     digiMTX.unlock();
   });
 
+  bnScopeReset = new QPushButton("Reset Digitizer", scope);
+  layout->addWidget(bnScopeReset, rowID, 2);
+  connect(bnScopeReset, &QPushButton::clicked, this, [=](){
+    if( !allowChange ) return;
+    int iDigi = cbScopeDigi->currentIndex();
+    digi[iDigi]->Reset();
+  });
+
   //------------ Probe selection
   rowID ++;
+  //TODO --- add None
   cbAnaProbe[0] = new QComboBox(scope);
   cbAnaProbe[0]->addItem("ADC Input",        "ADCInput");
   cbAnaProbe[0]->addItem("Time Filter",      "TimeFilter");
@@ -599,21 +644,24 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
   cbAnaProbe[1]->setCurrentIndex(4);
 
   connect(cbAnaProbe[0], &QComboBox::currentIndexChanged, this, [=](){ 
+    if( !allowChange ) return;
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue(std::to_string(ch), "WaveAnalogProbe0", (cbAnaProbe[0]->currentData()).toString().toStdString());
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::WaveAnalogProbe0, (cbAnaProbe[0]->currentData()).toString().toStdString());
     digiMTX.unlock();
   });
   
   connect(cbAnaProbe[1], &QComboBox::currentIndexChanged, this, [=](){ 
+    if( !allowChange ) return;
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue(std::to_string(ch), "WaveAnalogProbe1", (cbAnaProbe[1]->currentData()).toString().toStdString());
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::WaveAnalogProbe1, (cbAnaProbe[1]->currentData()).toString().toStdString());
     digiMTX.unlock();
   });
 
+  //TODO --- add None
   cbDigProbe[0] = new QComboBox(scope);
   cbDigProbe[0]->addItem("Trigger",              "Trigger");
   cbDigProbe[0]->addItem("Time Filter Armed",    "TimeFilterArmed");
@@ -650,31 +698,35 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
   cbDigProbe[3]->setCurrentIndex(6);
 
   connect(cbDigProbe[0], &QComboBox::currentIndexChanged, this, [=](){ 
+    if( !allowChange ) return;
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue(std::to_string(ch), "WaveDigitalProbe0", (cbDigProbe[0]->currentData()).toString().toStdString());
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::WaveDigitalProbe0, (cbDigProbe[0]->currentData()).toString().toStdString());
     digiMTX.unlock();
   });
   connect(cbDigProbe[1], &QComboBox::currentIndexChanged, this, [=](){ 
+    if( !allowChange ) return;
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue(std::to_string(ch), "WaveDigitalProbe1", (cbDigProbe[1]->currentData()).toString().toStdString());
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::WaveDigitalProbe1, (cbDigProbe[1]->currentData()).toString().toStdString());
     digiMTX.unlock();
   });
   connect(cbDigProbe[2], &QComboBox::currentIndexChanged, this, [=](){ 
+    if( !allowChange ) return;
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue(std::to_string(ch), "WaveDigitalProbe2", (cbDigProbe[2]->currentData()).toString().toStdString());
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::WaveDigitalProbe2, (cbDigProbe[2]->currentData()).toString().toStdString());
     digiMTX.unlock();
   });
   connect(cbDigProbe[3], &QComboBox::currentIndexChanged, this, [=](){ 
+    if( !allowChange ) return;
     int iDigi = cbScopeDigi->currentIndex();
     int ch = cbScopeCh->currentIndex();
     digiMTX.lock();
-    digi[iDigi]->WriteChValue(std::to_string(ch), "WaveDigitalProbe3", (cbDigProbe[3]->currentData()).toString().toStdString());
+    digi[iDigi]->WriteChValue(std::to_string(ch), DIGIPARA::CH::WaveDigitalProbe3, (cbDigProbe[3]->currentData()).toString().toStdString());
     digiMTX.unlock();
   });
 
@@ -687,50 +739,170 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
   layout->addWidget(cbDigProbe[2], rowID, 4);
   layout->addWidget(cbDigProbe[3], rowID, 5);
 
-  //------------ wave settings
   rowID ++;
-  QLabel * lbRL = new QLabel("Record Lenght [ns]",scope);
-  layout->addWidget(lbRL, rowID, 0);
-  sbRL = new QSpinBox(scope);
-  sbRL->setMinimum(32);
-  sbRL->setMaximum(648000);
-  sbRL->setSingleStep(8);
-  layout->addWidget(sbRL, rowID, 1);
+  {//------------ wave settings
+    QGroupBox * box = new QGroupBox("Channel Settings (need ACQ stop)", scope);
+    layout->addWidget(box, rowID, 0, 1, 6);
 
-  connect(sbRL, &QSpinBox::valueChanged, this, [=](){
-    if( !allowChange ) return;
-    int iDigi = cbScopeDigi->currentIndex();
-    sbRL->setValue(8*((sbRL->value() +  7)/8));
-    digiMTX.lock();
-    //StopScope();
-    digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), 
-                              "ChRecordLengthT", 
-                              std::to_string(sbRL->value()));
-    //StartScope();
-    digiMTX.unlock();
+    QGridLayout * bLayout = new QGridLayout(box);
+    bLayout->setSpacing(0);
 
-    //plot->axes(Qt::Horizontal).first()->setRange(0, 600);
+    QLabel * lbRL = new QLabel("Record Lenght [ns] ",scope);
+    lbRL->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbRL, 0, 0);
+    sbRL = new QSpinBox(scope);
+    sbRL->setMinimum(32);
+    sbRL->setMaximum(648000);
+    sbRL->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbRL, 0, 1);
 
-  });
+    connect(sbRL, &QSpinBox::valueChanged, this, [=](){
+      if( !allowChange ) return;
+      int iDigi = cbScopeDigi->currentIndex();
+      sbRL->setValue(DIGIPARA::TraceStep*((sbRL->value() +  DIGIPARA::TraceStep - 1)/DIGIPARA::TraceStep));
+      digiMTX.lock();
+      digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), DIGIPARA::CH::RecordLength, std::to_string(sbRL->value()));
+      digiMTX.unlock();
+    });
 
-  QLabel * lbPT = new QLabel("Pre Trigger [ns]",scope);
-  layout->addWidget(lbPT, rowID, 2);
-  sbPT = new QSpinBox(scope);
-  sbPT->setMinimum(32);
-  sbPT->setMaximum(32000);
-  sbPT->setSingleStep(8);
-  layout->addWidget(sbPT, rowID, 3);
+    QLabel * lbThreshold = new QLabel("Threshold [LSB] ",scope);
+    lbThreshold->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbThreshold, 0, 2);
+    QSpinBox * sbThreshold = new QSpinBox(scope);
+    sbThreshold->setMinimum(0);
+    sbThreshold->setMaximum(8191);
+    sbThreshold->setSingleStep(20);
+    bLayout->addWidget(sbThreshold, 0, 3);
 
-  QLabel * lbDCOffset = new QLabel("DC offset [%]",scope);
-  layout->addWidget(lbDCOffset, rowID, 4);
-  QSpinBox * sbDCOffset = new QSpinBox(scope);
-  sbDCOffset->setMinimum(0);
-  sbDCOffset->setMaximum(100);
-  sbDCOffset->setSingleStep(1);
-  layout->addWidget(sbDCOffset, rowID, 5);
+    QLabel * lbPolarity = new QLabel("Polarity ",scope);
+    lbPolarity->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbPolarity, 0, 4);
+    QComboBox * cbPolarity = new QComboBox(scope);
+    cbPolarity->addItem("Pos. +", "Positive");
+    cbPolarity->addItem("Neg. -", "Negative");
+    bLayout->addWidget(cbPolarity, 0, 5);
+
+    QLabel * lbWaveRes = new QLabel("Wave Res. ", scope);
+    lbWaveRes->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbWaveRes, 0, 6);
+    QComboBox * cbWaveRes = new QComboBox(scope);
+    cbWaveRes->addItem(" 8 ns", "Res8");
+    cbWaveRes->addItem("16 ns", "Res16");
+    cbWaveRes->addItem("32 ns", "Res32");
+    cbWaveRes->addItem("64 ns", "Res64");
+    bLayout->addWidget(cbWaveRes, 0, 7);
+
+    //------------------ next row
+    QLabel * lbPT = new QLabel("Pre Trigger [ns] ",scope);
+    lbPT->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbPT, 1, 0);
+    sbPT = new QSpinBox(scope);
+    sbPT->setMinimum(32);
+    sbPT->setMaximum(32000);
+    sbPT->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbPT, 1, 1);
+
+    connect(sbPT, &QSpinBox::valueChanged, this, [=](){
+      if( !allowChange ) return;
+      int iDigi = cbScopeDigi->currentIndex();
+      sbPT->setValue(DIGIPARA::TraceStep*((sbPT->value() +  DIGIPARA::TraceStep - 1)/DIGIPARA::TraceStep));
+      digiMTX.lock();
+      digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), DIGIPARA::CH::PreTrigger, std::to_string(sbPT->value()));
+      digiMTX.unlock();
+    });
+
+    QLabel * lbDCOffset = new QLabel("DC offset [%] ",scope);
+    lbDCOffset->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbDCOffset, 1, 2);
+    sbDCOffset = new QSpinBox(scope);
+    sbDCOffset->setMinimum(0);
+    sbDCOffset->setMaximum(100);
+    sbDCOffset->setSingleStep(1);
+    bLayout->addWidget(sbDCOffset, 1, 3);
+
+    connect(sbDCOffset, &QSpinBox::valueChanged, this, [=](){
+      if( !allowChange ) return; 
+      int iDigi = cbScopeDigi->currentIndex();
+      digiMTX.lock();
+      digi[iDigi]->WriteChValue(std::to_string(cbScopeCh->currentIndex()), DIGIPARA::CH::DC_Offset, std::to_string(sbDCOffset->value()));
+      digiMTX.unlock();
+    });
+
+    QLabel * lbTimeRiseTime = new QLabel("Trigger Rise Time [ns] ", scope);
+    lbTimeRiseTime->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTimeRiseTime, 1, 4);
+    QSpinBox * sbTimeRiseTime = new QSpinBox(scope);
+    sbTimeRiseTime->setMinimum(32);
+    sbTimeRiseTime->setMaximum(2000);
+    sbTimeRiseTime->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbTimeRiseTime, 1, 5);
+
+    QLabel * lbTimeGuard = new QLabel("Trigger Guard [ns] ", scope);
+    lbTimeGuard->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTimeGuard, 1, 6);
+    QSpinBox * sbTimeGuard = new QSpinBox(scope);
+    sbTimeGuard->setMinimum(0);
+    sbTimeGuard->setMaximum(8000);
+    sbTimeGuard->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbTimeGuard, 1, 7);
+
+    //----------------- next row
+    QLabel * lbTrapRiseTime = new QLabel("Trap. Rise Time [ns] ", scope);
+    lbTrapRiseTime->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTrapRiseTime, 2, 0);
+    QSpinBox * sbTrapRiseTime = new QSpinBox(scope);
+    sbTrapRiseTime->setMinimum(32);
+    sbTrapRiseTime->setMaximum(13000);
+    sbTrapRiseTime->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbTrapRiseTime, 2, 1);
+
+    QLabel * lbTrapFlatTop = new QLabel("Trap. Flat Top [ns] ", scope);
+    lbTrapFlatTop->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTrapFlatTop, 2, 2);
+    QSpinBox * sbTrapFlatTop = new QSpinBox(scope);
+    sbTrapFlatTop->setMinimum(32);
+    sbTrapFlatTop->setMaximum(3000);
+    sbTrapFlatTop->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbTrapFlatTop, 2, 3);
+
+    QLabel * lbTrapPoleZero = new QLabel("Trap. Pole Zero [ns] ", scope);
+    lbTrapPoleZero->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTrapPoleZero, 2, 4);
+    QSpinBox * sbTrapPoleZero = new QSpinBox(scope);
+    sbTrapPoleZero->setMinimum(32);
+    sbTrapPoleZero->setMaximum(524000);
+    sbTrapPoleZero->setSingleStep(DIGIPARA::TraceStep);
+    bLayout->addWidget(sbTrapPoleZero, 2, 5);
+
+    QLabel * lbEnergyFineGain = new QLabel("Energy Fine Gain ", scope);
+    lbEnergyFineGain->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbEnergyFineGain, 2, 6);
+    QSpinBox * sbEnergyFineGain = new QSpinBox(scope);
+    sbEnergyFineGain->setMinimum(1);
+    sbEnergyFineGain->setMaximum(10);
+    bLayout->addWidget(sbEnergyFineGain, 2, 7);
+
+    //----------------- next row
+    QLabel * lbTrapPeaking = new QLabel("Trap. Peaking [%] ", scope);
+    lbTrapPeaking->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTrapPeaking, 3, 0);
+    QSpinBox * sbTrapPeaking = new QSpinBox(scope);
+    sbTrapPeaking->setMinimum(0);
+    sbTrapPeaking->setMaximum(100);
+    bLayout->addWidget(sbTrapPeaking, 3, 1);
+
+    QLabel * lbTrapPeakAvg = new QLabel("Trap. Peak Avg. ", scope);
+    lbTrapPeakAvg->setAlignment(Qt::AlignRight | Qt::AlignCenter);
+    bLayout->addWidget(lbTrapPeakAvg, 3, 2);
+    QComboBox * cbTrapPeakAvg = new QComboBox(scope);
+    cbTrapPeakAvg->addItem(" 1 sample", "OneShot");
+    cbTrapPeakAvg->addItem(" 4 sample", "LowAVG");
+    cbTrapPeakAvg->addItem("16 sample", "MediumAVG");
+    cbTrapPeakAvg->addItem("64 sample", "HighAVG");
+    bLayout->addWidget(cbTrapPeakAvg, 3, 3);
 
 
-  
+  }
 
   //------------ plot view
   rowID ++;
@@ -738,12 +910,14 @@ void MainWindow::SetUpPlot(){ //@--- this function run at start up
   plotView->setRenderHints(QPainter::Antialiasing);
   layout->addWidget(plotView, rowID, 0, 1, 6);
 
+  //TODO zoom and pan, see Zoom Line example
+
   //------------ close button
   rowID ++;
   bnScopeStart = new QPushButton("Start", scope);
   layout->addWidget(bnScopeStart, rowID, 0);
   bnScopeStart->setEnabled(false);
-  connect(bnScopeStart, &QPushButton::clicked, this, &MainWindow::StartScope);
+  connect(bnScopeStart, &QPushButton::clicked, this, [=](){this->StartScope(cbScopeDigi->currentIndex());});
 
   bnScopeStop = new QPushButton("Stop", scope);
   layout->addWidget(bnScopeStop, rowID, 1);
diff --git a/mainwindow.h b/mainwindow.h
index 66919fd..ad2198d 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -115,7 +115,8 @@ private slots:
   void CloseDigitizers();
   
   void OpenScope();
-  void StartScope();
+  void ReadScopeSettings(int iDigi, int ch);
+  void StartScope(int iDigi);
   void StopScope();
   void SetUpPlot();
   void UpdateScope();
@@ -155,10 +156,12 @@ private:
   UpdateTraceThread * updateTraceThread;
   QComboBox   * cbScopeDigi;
   QComboBox   * cbScopeCh;
+  QPushButton * bnScopeReset;
   QComboBox   * cbAnaProbe[2];
   QComboBox   * cbDigProbe[4];
   QSpinBox * sbRL; // record length
   QSpinBox * sbPT; // pre trigger
+  QSpinBox * sbDCOffset;
   QPushButton * bnScopeStart;
   QPushButton * bnScopeStop;
   bool allowChange;