WIP

slsDetectorSoftware/include/Detector.h

@@ -167,7 +167,7 @@ class Detector {
      * Get Client Software version
      * @returns client software version
      */
-    Result<int64_t> getClientSoftwareVersion() const;
+    int64_t getClientSoftwareVersion() const;
 
     /**
      * Get Receiver software version
@@ -187,7 +187,7 @@ class Detector {
      * Also updates local detector cache
      * @param name hostnames for the positions given
      */
-    void setHostname(const std::vector<std::string> &name);
+    void setHostname(const std::vector<std::string> &value);
 
     /**
      * Get Detector type as an enum
@@ -209,25 +209,48 @@ class Detector {
      */
     Result<std::string> getDetectorTypeAsString(Positions pos = {}) const;
 
+    /**
+     * Returns the total number of detectors in the multidetector structure
+     * @returns total number of detectors in the multidetector structure
+     */
+    int getTotalNumberOfDetectors() const;
+
     /**
      * Returns the number of detectors in the multidetector structure
-     * @returns number of detectors
+     * @returns number of detectors in the multidetector structure
      */
-    int getNumberOfDetectors() const;
+    defs::coordinates getNumberOfDetectors() const;
 
     /**
-     * Returns number of detectors in dimension d
-     * @param d dimension d
-     * @returns number of detectors in dimension d
+     * Returns the number of channels
+     * @param pos detector position
+     * @returns the number of channels
      */
-    int getNumberOfDetectors(defs::dimension d) const;
+    Result<defs::coordinates> getNumberOfChannels(Positions pos = {}) const;
 
     /**
-     * Returns the number of detectors in each direction
-       @param nx number of detectors in x direction
-       @param ny number of detectors in y direction
+     * Returns the number of channels including gap pixels
+     * @param pos detector position
+     * @returns the number of channels including gap pixels
      */
-    void getNumberOfDetectors(int &nx, int &ny) const;
+    Result<defs::coordinates>
+    getNumberOfChannelsInclGapPixels(Positions pos = {}) const;
+
+    /**
+     * Returns the maximum number of channels of complete detector in both
+     * dimensions. -1 means no limit in this dimension. This value is used to
+     * calculate row and column offsets for each module.
+     * @returns the maximum number of channels of complete detector
+     */
+    defs::coordinates getMaxNumberOfChannels() const;
+
+    /**
+     * Sets the maximum number of channels of complete detector in both
+     * dimensions. -1 means no limit in this dimension. This value is used to
+     * calculate row and column offsets for each module.
+     * @param value the maximum number of channels of complete detector
+     */
+    void setMaxNumberOfChannels(const defs::coordinates value);
 
     // Erik
 

slsDetectorSoftware/include/multiSlsDetector.h

@@ -396,7 +396,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
      * @param detPos -1 for all detectors in  list or specific detector position
      * @returns the total number of channels of all sls detectors
      */
-    int getTotalNumberOfChannels(int detPos = -1);
+    int getTotalNumberOfChannels(int detPos = -1);//
 
     /**
      * Returns the total number of channels of all sls detectors in dimension d
@@ -405,7 +405,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
      * @param detPos -1 for all detectors in  list or specific detector position
      * @returns the total number of channels of all sls detectors in dimension d
      */
-    int getTotalNumberOfChannels(dimension d, int detPos = -1);
+    int getTotalNumberOfChannels(dimension d, int detPos = -1);//
+
+    /**
+     * Returns the total number of channels from shared memory in each dimension
+     * @returns the total number of channels in each dimension
+     */
+    slsDetectorDefs::coordinates getNumberOfChannels() const; //
 
     /**
      * Returns the total number of channels of all sls detectors in dimension d
@@ -415,7 +421,13 @@ class multiSlsDetector : public virtual slsDetectorDefs {
      * @returns the total number of channels of all sls detectors in dimension d
      * including gap pixels
      */
-    int getTotalNumberOfChannelsInclGapPixels(dimension d, int detPos = -1);
+    int getTotalNumberOfChannelsInclGapPixels(dimension d, int detPos = -1);//
+
+    /**
+     * Returns the total number of channels including gap pixels
+     * @returns the total number of channels including gap pixels
+     */
+    slsDetectorDefs::coordinates getTotalNumberOfChannelsInclGapPixels() const;  //
 
     /**
      * Returns the maximum number of channels of all sls detectors in each
@@ -425,7 +437,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
      * @returns the maximum number of channels of all sls detectors in dimension
      * d
      */
-    int getMaxNumberOfChannelsPerDetector(dimension d);
+    int getMaxNumberOfChannelsPerDetector(dimension d);//
 
     /**
      * Sets the maximum number of channels of all sls detectors in each
@@ -436,7 +448,23 @@ class multiSlsDetector : public virtual slsDetectorDefs {
      * @returns the maximum number of channels of all sls detectors in dimension
      * d
      */
-    int setMaxNumberOfChannelsPerDetector(dimension d, int i);
+    int setMaxNumberOfChannelsPerDetector(dimension d, int i);//
+       
+    /**
+     * Returns maximum number of channels of all sls detectors in each
+     * dimension d from shared memory, multi detector shared memory variable to
+     * calculate offsets for each sls detector
+     * @returns  maximum number of channels of all sls detectors
+     */
+    slsDetectorDefs::coordinates getMaxNumberOfChannels() const;  //
+
+    /**
+     * Sets maximum number of channels of all sls detectors in each
+     * dimension d from shared memory, multi detector shared memory variable to
+     * calculate offsets for each sls detector
+     * @param c maximum number of channels of all sls detectors
+     */
+    void setMaxNumberOfChannels(const slsDetectorDefs::coordinates c);  //
 
     /**
      * Get Quad Type (Only for Eiger Quad detector hardware)

slsDetectorSoftware/include/slsDetector.h

@@ -350,6 +350,12 @@ class slsDetector : public virtual slsDetectorDefs {
      */
     int getTotalNumberOfChannels(dimension d) const;
 
+    /**
+     * Returns the total number of channels from shared memory in each dimension
+     * @returns the total number of channels in each dimension
+     */
+    slsDetectorDefs::coordinates getNumberOfChannels() const;
+
     /**
      * Returns the total number of channels of in dimension d including gap
      * pixels from shared memory
@@ -359,6 +365,12 @@ class slsDetector : public virtual slsDetectorDefs {
      */
     int getTotalNumberOfChannelsInclGapPixels(dimension d) const;
 
+    /**
+     * Returns the total number of channels including gap pixels
+     * @returns the total number of channels including gap pixels
+     */
+    slsDetectorDefs::coordinates getNumberOfChannelsInclGapPixels() const;  
+
     /**
      * returns the number of channels per chip from shared memory (Mythen)
      * @returns number of channels per chip