Counters (#71)

* mythen3: adding counters mask, firmware still takes only number of counters for now

* mythen3: checking if module attached before powering on chip

* bug fix: loop inital declaration not allowed in c

* fix scope eiger test

* mythen3: renamed setCounters to setCounterMask and getCounterMask in API

* mythen3 replacing counting bits with popcount

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>

slsReceiverSoftware/include/ClientInterface.h

@@ -119,6 +119,7 @@ class ClientInterface : private virtual slsDetectorDefs {
     int set_udp_port2(sls::ServerInterface2 &socket);
     int set_num_interfaces(sls::ServerInterface2 &socket);
     int set_adc_mask_10g(sls::ServerInterface2 &socket);  
+    int set_num_counters(sls::ServerInterface2 &socket);  
 
     Implementation *impl() {
         if (receiver != nullptr) {

slsReceiverSoftware/include/GeneralData.h

@@ -208,12 +208,21 @@ public:
 
     /**
      * set number of interfaces (jungfrau)
-     * @param number of interfaces
+     * @param n number of interfaces
      */
     virtual void SetNumberofInterfaces(const int n) {
         FILE_LOG(logERROR) << "SetNumberofInterfaces is a generic function that should be overloaded by a derived class";
     }
 
+    /**
+     * set number of counters (mythen3)
+     * @param n number of counters
+	 * @param dr dynamic range
+     */
+    virtual void SetNumberofCounters(const int n, const int dr) {
+        FILE_LOG(logERROR) << "SetNumberofCounters is a generic function that should be overloaded by a derived class";
+    }	
+
 	/**
 	 * Print all variables
 	 */
@@ -528,16 +537,19 @@ class JungfrauData : public GeneralData {
 };
 
 class Mythen3Data : public GeneralData {
-
- public:
+private:
+	int ncounters;
+	const int NCHAN = 1280;
+public:
 
 	/** Constructor */
 	Mythen3Data(){
 		myDetectorType		= slsDetectorDefs::MYTHEN3;
-		nPixelsX 			= (1280 * 3); // 1280 channels, 3 counters
+		ncounters			= 3;
+		nPixelsX 			= (NCHAN * ncounters); // max 1280 channels x 3 counters
 		nPixelsY 			= 1;
 		headerSizeinPacket  = sizeof(slsDetectorDefs::sls_detector_header);
-		dataSize 			= 7680;//8192;
+		dataSize 			= 7680;
 		packetSize 			= headerSizeinPacket + dataSize;
 		packetsPerFrame 	= 2;
 		imageSize 			= dataSize * packetsPerFrame;
@@ -547,6 +559,39 @@ class Mythen3Data : public GeneralData {
 		standardheader		= true;
 		defaultUdpSocketBufferSize = (1000 * 1024 * 1024);
 	};
+
+    /**
+     * set number of counters (mythen3)
+     * @param n number of counters
+	 * @param dr dynamic range
+     */
+    virtual void SetNumberofCounters(const int n, const int dr) {
+		if (n < 1 || n > 3) {
+			throw sls::RuntimeError("Invalid number of counters " + std::to_string(n));
+		}
+		ncounters = n;
+		nPixelsX = NCHAN * ncounters;
+		imageSize = nPixelsX * nPixelsY * 	((dr > 16) ? 4 : 	// 32 bit
+											((dr > 8)  ? 2 : 	// 16 bit
+											((dr > 4)  ? 0.5 : 	// 4 bit
+											0.125)));			// 1 bit
+		dataSize = imageSize / packetsPerFrame;
+		packetSize 			= headerSizeinPacket + dataSize;
+	}
+
+	/**
+	 * Setting dynamic range changes member variables
+	 * @param dr dynamic range
+	 * @param tgEnable (discarded, of no value to mythen3)
+	 */
+	void SetDynamicRange(int dr, bool tgEnable) {
+		imageSize = nPixelsX * nPixelsY * 	((dr > 16) ? 4 : 	// 32 bit
+											((dr > 8)  ? 2 : 	// 16 bit
+											((dr > 4)  ? 0.5 : 	// 4 bit
+											0.125)));			// 1 bit
+		dataSize = imageSize / packetsPerFrame;
+		packetSize 			= headerSizeinPacket + dataSize;		
+	}	
 };
 
 

slsReceiverSoftware/include/Implementation.h

@@ -149,6 +149,8 @@ class Implementation : private virtual slsDetectorDefs {
     uint32_t getNumberofDigitalSamples() const;
     /**[Ctb] */
     void setNumberofDigitalSamples(const uint32_t i);
+    int getNumberofCounters() const;
+    void setNumberofCounters(const int i);
     uint32_t getDynamicRange() const;
     void setDynamicRange(const uint32_t i);
     ROI getROI() const;
@@ -271,6 +273,7 @@ class Implementation : private virtual slsDetectorDefs {
     uint64_t subPeriod;
     uint64_t numberOfAnalogSamples;
     uint64_t numberOfDigitalSamples;
+    int numberOfCounters;
     uint32_t dynamicRange;
     ROI roi;
     bool tengigaEnable;

slsReceiverSoftware/src/ClientInterface.cpp

@@ -174,7 +174,7 @@ int ClientInterface::functionTable(){
 	flist[F_SET_RECEIVER_UDP_PORT2]         =   &ClientInterface::set_udp_port2;
 	flist[F_SET_RECEIVER_NUM_INTERFACES]    =   &ClientInterface::set_num_interfaces;
 	flist[F_RECEIVER_SET_ADC_MASK_10G]		=	&ClientInterface::set_adc_mask_10g;
-
+    flist[F_RECEIVER_SET_NUM_COUNTERS]      =   &ClientInterface::set_num_counters;
 
 	for (int i = NUM_DET_FUNCTIONS + 1; i < NUM_REC_FUNCTIONS ; i++) {
 		FILE_LOG(logDEBUG1) << "function fnum: " << i << " (" <<
@@ -1319,4 +1319,12 @@ int ClientInterface::set_adc_mask_10g(Interface &socket) {
     }
     FILE_LOG(logDEBUG1) << "10Gb ADC enable mask retval: " << retval;
     return socket.sendResult(retval);
+}
+
+int ClientInterface::set_num_counters(Interface &socket) {
+    auto arg = socket.Receive<int>();
+    verifyIdle(socket);
+    FILE_LOG(logDEBUG1) << "Setting counters: " << arg;
+    impl()->setNumberofCounters(arg);
+    return socket.Send(OK);
 }

slsReceiverSoftware/src/Implementation.cpp

@@ -101,6 +101,7 @@ void Implementation::InitializeMembers() {
     subPeriod = 0;
     numberOfAnalogSamples = 0;
     numberOfDigitalSamples = 0;
+    numberOfCounters = 0;
     dynamicRange = 16;
     roi.xmin = -1;
     roi.xmax = -1;
@@ -1287,6 +1288,26 @@ void Implementation::setNumberofDigitalSamples(const uint32_t i) {
                       << (generalData->packetsPerFrame);
 }
 
+int Implementation::getNumberofCounters() const {
+    FILE_LOG(logDEBUG3) << __SHORT_AT__ << " called";
+    return numberOfCounters;
+}
+
+void Implementation::setNumberofCounters(const int i) {
+    if (numberOfCounters != i) {
+        numberOfCounters = i;
+
+        if (myDetectorType == MYTHEN3) {
+            generalData->SetDynamicRange(i, tengigaEnable);
+            // to update npixelsx, npixelsy in file writer
+            for (const auto &it : dataProcessor)
+                it->SetPixelDimension();
+            SetupFifoStructure();
+        }
+    }
+    FILE_LOG(logINFO) << "Number of Counters: " << numberOfCounters;
+}
+
 uint32_t Implementation::getDynamicRange() const {
     FILE_LOG(logDEBUG3) << __SHORT_AT__ << " called";
     return dynamicRange;
@@ -1297,9 +1318,11 @@ void Implementation::setDynamicRange(const uint32_t i) {
     if (dynamicRange != i) {
         dynamicRange = i;
 
-        if (myDetectorType == EIGER) {
+        if (myDetectorType == EIGER || myDetectorType == MYTHEN3) {
             generalData->SetDynamicRange(i, tengigaEnable);
-            generalData->SetGapPixelsEnable(gapPixelsEnable, dynamicRange, quadEnable);
+            if (myDetectorType == EIGER) {
+                generalData->SetGapPixelsEnable(gapPixelsEnable, dynamicRange, quadEnable);
+            }
             // to update npixelsx, npixelsy in file writer
             for (const auto &it : dataProcessor)
                 it->SetPixelDimension();