updated parse_json to parse new master json file

include/aare/RawMasterFile.hpp

@@ -42,14 +42,15 @@ class RawFileNameComponents {
 
 class ScanParameters {
     bool m_enabled = false;
-    std::string m_dac;
+    DACIndex m_dac = DACIndex::DAC_2; 
     int m_start = 0;
     int m_stop = 0;
     int m_step = 0;
-    // TODO! add settleTime, requires string to time conversion
+    int64_t m_settleTime = 0; // [ns]
 
   public:
     ScanParameters(const std::string &par);
+    ScanParameters(const bool enabled, const DACIndex dac, const int start, const int stop, const int step, const int64_t settleTime); 
     ScanParameters() = default;
     ScanParameters(const ScanParameters &) = default;
     ScanParameters &operator=(const ScanParameters &) = default;
@@ -57,9 +58,10 @@ class ScanParameters {
     int start() const;
     int stop() const;
     int step() const;
-    const std::string &dac() const;
-    bool enabled() const;
-    void increment_stop();
+    DACIndex dac() const;
+    bool enabled() const; 
+    int64_t settleTime() const;
+    void increment_stop();   
 };
 
 /**

include/aare/defs.hpp

@@ -215,6 +215,121 @@ enum class DetectorType {
     Unknown
 };
 
+/**
+* @brief detector dacs indexes
+*/
+enum DACIndex {
+        DAC_0,
+        DAC_1,
+        DAC_2,
+        DAC_3,
+        DAC_4,
+        DAC_5,
+        DAC_6,
+        DAC_7,
+        DAC_8,
+        DAC_9,
+        DAC_10,
+        DAC_11,
+        DAC_12,
+        DAC_13,
+        DAC_14,
+        DAC_15,
+        DAC_16,
+        DAC_17,
+        VSVP,
+        VTRIM,
+        VRPREAMP,
+        VRSHAPER,
+        VSVN,
+        VTGSTV,
+        VCMP_LL,
+        VCMP_LR,
+        VCAL,
+        VCMP_RL,
+        RXB_RB,
+        RXB_LB,
+        VCMP_RR,
+        VCP,
+        VCN,
+        VISHAPER,
+        VTHRESHOLD,
+        IO_DELAY,
+        VREF_DS,
+        VOUT_CM,
+        VIN_CM,
+        VREF_COMP,
+        VB_COMP,
+        VDD_PROT,
+        VIN_COM,
+        VREF_PRECH,
+        VB_PIXBUF,
+        VB_DS,
+        VREF_H_ADC,
+        VB_COMP_FE,
+        VB_COMP_ADC,
+        VCOM_CDS,
+        VREF_RSTORE,
+        VB_OPA_1ST,
+        VREF_COMP_FE,
+        VCOM_ADC1,
+        VREF_L_ADC,
+        VREF_CDS,
+        VB_CS,
+        VB_OPA_FD,
+        VCOM_ADC2,
+        VCASSH,
+        VTH2,
+        VRSHAPER_N,
+        VIPRE_OUT,
+        VTH3,
+        VTH1,
+        VICIN,
+        VCAS,
+        VCAL_N,
+        VIPRE,
+        VCAL_P,
+        VDCSH,
+        VBP_COLBUF,
+        VB_SDA,
+        VCASC_SFP,
+        VIPRE_CDS,
+        IBIAS_SFP,
+        ADC_VPP,
+        HIGH_VOLTAGE,
+        TEMPERATURE_ADC,
+        TEMPERATURE_FPGA,
+        TEMPERATURE_FPGAEXT,
+        TEMPERATURE_10GE,
+        TEMPERATURE_DCDC,
+        TEMPERATURE_SODL,
+        TEMPERATURE_SODR,
+        TEMPERATURE_FPGA2,
+        TEMPERATURE_FPGA3,
+        TRIMBIT_SCAN,
+        V_POWER_A = 100,
+        V_POWER_B = 101,
+        V_POWER_C = 102,
+        V_POWER_D = 103,
+        V_POWER_IO = 104,
+        V_POWER_CHIP = 105,
+        I_POWER_A = 106,
+        I_POWER_B = 107,
+        I_POWER_C = 108,
+        I_POWER_D = 109,
+        I_POWER_IO = 110,
+        V_LIMIT = 111,
+        SLOW_ADC0 = 1000,
+        SLOW_ADC1,
+        SLOW_ADC2,
+        SLOW_ADC3,
+        SLOW_ADC4,
+        SLOW_ADC5,
+        SLOW_ADC6,
+        SLOW_ADC7,
+        SLOW_ADC_TEMP
+};
+
 enum class TimingMode { Auto, Trigger };
 enum class FrameDiscardPolicy { NoDiscard, Discard, DiscardPartial };
 
@@ -233,4 +348,12 @@ using DataTypeVariants = std::variant<uint16_t, uint32_t>;
 
 constexpr uint16_t ADC_MASK = 0x3FFF; // used to mask out the gain bits in Jungfrau
 
+/**
+ * @brief Convert a string to a DACIndex
+ * @param arg string representation of the dacIndex
+ * @return DACIndex
+ * @throw invalid argument error if the string does not match any DACIndex
+ */
+template<> DACIndex StringTo(const std::string &arg);
+
 } // namespace aare