Gappixels (#89)

* WIP

* WIP virtual delays, imagetest for saturation

* WIP, vertical and horizontal

* WIP

* gap pixels work, fixed 32 bit data out (10gbe=0) for virtual servers

* quad works (also in virtual), handling gappixels and quad

* jungfrau gapppixels work

* jungfrau: done

* complete image or missing packets given in json header and gui

* eiger virtual 4 bit mode bug fix

* working version of zmq add json header, except printout

* printout bug

* fix for json para

* to map WIP

* map done

* map print , mapwith result left

* json result works, testing added

* updated server binaries

* compiling on rhels7, variable size char array iniitalization

* zmqsocket parsing didnt need Document

* const to map, json para is strings not map

* json add header: mapping cleaner without insert make_pair

slsDetectorSoftware/src/CmdProxy.h

@@ -477,6 +477,7 @@ class CmdProxy {
                                     {"cycles", "triggers"},
                                     {"cyclesl", "triggersl"},
                                     {"clkdivider", "speed"}, 
+                                    {"digitest", "imagetest"},
 
                                     /** temperature */
                                     /** dacs */
@@ -527,8 +528,6 @@ class CmdProxy {
 
                                     /* Jungfrau Specific */
                                     /* Gotthard Specific */
-                                    {"digitest", "imagetest"},
-
                                     /* Gotthard2 Specific */
                                     /* Mythen3 Specific */ 
                                     /* CTB Specific */
@@ -591,6 +590,7 @@ class CmdProxy {
                           {"clkdiv", &CmdProxy::ClockDivider},                           
                           {"vhighvoltage", &CmdProxy::vhighvoltage},
                           {"powerchip", &CmdProxy::powerchip}, 
+                          {"imagetest", &CmdProxy::imagetest},
 
                           /** temperature */
                           {"temp_adc", &CmdProxy::temp_adc},
@@ -789,7 +789,6 @@ class CmdProxy {
                           {"clearroi", &CmdProxy::ClearROI},
                           {"exptimel", &CmdProxy::exptimel},
                           {"extsig", &CmdProxy::extsig},
-                          {"imagetest", &CmdProxy::imagetest},
 
                           /* Gotthard2 Specific */  
                           {"bursts", &CmdProxy::bursts},
@@ -867,7 +866,7 @@ class CmdProxy {
                           {"patsetbit", &CmdProxy::patsetbit}, 
 
                           /* Moench */
-                          {"rx_jsonaddheader", &CmdProxy::rx_jsonaddheader}, 
+                          {"rx_jsonaddheader", &CmdProxy::AdditionalJsonHeader}, 
                           {"rx_jsonpara", &CmdProxy::JsonParameter}, 
                           {"emin", &CmdProxy::MinMaxEnergyThreshold}, 
                           {"emax", &CmdProxy::MinMaxEnergyThreshold}, 
@@ -980,6 +979,7 @@ class CmdProxy {
     std::string PatternWaitAddress(int action);
     std::string PatternWaitTime(int action);
     /* Moench */
+    std::string AdditionalJsonHeader(int action);
     std::string JsonParameter(int action);
     std::string MinMaxEnergyThreshold(int action);
     /* Advanced */
@@ -1088,6 +1088,10 @@ class CmdProxy {
                     "\n\t[Mythen3] If module not connected or wrong module, 1 will fail. By default, not powered on"
                     "\n\t[Gotthard2] If module not connected or wrong module, 1 will fail. By default, powered on at server start up.");  
 
+    INTEGER_COMMAND(imagetest, getImageTestMode, setImageTestMode, StringTo<int>,
+                    "[0, 1]\n\t[Gotthard] 1 adds channel intensity with precalculated values when taking an acquisition. Default is 0."
+                    "\n\t[Eiger][Jungfrau] Only for Virtual servers. If 0, each pixel intensity incremented by 1. If 1, all pixels almost saturated.");  
+
     /** temperature */                
 
     GET_IND_COMMAND(temp_adc, getTemperature, slsDetectorDefs::TEMPERATURE_ADC, " °C",
@@ -1582,9 +1586,6 @@ class CmdProxy {
     INTEGER_COMMAND(extsig, getExternalSignalFlags, setExternalSignalFlags, sls::StringTo<slsDetectorDefs::externalSignalFlag>,
                     "[trigger_in_rising_edge|trigger_in_falling_edge]\n\t[Gotthard] External signal mode for trigger timing mode.");
 
-    INTEGER_COMMAND(imagetest, getImageTestMode, setImageTestMode, StringTo<int>,
-                    "[0, 1]\n\t[Gotthard] 1 adds channel intensity with precalculated values when taking an acquisition. Default is 0.");  
-
     /* Gotthard2 Specific */
     INTEGER_COMMAND_NOID(bursts, getNumberOfBursts, setNumberOfBursts,
                          StringTo<int64_t>,
@@ -1719,9 +1720,6 @@ class CmdProxy {
 
     /* Moench */
     
-    STRING_COMMAND(rx_jsonaddheader, getAdditionalJsonHeader, setAdditionalJsonHeader, 
-                "[\\\"label1\\\":\\\"value1\\\"], [\\\"label2\\\":\\\"value2\\\"]\n\tAdditional json header to be streamd out from receiver via zmq. Default is empty. Use only if to be processed by an intermediate user process listening to receiver zmq packets.");
-
     INTEGER_COMMAND(framemode, getFrameMode, setFrameMode, sls::StringTo<slsDetectorDefs::frameModeType>,
                     "[pedestal|newpedestal|flatfield|newflatfield]\n\t[Moench] Frame mode (soft setting) in processor.");