cli and test side wip

slsDetectorSoftware/generator/autocomplete/bash_autocomplete.sh

@@ -80,7 +80,7 @@ _sd() {
   local IS_PATH=0
 
 
-local SLS_COMMANDS=" acquire activate adcclk adcenable adcenable10g adcindex adcinvert adclist adcname adcphase adcpipeline adcreg adcvpp apulse asamples autocompdisable badchannels blockingtrigger burstmode burstperiod bursts burstsl bustest cdsgain chipversion clearbit clearbusy clientversion clkdiv clkfreq clkphase collectionmode column compdisabletime confadc config configtransceiver counters currentsource dac dacindex daclist dacname dacvalues datastream dbitclk dbitphase dbitpipeline defaultdac defaultpattern define_bit define_reg definelist_bit definelist_reg delay delayl detectorserverversion detsize diodelay dpulse dr drlist dsamples execcommand exptime exptime1 exptime2 exptime3 extrastoragecells extsampling extsamplingsrc extsig fformat filtercells filterresistor findex firmwaretest firmwareversion fliprows flowcontrol10g fmaster fname foverwrite fpath framecounter frames framesl frametime free fwrite gaincaps gainmode gappixels gatedelay gatedelay1 gatedelay2 gatedelay3 gates getbit hardwareversion highvoltage hostname im_a im_b im_c im_d im_io imagetest include initialchecks inj_ch interpolation interruptsubframe kernelversion lastclient led lock master maxadcphaseshift maxclkphaseshift maxdbitphaseshift measuredperiod measuredsubperiod moduleid nextframenumber nmod numinterfaces overflow packageversion parallel parameters partialreset patfname patioctrl patlimits patloop patloop0 patloop1 patloop2 patmask patnloop patnloop0 patnloop1 patnloop2 patsetbit pattern patternstart patwait patwait0 patwait1 patwait2 patwaittime patwaittime0 patwaittime1 patwaittime2 patword pedestalmode period periodl polarity port powerchip powerindex powerlist powername powervalues programfpga pulse pulsechip pulsenmove pumpprobe quad ratecorr readnrows readout readoutspeed readoutspeedlist rebootcontroller reg resetdacs resetfpga romode row runclk runtime rx_arping rx_clearroi rx_dbitlist rx_dbitoffset rx_dbitreorder rx_discardpolicy rx_fifodepth rx_frameindex rx_framescaught rx_framesperfile rx_hostname rx_jsonaddheader rx_jsonpara rx_lastclient rx_lock rx_missingpackets rx_padding rx_printconfig rx_realudpsocksize rx_roi rx_silent rx_start rx_status rx_stop rx_tcpport rx_threads rx_udpsocksize rx_version rx_zmqfreq rx_zmqhwm rx_zmqip rx_zmqport rx_zmqstartfnum rx_zmqstream samples savepattern scan scanerrmsg selinterface serialnumber setbit settings settingslist settingspath signalindex signallist signalname sleep slowadc slowadcindex slowadclist slowadcname slowadcvalues start status stop stopport storagecell_delay storagecell_start subdeadtime subexptime sync syncclk temp_10ge temp_adc temp_control temp_dcdc temp_event temp_fpga temp_fpgaext temp_fpgafl temp_fpgafr temp_slowadc temp_sodl temp_sodr temp_threshold templist tempvalues tengiga threshold thresholdnotb timing timing_info_decoder timinglist timingsource top transceiverenable trigger triggers triggersl trimbits trimen trimval tsamples txdelay txdelay_frame txdelay_left txdelay_right type udp_cleardst udp_dstip udp_dstip2 udp_dstlist udp_dstmac udp_dstmac2 udp_dstport udp_dstport2 udp_firstdst udp_numdst udp_reconfigure udp_srcip udp_srcip2 udp_srcmac udp_srcmac2 udp_validate update updatedetectorserver updatekernel updatemode user v_a v_b v_c v_chip v_d v_io v_limit vchip_comp_adc vchip_comp_fe vchip_cs vchip_opa_1st vchip_opa_fd vchip_ref_comp_fe versions veto vetoalg vetofile vetophoton vetoref vetostream virtual vm_a vm_b vm_c vm_d vm_io zmqhwm zmqip zmqport "
+local SLS_COMMANDS=" acquire activate adcclk adcenable adcenable10g adcindex adcinvert adclist adcname adcphase adcpipeline adcreg adcvpp apulse asamples autocompdisable badchannels blockingtrigger burstmode burstperiod bursts burstsl bustest cdsgain chipversion clearbit clearbusy clientversion clkdiv clkfreq clkphase collectionmode column compdisabletime confadc config configtransceiver counters currentsource dac dacindex daclist dacname dacvalues datastream dbitclk dbitphase dbitpipeline defaultdac defaultpattern delay delayl detectorserverversion detsize diodelay dpulse dr drlist dsamples execcommand exptime exptime1 exptime2 exptime3 extrastoragecells extsampling extsamplingsrc extsig fformat filtercells filterresistor findex firmwaretest firmwareversion fliprows flowcontrol10g fmaster fname foverwrite fpath framecounter frames framesl frametime free fwrite gaincaps gainmode gappixels gatedelay gatedelay1 gatedelay2 gatedelay3 gates getbit hardwareversion hdr highvoltage hostname im_a im_b im_c im_d im_io imagetest include initialchecks inj_ch interpolation interruptsubframe kernelversion lastclient led lock master maxadcphaseshift maxclkphaseshift maxdbitphaseshift measuredperiod measuredsubperiod moduleid nextframenumber nmod numinterfaces overflow packageversion parallel parameters partialreset patfname patioctrl patlimits patloop patloop0 patloop1 patloop2 patmask patnloop patnloop0 patnloop1 patnloop2 patsetbit pattern patternstart patwait patwait0 patwait1 patwait2 patwaittime patwaittime0 patwaittime1 patwaittime2 patword pedestalmode period periodl polarity port powerchip powerindex powerlist powername powervalues programfpga pulse pulsechip pulsenmove pumpprobe quad ratecorr readnrows readout readoutspeed readoutspeedlist rebootcontroller reg resetdacs resetfpga romode row runclk runtime rx_arping rx_clearroi rx_dbitlist rx_dbitoffset rx_dbitreorder rx_discardpolicy rx_fifodepth rx_frameindex rx_framescaught rx_framesperfile rx_hostname rx_jsonaddheader rx_jsonpara rx_lastclient rx_lock rx_missingpackets rx_padding rx_printconfig rx_realudpsocksize rx_roi rx_silent rx_start rx_status rx_stop rx_streamdummyheader rx_tcpport rx_threads rx_udpsocksize rx_version rx_zmqfreq rx_zmqhwm rx_zmqip rx_zmqport rx_zmqstartfnum rx_zmqstream samples savepattern scan scanerrmsg selinterface serialnumber setbit settings settingslist settingspath signalindex signallist signalname sleep slowadc slowadcindex slowadclist slowadcname slowadcvalues start status stop stopport storagecell_delay storagecell_start subdeadtime subexptime sync syncclk temp_10ge temp_adc temp_control temp_dcdc temp_event temp_fpga temp_fpgaext temp_fpgafl temp_fpgafr temp_slowadc temp_sodl temp_sodr temp_threshold templist tempvalues tengiga threshold thresholdnotb timing timing_info_decoder timinglist timingsource top transceiverenable trigger triggers triggersl trimbits trimen trimval tsamples txdelay txdelay_frame txdelay_left txdelay_right type udp_cleardst udp_dstip udp_dstip2 udp_dstlist udp_dstmac udp_dstmac2 udp_dstport udp_dstport2 udp_firstdst udp_numdst udp_reconfigure udp_srcip udp_srcip2 udp_srcmac udp_srcmac2 udp_validate update updatedetectorserver updatekernel updatemode user v_a v_b v_c v_chip v_d v_io v_limit vchip_comp_adc vchip_comp_fe vchip_cs vchip_opa_1st vchip_opa_fd vchip_ref_comp_fe versions veto vetoalg vetofile vetophoton vetoref vetostream virtual vm_a vm_b vm_c vm_d vm_io zmqhwm zmqip zmqport "
 __acquire() {
 FCN_RETURN=""
 return 0
@@ -1172,6 +1172,10 @@ __hardwareversion() {
 FCN_RETURN=""
 return 0
 }
+__hdr() {
+FCN_RETURN=""
+return 0
+}
 __highvoltage() {
 FCN_RETURN=""
 if [[ ${IS_GET} -eq 0 ]]; then

slsDetectorSoftware/generator/autocomplete/zsh_autocomplete.sh

@@ -4,7 +4,7 @@
 _sd() {
 
 
-local SLS_COMMANDS=" acquire activate adcclk adcenable adcenable10g adcindex adcinvert adclist adcname adcphase adcpipeline adcreg adcvpp apulse asamples autocompdisable badchannels blockingtrigger burstmode burstperiod bursts burstsl bustest cdsgain chipversion clearbit clearbusy clientversion clkdiv clkfreq clkphase collectionmode column compdisabletime confadc config configtransceiver counters currentsource dac dacindex daclist dacname dacvalues datastream dbitclk dbitphase dbitpipeline defaultdac defaultpattern define_bit define_reg definelist_bit definelist_reg delay delayl detectorserverversion detsize diodelay dpulse dr drlist dsamples execcommand exptime exptime1 exptime2 exptime3 extrastoragecells extsampling extsamplingsrc extsig fformat filtercells filterresistor findex firmwaretest firmwareversion fliprows flowcontrol10g fmaster fname foverwrite fpath framecounter frames framesl frametime free fwrite gaincaps gainmode gappixels gatedelay gatedelay1 gatedelay2 gatedelay3 gates getbit hardwareversion highvoltage hostname im_a im_b im_c im_d im_io imagetest include initialchecks inj_ch interpolation interruptsubframe kernelversion lastclient led lock master maxadcphaseshift maxclkphaseshift maxdbitphaseshift measuredperiod measuredsubperiod moduleid nextframenumber nmod numinterfaces overflow packageversion parallel parameters partialreset patfname patioctrl patlimits patloop patloop0 patloop1 patloop2 patmask patnloop patnloop0 patnloop1 patnloop2 patsetbit pattern patternstart patwait patwait0 patwait1 patwait2 patwaittime patwaittime0 patwaittime1 patwaittime2 patword pedestalmode period periodl polarity port powerchip powerindex powerlist powername powervalues programfpga pulse pulsechip pulsenmove pumpprobe quad ratecorr readnrows readout readoutspeed readoutspeedlist rebootcontroller reg resetdacs resetfpga romode row runclk runtime rx_arping rx_clearroi rx_dbitlist rx_dbitoffset rx_dbitreorder rx_discardpolicy rx_fifodepth rx_frameindex rx_framescaught rx_framesperfile rx_hostname rx_jsonaddheader rx_jsonpara rx_lastclient rx_lock rx_missingpackets rx_padding rx_printconfig rx_realudpsocksize rx_roi rx_silent rx_start rx_status rx_stop rx_tcpport rx_threads rx_udpsocksize rx_version rx_zmqfreq rx_zmqhwm rx_zmqip rx_zmqport rx_zmqstartfnum rx_zmqstream samples savepattern scan scanerrmsg selinterface serialnumber setbit settings settingslist settingspath signalindex signallist signalname sleep slowadc slowadcindex slowadclist slowadcname slowadcvalues start status stop stopport storagecell_delay storagecell_start subdeadtime subexptime sync syncclk temp_10ge temp_adc temp_control temp_dcdc temp_event temp_fpga temp_fpgaext temp_fpgafl temp_fpgafr temp_slowadc temp_sodl temp_sodr temp_threshold templist tempvalues tengiga threshold thresholdnotb timing timing_info_decoder timinglist timingsource top transceiverenable trigger triggers triggersl trimbits trimen trimval tsamples txdelay txdelay_frame txdelay_left txdelay_right type udp_cleardst udp_dstip udp_dstip2 udp_dstlist udp_dstmac udp_dstmac2 udp_dstport udp_dstport2 udp_firstdst udp_numdst udp_reconfigure udp_srcip udp_srcip2 udp_srcmac udp_srcmac2 udp_validate update updatedetectorserver updatekernel updatemode user v_a v_b v_c v_chip v_d v_io v_limit vchip_comp_adc vchip_comp_fe vchip_cs vchip_opa_1st vchip_opa_fd vchip_ref_comp_fe versions veto vetoalg vetofile vetophoton vetoref vetostream virtual vm_a vm_b vm_c vm_d vm_io zmqhwm zmqip zmqport "
+local SLS_COMMANDS=" acquire activate adcclk adcenable adcenable10g adcindex adcinvert adclist adcname adcphase adcpipeline adcreg adcvpp apulse asamples autocompdisable badchannels blockingtrigger burstmode burstperiod bursts burstsl bustest cdsgain chipversion clearbit clearbusy clientversion clkdiv clkfreq clkphase collectionmode column compdisabletime confadc config configtransceiver counters currentsource dac dacindex daclist dacname dacvalues datastream dbitclk dbitphase dbitpipeline defaultdac defaultpattern delay delayl detectorserverversion detsize diodelay dpulse dr drlist dsamples execcommand exptime exptime1 exptime2 exptime3 extrastoragecells extsampling extsamplingsrc extsig fformat filtercells filterresistor findex firmwaretest firmwareversion fliprows flowcontrol10g fmaster fname foverwrite fpath framecounter frames framesl frametime free fwrite gaincaps gainmode gappixels gatedelay gatedelay1 gatedelay2 gatedelay3 gates getbit hardwareversion hdr highvoltage hostname im_a im_b im_c im_d im_io imagetest include initialchecks inj_ch interpolation interruptsubframe kernelversion lastclient led lock master maxadcphaseshift maxclkphaseshift maxdbitphaseshift measuredperiod measuredsubperiod moduleid nextframenumber nmod numinterfaces overflow packageversion parallel parameters partialreset patfname patioctrl patlimits patloop patloop0 patloop1 patloop2 patmask patnloop patnloop0 patnloop1 patnloop2 patsetbit pattern patternstart patwait patwait0 patwait1 patwait2 patwaittime patwaittime0 patwaittime1 patwaittime2 patword pedestalmode period periodl polarity port powerchip powerindex powerlist powername powervalues programfpga pulse pulsechip pulsenmove pumpprobe quad ratecorr readnrows readout readoutspeed readoutspeedlist rebootcontroller reg resetdacs resetfpga romode row runclk runtime rx_arping rx_clearroi rx_dbitlist rx_dbitoffset rx_dbitreorder rx_discardpolicy rx_fifodepth rx_frameindex rx_framescaught rx_framesperfile rx_hostname rx_jsonaddheader rx_jsonpara rx_lastclient rx_lock rx_missingpackets rx_padding rx_printconfig rx_realudpsocksize rx_roi rx_silent rx_start rx_status rx_stop rx_streamdummyheader rx_tcpport rx_threads rx_udpsocksize rx_version rx_zmqfreq rx_zmqhwm rx_zmqip rx_zmqport rx_zmqstartfnum rx_zmqstream samples savepattern scan scanerrmsg selinterface serialnumber setbit settings settingslist settingspath signalindex signallist signalname sleep slowadc slowadcindex slowadclist slowadcname slowadcvalues start status stop stopport storagecell_delay storagecell_start subdeadtime subexptime sync syncclk temp_10ge temp_adc temp_control temp_dcdc temp_event temp_fpga temp_fpgaext temp_fpgafl temp_fpgafr temp_slowadc temp_sodl temp_sodr temp_threshold templist tempvalues tengiga threshold thresholdnotb timing timing_info_decoder timinglist timingsource top transceiverenable trigger triggers triggersl trimbits trimen trimval tsamples txdelay txdelay_frame txdelay_left txdelay_right type udp_cleardst udp_dstip udp_dstip2 udp_dstlist udp_dstmac udp_dstmac2 udp_dstport udp_dstport2 udp_firstdst udp_numdst udp_reconfigure udp_srcip udp_srcip2 udp_srcmac udp_srcmac2 udp_validate update updatedetectorserver updatekernel updatemode user v_a v_b v_c v_chip v_d v_io v_limit vchip_comp_adc vchip_comp_fe vchip_cs vchip_opa_1st vchip_opa_fd vchip_ref_comp_fe versions veto vetoalg vetofile vetophoton vetoref vetostream virtual vm_a vm_b vm_c vm_d vm_io zmqhwm zmqip zmqport "
 __acquire() {
 FCN_RETURN=""
 return 0
@@ -1096,6 +1096,10 @@ __hardwareversion() {
 FCN_RETURN=""
 return 0
 }
+__hdr() {
+FCN_RETURN=""
+return 0
+}
 __highvoltage() {
 FCN_RETURN=""
 if [[ ${IS_GET} -eq 0 ]]; then

slsDetectorSoftware/generator/commands.yaml

@@ -2775,6 +2775,13 @@ sleep:
             - argc: 2
               arg_types: [ int, special::time_unit ]
 
+hdr:
+    is_description: true
+    actions:
+        GET:
+          argc: 0
+        PUT:
+          argc: -1
 
 ################# special commands ##########################
 
@@ -3419,6 +3426,7 @@ scan:
           input: [ "defs::scanParameters(StringTo<defs::dacIndex>(args[0]), StringTo<int>(args[1]), StringTo<int>(args[2]), StringTo<int>(args[3]), t)" ]
           input_types: [ auto ]
 
+
 Trigger:
   template: true
   actions:

slsDetectorSoftware/generator/extended_commands.yaml

@@ -1087,7 +1087,7 @@ chipversion:
         store_result_in_t: true
   command_name: chipversion
   function_alias: chipversion
-  help: "\n\t[Jungfrau] Returns chip version. Can be 1.0 or 1.1"
+  help: "\n\t[Jungfrau] Returns chip version. Can be 1.0, 1.1 or 1.2"
   infer_action: true
   template: true
 clearbit:
@@ -4752,6 +4752,39 @@ hardwareversion:
     \ on detector."
   infer_action: true
   template: true
+hdr:
+  actions:
+    GET:
+      args:
+      - arg_types: []
+        argc: 0
+        cast_input: []
+        check_det_id: false
+        convert_det_id: true
+        function: ''
+        input: []
+        input_types: []
+        output: []
+        require_det_id: false
+        store_result_in_t: true
+    PUT:
+      args:
+      - arg_types: []
+        argc: -1
+        cast_input: []
+        check_det_id: false
+        convert_det_id: true
+        function: ''
+        input: []
+        input_types: []
+        output: []
+        require_det_id: false
+        store_result_in_t: false
+  command_name: hdr
+  function_alias: hdr
+  help: ''
+  infer_action: true
+  is_description: true
 highvoltage:
   actions:
     GET:

slsDetectorSoftware/src/Caller.cpp

@@ -1419,7 +1419,7 @@ std::string Caller::chipversion(int action) {
     // print help
     if (action == slsDetectorDefs::HELP_ACTION) {
         os << R"V0G0N(
-	[Jungfrau] Returns chip version. Can be 1.0 or 1.1 )V0G0N"
+	[Jungfrau] Returns chip version. Can be 1.0, 1.1 or 1.2 )V0G0N"
            << std::endl;
         return os.str();
     }

slsDetectorSoftware/src/Caller.h

@@ -153,6 +153,7 @@ class Caller {
     std::string gates(int action);
     std::string getbit(int action);
     std::string hardwareversion(int action);
+    std::string hdr(int action);
     std::string highvoltage(int action);
     std::string hostname(int action);
     std::string im_a(int action);
@@ -499,6 +500,7 @@ class Caller {
         {"gates", &Caller::gates},
         {"getbit", &Caller::getbit},
         {"hardwareversion", &Caller::hardwareversion},
+        {"hdr", &Caller::hdr},
         {"highvoltage", &Caller::highvoltage},
         {"hostname", &Caller::hostname},
         {"im_a", &Caller::im_a},

slsDetectorSoftware/src/CallerSpecial.cpp

@@ -1404,6 +1404,7 @@ std::string Caller::gaincaps(int action) {
     }
     return os.str();
 }
+
 std::string Caller::sleep(int action) {
     std::ostringstream os;
     if (action == defs::HELP_ACTION) {
@@ -1437,4 +1438,37 @@ std::string Caller::sleep(int action) {
     return os.str();
 }
 
+std::string Caller::hdr(int action) {
+    std::ostringstream os;
+    if (action == defs::HELP_ACTION) {
+        os << "synchrotron|fel|0]\n\t[Jungfrau] Enables the high dynamic range in detector. 0 disables HDR. Synchrontron is the default. FEL can only be used with chip version '1.2 HDR'."
+           << '\n';
+    } else if (action == defs::GET_ACTION) {
+        if (args.size() != 0) {
+            WrongNumberOfParameters(0);
+        }
+        auto t = det->getHDR(std::vector<int>{det_id});
+        os << OutString(t) << '\n';
+    } else if (action == defs::PUT_ACTION) {
+        if (args.size() != 1) {
+            WrongNumberOfParameters(1);
+        }
+        if (sls::is_int(args[0])) {
+            auto val = StringTo<int>(args[0]);
+            if (val == 0) {
+                det->setHDR(defs::HDR::DISABLED, std::vector<int>{det_id});
+            } else {
+                throw RuntimeError("Did you mean to disable HDR? Then Please use '0' to do so. Unknown argument: " + args[0]);
+            }
+        }
+        auto val = StringTo<defs::HDR>(args[0]);
+        det->setHDR(val, std::vector<int>{det_id});
+        os << ToString(val) << '\n';
+    } else {
+        throw RuntimeError("Unknown action");
+    }
+    return os.str();
+}
+
+
 } // namespace sls

slsDetectorSoftware/src/inferAction.cpp

@@ -1520,6 +1520,12 @@ int InferAction::hardwareversion() {
     }
 }
 
+int InferAction::hdr() {
+
+    throw RuntimeError("sls_detector is disabled for command: hdr. Use "
+                       "sls_detector_get or sls_detector_put");
+}
+
 int InferAction::highvoltage() {
 
     if (args.size() == 0) {

slsDetectorSoftware/src/inferAction.h

@@ -108,6 +108,7 @@ class InferAction {
     int gates();
     int getbit();
     int hardwareversion();
+    int hdr();
     int highvoltage();
     int hostname();
     int im_a();
@@ -442,6 +443,7 @@ class InferAction {
         {"gates", &InferAction::gates},
         {"getbit", &InferAction::getbit},
         {"hardwareversion", &InferAction::hardwareversion},
+        {"hdr", &InferAction::hdr},
         {"highvoltage", &InferAction::highvoltage},
         {"hostname", &InferAction::hostname},
         {"im_a", &InferAction::im_a},

slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp

@@ -791,4 +791,45 @@ TEST_CASE("sync", "[.detectorintegration]") {
     }
 }
 
+TEST_CASE("hdr", "[.detectorintegration]") {
+    Detector det;
+    Caller caller(&det);
+    auto det_type = det.getDetectorType().squash();
+    if (det_type == defs::JUNGFRAU) {
+        // disable and args
+        REQUIRE_THROWS(caller.call("hdr", {"0", "synchrotron"}, -1, PUT));
+        //invalid enable
+        REQUIRE_THROWS(caller.call("hdr", {"2"}, -1, PUT));
+        // no operation mode
+        REQUIRE_THROWS(caller.call("hdr", {"1"}, -1, PUT));
+        // invalid operation mode
+        REQUIRE_THROWS(caller.call("hdr", {"invalid"}, -1, PUT));
+        // TODO: implement get chip type to get hdr, throw if !hdr and trying fel for oper mode and not throw if hdr
+        {
+            std::ostringstream oss;
+            REQUIRE_NOTHROW(caller.call("hdr", {"synchrotron"}, -1, PUT, oss));
+            REQUIRE(oss.str() == "hdr [synchrotron]\n");
+        }
+        {
+            std::ostringstream oss;
+            REQUIRE_NOTHROW(caller.call("hdr", {}, -1, GET, oss));
+            REQUIRE(oss.str() == "hdr [enabled synchrotron]\n");
+        }
+        {
+            std::ostringstream oss;
+            REQUIRE_NOTHROW(caller.call("hdr", {"0"}, -1, PUT, oss));
+            REQUIRE(oss.str() == "hdr [0]\n");
+        }
+        {
+            std::ostringstream oss;
+            REQUIRE_NOTHROW(caller.call("hdr", {}, -1, GET, oss));
+            REQUIRE(oss.str() == "hdr [disabled]\n");
+        }
+    } else {
+        REQUIRE_THROWS(caller.call("hdr", {}, -1, GET));
+        REQUIRE_THROWS(caller.call("hdr", {"0"}, -1, PUT));
+    }
+}
+
+
 } // namespace sls

slsSupportLib/include/sls/ToString.h

@@ -46,6 +46,7 @@ std::string ToString(const defs::gainMode s);
 std::string ToString(const defs::polarity s);
 std::string ToString(const defs::timingInfoDecoder s);
 std::string ToString(const defs::collectionMode s);
+std::string ToString(const defs::operationMode s);
 
 std::string ToString(bool value);
 
@@ -59,6 +60,9 @@ std::ostream &operator<<(std::ostream &os,
 std::string ToString(const slsDetectorDefs::scanParameters &r);
 std::ostream &operator<<(std::ostream &os,
                          const slsDetectorDefs::scanParameters &r);
+std::string ToString(const slsDetectorDefs::hdrParameters &r);
+std::ostream &operator<<(std::ostream &os,
+                         const slsDetectorDefs::hdrParameters &r);
 std::string ToString(const slsDetectorDefs::currentSrcParameters &r);
 std::ostream &operator<<(std::ostream &os,
                          const slsDetectorDefs::currentSrcParameters &r);
@@ -324,6 +328,7 @@ template <> defs::gainMode StringTo(const std::string &s);
 template <> defs::polarity StringTo(const std::string &s);
 template <> defs::timingInfoDecoder StringTo(const std::string &s);
 template <> defs::collectionMode StringTo(const std::string &s);
+template <> defs::operationMode StringTo(const std::string &s);
 
 template <> uint8_t StringTo(const std::string &s);
 template <> uint16_t StringTo(const std::string &s);

slsSupportLib/include/sls/sls_detector_defs.h

@@ -527,6 +527,7 @@ enum streamingInterface {
     enum polarity { POSITIVE, NEGATIVE };
     enum timingInfoDecoder { SWISSFEL, SHINE };
     enum collectionMode { HOLE, ELECTRON };
+    enum operationMode {SYNCHROTRON, FEL}
 
 #ifdef __cplusplus
 
@@ -560,6 +561,20 @@ enum streamingInterface {
         }
     } __attribute__((packed));
 
+    /** hdr structure */
+    struct hdrParameters {
+        int enable;
+        operationMode opMode;
+
+        /** disable hdr mode */
+        hdrParameters() : enable(0), opMode(SYNCHROTRON) {}
+        /** enable hdr mode */
+        hdrParameters(operationMode mode) : enable(1), opMode(mode) {}
+        constexpr bool operator==(const hdrParameters &other) const {
+            return ((enable == other.enable) && (opMode == other.opMode));
+        }
+    } __attribute__((packed));
+
     struct currentSrcParameters {
         int enable;
         int fix;

slsSupportLib/src/ToString.cpp

@@ -123,6 +123,24 @@ std::ostream &operator<<(std::ostream &os,
     return os << ToString(r);
 }
 
+std::string ToString(const slsDetectorDefs::hdrParameters &r) {
+    std::ostringstream oss;
+    oss << '[';
+    if (r.enable) {
+        oss << "enabled" << " " << ToString(r.opMode) << std::endl;
+    } else {
+        oss << "disabled";
+    }
+    oss << ']';
+    return oss.str();
+}
+
+std::ostream &operator<<(std::ostream &os,
+                         const slsDetectorDefs::hdrParameters &r) {
+    return os << ToString(r);
+}
+
+
 std::string ToString(const slsDetectorDefs::currentSrcParameters &r) {
     std::ostringstream oss;
     if (r.fix < -1 || r.fix > 1 || r.normal < -1 || r.normal > 1) {
@@ -694,6 +712,17 @@ std::string ToString(const defs::collectionMode s) {
     }
 }
 
+std::string ToString(const defs::operationMode s) {
+    switch (s) {
+    case defs::SYNCHROTRON:
+        return std::string("synchrotron");
+    case defs::FEL:
+        return std::string("fel");
+    default:
+        return std::string("Unknown");
+    }
+}
+
 const std::string &ToString(const std::string &s) { return s; }
 
 template <> defs::detectorType StringTo(const std::string &s) {
@@ -1127,6 +1156,14 @@ template <> defs::collectionMode StringTo(const std::string &s) {
     throw RuntimeError("Unknown collection mode " + s);
 }
 
+template <> defs::operationMode StringTo(const std::string &s) {
+    if (s == "synchrotron")
+        return defs::SYNCHROTRON;
+    if (s == "fel")
+        return defs::FEL;
+    throw RuntimeError("Unknown operation mode " + s);
+}
+
 template <> uint8_t StringTo(const std::string &s) {
     int base = s.find("0x") != std::string::npos ? 16 : 10;
     int value = std::stoi(s, nullptr, base);