Partialreadout (#47)

* eiger server, rxr: partial readout, also gui messages: up last command, down clear command

* added binaries and resolved conflict

* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3

* brackets in defs

slsDetectorSoftware/include/multiSlsDetector.h

@@ -374,6 +374,20 @@ class multiSlsDetector : public virtual slsDetectorDefs {
 	 */
 	void setQuad(const bool enable, int detPos = -1);
 
+    /**
+     * Set number of rows to read out (Only for Eiger)
+     * @param value number of lines
+     * @param detPos -1 for all detectors in  list or specific detector position
+     */
+    void setReadNLines(const int value, int detPos = -1);
+
+    /**
+     * Get number of rows to read out (Only for Eiger)
+     * @param detPos -1 for all detectors in  list or specific detector position
+     * @returns  number of lines
+     */
+    int getReadNLines(int detPos = -1);
+
     /**
      * Get Detector offset from shared memory in dimension d
      * @param d dimension d

slsDetectorSoftware/include/slsDetector.h

@@ -399,6 +399,18 @@ class slsDetector : public virtual slsDetectorDefs {
      */
     void setQuad(const bool enable);
 
+	/**
+     * Set number of rows to read out (Only for Eiger)
+     * @param value number of lines
+     */
+    void setReadNLines(const int value);
+
+    /**
+     * Get number of rows to read out (Only for Eiger)
+     * @returns  number of lines
+     */
+    int getReadNLines();
+
     /**
      * Get Detector offset from shared memory in dimension d
      * @param d dimension d

slsDetectorSoftware/src/multiSlsDetector.cpp

@@ -553,6 +553,27 @@ void multiSlsDetector::setQuad(const bool enable, int detPos) {
     detectors[0]->setQuad(enable);
 }
 
+void multiSlsDetector::setReadNLines(const int value, int detPos) {
+    // single
+    if (detPos >= 0) {
+        detectors[detPos]->setReadNLines(value);
+    }
+
+    // multi
+    parallelCall(&slsDetector::setReadNLines, value);
+}
+
+int multiSlsDetector::getReadNLines(int detPos) {
+    // single
+    if (detPos >= 0) {
+        return detectors[detPos]->getReadNLines();
+    }
+
+    // multi
+    auto r = parallelCall(&slsDetector::getReadNLines);
+    return sls::minusOneIfDifferent(r);
+}
+
 int multiSlsDetector::getDetectorOffset(dimension d, int detPos) {
     return detectors[detPos]->getDetectorOffset(d);
 }

slsDetectorSoftware/src/slsDetector.cpp

@@ -657,6 +657,23 @@ void slsDetector::setQuad(const bool enable) {
     }
 }
 
+void slsDetector::setReadNLines(const int value) {
+    FILE_LOG(logDEBUG1) << "Setting read n lines to " << value;
+    sendToDetector(F_SET_READ_N_LINES, value, nullptr);
+    FILE_LOG(logDEBUG1) << "Setting read n lines to " << value << " in Receiver";
+    if (shm()->useReceiverFlag) {
+        sendToReceiver(F_SET_RECEIVER_READ_N_LINES, value, nullptr);
+}
+}
+
+int slsDetector::getReadNLines() {
+    int retval = -1;
+    FILE_LOG(logDEBUG1) << "Getting read n lines";
+    sendToDetector(F_GET_READ_N_LINES, nullptr, retval);
+    FILE_LOG(logDEBUG1) << "Read n lines: " << retval;
+    return retval;
+}
+
 int slsDetector::getDetectorOffset(dimension d) const {
     return shm()->offset[d];
 }

slsDetectorSoftware/src/slsDetectorCommand.cpp

@@ -390,6 +390,13 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
 	descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdAdvanced;
 	++i;
 
+    /*! \page config
+   - <b>readnlines [i]</b> sets/gets the number of rows to read out per half module. Options: 1 - 256 (Not all values as it depends on dynamic range and 10GbE enabled). Used for EIGER only. \c Returns \c (int) 
+	 */
+    descrToFuncMap[i].m_pFuncName = "readnlines";
+    descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdAdvanced;
+    ++i;
+
     /*! \page config
    - <b>extsig [flag]</b> sets/gets the mode of the external signal. Options: \c off, \c gate_in_active_high, \c gate_in_active_low, \c trigger_in_rising_edge, \c trigger_in_falling_edge,
    \c ro_trigger_in_rising_edge, \c ro_trigger_in_falling_edge, \c gate_out_active_high, \c gate_out_active_low, \c trigger_out_rising_edge, \c trigger_out_falling_edge, \c ro_trigger_out_rising_edge,
@@ -4752,7 +4759,17 @@ std::string slsDetectorCommand::cmdAdvanced(int narg, const char * const args[],
 			myDet->setInterruptSubframe(ival > 0 ? true : false);
 		}
 		return std::to_string(myDet->getInterruptSubframe());
-	} else if (cmd == "extsig") {
+        
+	}  else if (cmd == "readnlines") {
+        if (action == PUT_ACTION) {
+                int ival = -1;
+                if (!sscanf(args[1],"%d",&ival))
+                    return std::string("could not scan readnlines parameter ") + std::string(args[1]);
+                myDet->setReadNLines(ival);
+            }
+            return std::to_string(myDet->getReadNLines());
+
+    } else if (cmd == "extsig") {
         externalSignalFlag flag = GET_EXTERNAL_SIGNAL_FLAG;
 
         if (action == PUT_ACTION) {
@@ -4874,6 +4891,7 @@ std::string slsDetectorCommand::helpAdvanced(int action) {
         os << "extsig mode \t sets the mode of the external signal. can be  \n \t \t \t off, \n \t \t \t gate_in_active_high, \n \t \t \t gate_in_active_low, \n \t \t \t trigger_in_rising_edge, \n \t \t \t trigger_in_falling_edge, \n \t \t \t ro_trigger_in_rising_edge, \n \t \t \t ro_trigger_in_falling_edge, \n \t \t \t gate_out_active_high, \n \t \t \t gate_out_active_low, \n \t \t \t trigger_out_rising_edge, \n \t \t \t trigger_out_falling_edge, \n \t \t \t ro_trigger_out_rising_edge, \n \t \t \t ro_trigger_out_falling_edge" << std::endl;
         os << "flags mode \t sets the readout flags to mode. can be none, storeinram, tot, continous, parallel, nonparallel, digital, analog_digital, overlow, nooverflow, unknown." << std::endl;
         os << "interruptsubframe flag \t sets the interrupt subframe flag. Setting it to 1 will interrupt the last subframe at the required exposure time. By default, this is disabled and set to 0, ie. it will wait for the last sub frame to finish exposing. Used for EIGER  in 32 bit mode only." << std::endl;
+        os << "readnlines f \t sets the number of rows to read out per half module. Options: 1 - 256 (Not all values as it depends on dynamic range and 10GbE enabled). Used for EIGER only. " << std::endl;
         os << "programfpga f \t programs the fpga with file f (with .pof extension)." << std::endl;
         os << "resetfpga f \t resets fpga, f can be any value" << std::endl;
         os << "copydetectorserver s p \t copies the detector server s via tftp from pc with hostname p and changes respawn server. Not for Eiger. " << std::endl;
@@ -4887,9 +4905,9 @@ std::string slsDetectorCommand::helpAdvanced(int action) {
     if (action == GET_ACTION || action == HELP_ACTION) {
 
         os << "extsig \t gets the mode of the external signal. can be  \n \t \t \t off, \n \t \t \t gate_in_active_high, \n \t \t \t gate_in_active_low, \n \t \t \t trigger_in_rising_edge, \n \t \t \t trigger_in_falling_edge, \n \t \t \t ro_trigger_in_rising_edge, \n \t \t \t ro_trigger_in_falling_edge, \n \t \t \t gate_out_active_high, \n \t \t \t gate_out_active_low, \n \t \t \t trigger_out_rising_edge, \n \t \t \t trigger_out_falling_edge, \n \t \t \t ro_trigger_out_rising_edge, \n \t \t \t ro_trigger_out_falling_edge" << std::endl;
-
         os << "flags \t gets the readout flags. can be none, storeinram, tot, continous, parallel, nonparallel, digital, analog_digital, overflow, nooverflow, unknown" << std::endl;
         os << "interruptsubframe \t gets the interrupt subframe flag. Setting it to 1 will interrupt the last subframe at the required exposure time. By default, this is disabled and set to 0, ie. it will wait for the last sub frame to finish exposing. Used for EIGER in 32 bit mode only." << std::endl;
+        os << "readnlines \t gets the number of rows to read out per half module. Used for EIGER only. " << std::endl;
         os << "led \t returns led status (0 off, 1 on)" << std::endl;
         os << "powerchip \t gets if the chip has been powered on or off" << std::endl;
         os << "auto_comp_disable \t Currently not implemented. gets if the automatic comparator diable mode is enabled/disabled" << std::endl;