Moench rewrite (#597)

* copied jungfrau server to moench and adapted * fixed image size and num packets * read n rows allows 16 * commneted out configure_asic_timer at server startup. To be removed later the ASIC_CTRL_REG and storage cell options * moench:removing the decrement (which was in jf) in read n rows to register * removed lblsamples from gui
2026-01-19 02:04:30 +01:00 · 2022-12-15 09:16:51 +01:00
parent 7ab3b25f87
commit 39b1f5bbf2
58 changed files with 4309 additions and 5499 deletions
--- a/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h
+++ b/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h
@@ -4,7 +4,7 @@

 #include <inttypes.h>

-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 /**
 * Set Defines
 * @param creg control register
@@ -14,8 +14,9 @@
 * @param prmsk pll reset mask
 * @param amsk address mask
 * @param aofst address offset
- * @param wd2msk write parameter mask for pll for dbit clock (Jungfrau only)
- * @param clk2Index clkIndex of second pll (Jungfrau only)
+ * @param wd2msk write parameter mask for pll for dbit clock (Jungfrau/moench
+ * only)
+ * @param clk2Index clkIndex of second pll (Jungfrau/moench only)
 */
 void ALTERA_PLL_SetDefines(uint32_t creg, uint32_t preg, uint32_t rprmsk,
                           uint32_t wpmsk, uint32_t prmsk, uint32_t amsk,
@@ -50,8 +51,8 @@ void ALTERA_PLL_ResetPLLAndReconfiguration();
 * Set PLL Reconfig register
 * @param reg register
 * @param val value
- * @param useDefaultWRMask only jungfrau for dbit clk (clkindex1, use second WR
- * mask)
+ * @param useDefaultWRMask only jungfrau/moench for dbit clk (clkindex1, use
+ * second WR mask)
 */
 void ALTERA_PLL_SetPllReconfigReg(uint32_t reg, uint32_t val,
                                  int useSecondWRMask);
--- a/slsDetectorServers/slsDetectorServer/include/loadPattern.h
+++ b/slsDetectorServers/slsDetectorServer/include/loadPattern.h
@@ -6,7 +6,7 @@
 #include "clogger.h"

 void initializePatternAddresses();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#ifdef CHIPTESTBOARDD
 #ifdef VIRTUAL
 void initializePatternWord();
 #endif
--- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
+++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
@@ -6,8 +6,8 @@
 #include "AD9252.h"  // old board compatibility
 #include "clogger.h" // runState(enum TLogLevel)
 #endif
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
-    defined(MOENCHD)
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
+    defined(CHIPTESTBOARDD)
 #include "AD9257.h" // commonServerFunctions.h, blackfin.h, ansi.h
 #endif

@@ -20,8 +20,8 @@

 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 #include "nios.h"
-#elif defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||   \
-    defined(MOENCHD)
+#elif defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||          \
+    defined(CHIPTESTBOARDD)
 #include "blackfin.h"
 #endif

@@ -61,15 +61,16 @@ typedef struct udpStruct_s {
 int isInitCheckDone();
 int getInitResult(char **mess);
 void basictests();
-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
-    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
+    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int checkType();
 int testFpga();
 int testBus();
 #endif

 #if defined(GOTTHARDD) ||                                                      \
-    ((defined(EIGERD) || defined(JUNGFRAUD)) && defined(VIRTUAL))
+    ((defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)) &&            \
+     defined(VIRTUAL))
 void setTestImageMode(int ival);
 int getTestImageMode();
 #endif
@@ -82,14 +83,14 @@ u_int64_t getFirmwareAPIVersion();
 void getHardwareVersion(char *version);
 u_int16_t getHardwareVersionNumber();
 #endif
-#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD)
 u_int16_t getHardwareSerialNumber();
 #endif
-#if defined(JUNGFRAUD) || defined(GOTTHARD2D) || defined(MYTHEN3D) ||          \
-    defined(GOTTHARDD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
+    defined(MYTHEN3D) || defined(GOTTHARDD)
 int isHardwareVersion_1_0();
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int getChipVersion();
 void setChipVersion(int version);
 #endif
@@ -98,7 +99,7 @@ u_int32_t getDetectorNumber();
 #endif

 #if defined(GOTTHARD2D) || defined(EIGERD) || defined(MYTHEN3D) ||             \
-    defined(JUNGFRAUD)
+    defined(JUNGFRAUD) || defined(MOENCHD)
 int getModuleId(int *ret, char *mess);
 int updateModuleId();
 #ifndef EIGERD
@@ -125,7 +126,7 @@ void checkVirtual9MFlag();
 void allocateDetectorStructureMemory();
 #endif
 void setupDetector();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int updateDatabytesandAllocateRAM();
 void updateDataBytes();
 #endif
@@ -141,7 +142,8 @@ void setASICDefaults();
 #ifdef MYTHEN3D
 void setADIFDefaults();
 #endif
-#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD)
+#if defined(GOTTHARD2D) || defined(EIGERD) || defined(JUNGFRAUD) ||            \
+    defined(MOENCHD)
 int readConfigFile();
 #endif
 #if defined(GOTTHARDD) || defined(GOTTHARD2D) || defined(EIGERD) ||            \
@@ -157,14 +159,13 @@ void resetToHardwareSettings();
 int writeRegister(uint32_t offset, uint32_t data);
 int readRegister(uint32_t offset, uint32_t *retval);
 #elif GOTTHARDD
-uint32_t
-writeRegister16And32(uint32_t offset,
-                     uint32_t data); // FIXME its not there in ctb or moench?
+uint32_t writeRegister16And32(uint32_t offset,
+                              uint32_t data); // FIXME its not there in ctb
 uint32_t readRegister16And32(uint32_t offset);
 #endif

 // firmware functions (resets)
-#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
    defined(MYTHEN3D) || defined(GOTTHARD2D)
 void cleanFifos();
 void resetCore();
@@ -189,11 +190,11 @@ int getDynamicRange(int *retval);
 int setROI(ROI arg);
 ROI getROI();
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 void setADCInvertRegister(uint32_t val);
 uint32_t getADCInvertRegister();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int setADCEnableMask(uint32_t mask);
 uint32_t getADCEnableMask();
 void setADCEnableMask_10G(uint32_t mask);
@@ -221,11 +222,11 @@ int getReadoutMode();
 #endif

 // parameters - timer
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int selectStoragecellStart(int pos);
 int getMaxStoragecellStart();
 #endif
-#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MOENCHD) ||               \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
    defined(CHIPTESTBOARDD)
 int setNextFrameNumber(uint64_t value);
 int getNextFrameNumber(uint64_t *value);
@@ -265,13 +266,13 @@ int64_t getSubDeadTime();
 int64_t getMeasuredPeriod();
 int64_t getMeasuredSubPeriod();
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 void setNumAdditionalStorageCells(int val);
 int getNumAdditionalStorageCells();
 int setStorageCellDelay(int64_t val);
 int64_t getStorageCellDelay();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int setNumAnalogSamples(int val);
 int getNumAnalogSamples();
 #endif
@@ -286,8 +287,8 @@ uint32_t getCounterMask();
 void updatePacketizing();
 #endif

-#if defined(JUNGFRAUD) || defined(GOTTHARDD) || defined(CHIPTESTBOARDD) ||     \
-    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARDD) ||            \
+    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 int setDelayAfterTrigger(int64_t val);
 int64_t getDelayAfterTrigger();
 int64_t getNumFramesLeft();
@@ -301,7 +302,7 @@ int64_t getNumBurstsLeft();
 #ifdef GOTTHARDD
 int64_t getExpTimeLeft();
 #endif
-#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD) ||       \
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(CHIPTESTBOARDD) ||       \
    defined(MYTHEN3D) || defined(GOTTHARD2D)
 int64_t getFramesFromStart();
 int64_t getActualTime();
@@ -312,7 +313,7 @@ int64_t getMeasurementTime();
 #if defined(MYTHEN3D) || defined(EIGERD)
 void getModule(sls_detector_module *myMod);
 #endif
-#if (!defined(CHIPTESTBOARDD)) && (!defined(MOENCHD)) && (!defined(GOTTHARD2D))
+#if (!defined(CHIPTESTBOARDD)) && (!defined(GOTTHARD2D))
 int setModule(sls_detector_module myMod, char *mess);
 #endif

@@ -328,7 +329,7 @@ int getAllTrimbits();
 enum detectorSettings setSettings(enum detectorSettings sett);
 #endif
 enum detectorSettings getSettings();
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 enum gainMode getGainMode();
 void setGainMode(enum gainMode mode);
 #endif
@@ -357,7 +358,7 @@ void setDAC(enum DACINDEX ind, int val, int mV);
 #endif
 int getDAC(enum DACINDEX ind, int mV);
 int getMaxDacSteps();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int dacToVoltage(int dac);
 int checkVLimitCompliant(int mV);
 int checkVLimitDacCompliant(int dac);
@@ -380,14 +381,15 @@ void powerOff();

 #if defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getADC(enum ADCINDEX ind, int *value);
-#elif !defined(MOENCHD)
+#else
 int getADC(enum ADCINDEX ind);
 #endif

 int setHighVoltage(int val);

 // parameters - timing, extsig
-#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD)
+#if defined(EIGERD) || defined(GOTTHARD2D) || defined(JUNGFRAUD) ||            \
+    defined(MOENCHD)
 int setMaster(enum MASTERINDEX m);
 #endif
 #ifdef EIGERD
@@ -395,11 +397,11 @@ int setTop(enum TOPINDEX t);
 int isTop(int *retval);
 #endif
 #if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD) ||              \
-    defined(GOTTHARD2D) || defined(JUNGFRAUD)
+    defined(GOTTHARD2D) || defined(JUNGFRAUD) || defined(MOENCHD)
 int isMaster(int *retval);
 #endif

-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int getSynchronization();
 void setSynchronization(int enable);
 #endif
@@ -430,29 +432,30 @@ int getExtSignal(int signalIndex);
 #ifdef GOTTHARDD
 void calcChecksum(mac_conf *mac, int sourceip, int destip);
 #endif
-#if defined(JUNGFRAUD) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D)
 void setNumberofUDPInterfaces(int val);
 #endif
 int getNumberofUDPInterfaces();

-#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MYTHEN3D) ||              \
-    defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
+    defined(MYTHEN3D) || defined(GOTTHARD2D)
 int getNumberofDestinations(int *retval);
 int setNumberofDestinations(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(MYTHEN3D) ||             \
+    defined(GOTTHARD2D)
 int getFirstUDPDestination();
 void setFirstUDPDestination(int value);
 #endif
-#ifdef JUNGFRAUD
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 void selectPrimaryInterface(int val);
 int getPrimaryInterface();
 void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip,
                 uint64_t destmac, uint32_t destport, uint64_t sourcemac,
                 uint32_t sourceip, uint32_t sourceport);
 #endif
-#if defined(JUNGFRAUD) || defined(GOTTHARD2D) || defined(MYTHEN3D) ||          \
-    defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(GOTTHARD2D) ||           \
+    defined(MYTHEN3D) || defined(CHIPTESTBOARDD)
 void calcChecksum(udp_header *udp);
 #endif
 #ifdef GOTTHARDD
@@ -471,22 +474,15 @@ int getInterruptSubframe();
 int setReadNRows(int value);
 int getReadNRows();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD) || defined(EIGERD) ||          \
-    defined(MYTHEN3D)
+#if defined(CHIPTESTBOARDD) || defined(EIGERD) || defined(MYTHEN3D)
 int enableTenGigabitEthernet(int val);
 #endif

 // very detector specific

-// moench specific - powerchip
-#ifdef MOENCHD
-int powerChip(int on);
-int setAnalogOnlyReadout();
-#endif
-
-// chip test board or moench specific - configure frequency, phase, pll,
+// chip test board specific - configure frequency, phase, pll,
 // flashing firmware
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 int setPhase(enum CLKINDEX ind, int val, int degrees);
 int getPhase(enum CLKINDEX ind, int degrees);
 int getMaxPhase(enum CLKINDEX ind);
@@ -505,9 +501,9 @@ int setLEDEnable(int enable);
 void setDigitalIODelay(uint64_t pinMask, int delay);
 #endif

-// jungfrau specific - powerchip, autocompdisable, clockdiv, asictimer, clock,
-// pll, flashing firmware
-#ifdef JUNGFRAUD
+// jungfrau/moench specific - powerchip, autocompdisable, clockdiv, asictimer,
+// clock, pll, flashing firmware
+#if defined(JUNGFRAUD) || defined(MOENCHD)
 int setReadNRows(int value);
 int getReadNRows();
 void initReadoutConfiguration();
@@ -637,11 +633,12 @@ int setBadChannels(int numChannels, int *channelList);
 int *getBadChannels(int *numChannels);
 #endif

-#if defined(JUNGFRAUD) || defined(EIGERD)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD)
 int getTenGigaFlowControl();
 int setTenGigaFlowControl(int value);
 #endif
-#if defined(JUNGFRAUD) || defined(EIGERD) || defined(MYTHEN3D)
+#if defined(JUNGFRAUD) || defined(MOENCHD) || defined(EIGERD) ||               \
+    defined(MYTHEN3D)
 int getTransmissionDelayFrame();
 int setTransmissionDelayFrame(int value);
 #endif
@@ -661,14 +658,14 @@ int stopStateMachine();
 #ifdef MYTHEN3D
 int softwareTrigger();
 #endif
-#if defined(EIGERD) || defined(JUNGFRAUD)
+#if defined(EIGERD) || defined(JUNGFRAUD) || defined(MOENCHD)
 int softwareTrigger(int block);
 #endif
 #if defined(EIGERD) || defined(MYTHEN3D)
 int startReadOut();
 #endif
 enum runStatus getRunStatus();
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 void readFrames(int *ret, char *mess);
 #endif
 #ifdef EIGERD
@@ -676,7 +673,7 @@ void waitForAcquisitionEnd(int *ret, char *mess);
 #else
 void waitForAcquisitionEnd();
 #endif
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+#if defined(CHIPTESTBOARDD)
 void readandSendUDPFrames(int *ret, char *mess);
 void unsetFifoReadStrobes();
 void readSample(int ns);
@@ -685,8 +682,8 @@ int checkFifoForEndOfAcquisition();
 int readFrameFromFifo();
 #endif

-#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) ||     \
-    defined(MOENCHD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
+#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(MOENCHD) ||            \
+    defined(CHIPTESTBOARDD) || defined(MYTHEN3D) || defined(GOTTHARD2D)
 u_int32_t runBusy();
 #endif

@@ -697,7 +694,7 @@ u_int32_t runState(enum TLogLevel lev);
 // common
 int calculateDataBytes();
 int getTotalNumberOfChannels();
-#if defined(MOENCHD) || defined(CHIPTESTBOARDD)
+#if defined(CHIPTESTBOARDD)
 void getNumberOfChannels(int *nchanx, int *nchany);
 #endif
 int getNumberOfChips();