Merge pull request #58 from Mu2e/pgirotti/FEupdates

Some FE updates from MC-2 commissioning

Build tested locally

Author: giro94

boardConfig/boardMap.config

@@ -158,4 +158,4 @@
 157    36353    27239
 158    0    0
 159    0    0
-199    36097    8813
+160    36097    8813

boardConfig/mzbCalib/mzb160.config

@@ -0,0 +1,20 @@
+ 0    0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 1    0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 2    0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 3    0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 4    20.273   -15.862 0.0620260  0.606477    0.6276   2.09773  -0.06098      94.6
+ 5    20.273   -15.862 0.0619830  0.723143    0.6276   2.09773  -0.06098      94.6
+ 6     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 7     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 8     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+ 9     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+10     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+11     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+12     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+13     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+14     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+15     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+16    20.273   -15.862 0.0622780  0.169038    0.6276   2.09773  -0.06098      94.6
+17    20.273   -15.862 0.0620570  0.647151    0.6276   2.09773  -0.06098      94.6
+18     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0
+19     0.000     0.000 0.0000000  0.000000    0.0000   0.00000   0.00000       0.0

boardConfig/mzbCalib/mzb199.config

@@ -0,0 +1,20 @@
+ 0   0   EMPTY
+ 1   0   EMPTY
+ 2   0   EMPTY
+ 3   0   EMPTY
+ 4   160.0   PIN-DIODE
+ 5   160.0   PIN-DIODE
+ 6   0   EMPTY
+ 7   0   EMPTY
+ 8   0   EMPTY
+ 9   0   EMPTY
+10   0   EMPTY
+11   0   EMPTY
+12   0   EMPTY
+13   0   EMPTY
+14   0   EMPTY
+15   0   EMPTY
+16   160.0   PIN-DIODE
+17   160.0   PIN-DIODE
+18   0   EMPTY
+19   0   EMPTY

boardConfig/nominal/board160.config

@@ -0,0 +1,2 @@
+!.gitignore
+*.log

boardConfig/nominal/board199.config

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Cartella contenente i file
+DIR="./"  # puoi cambiarlo in un path assoluto
+
+# Nome del file di output
+SUMMARY_FILE="summary.log"
+
+# Cancella o crea file riepilogo
+> "$SUMMARY_FILE"
+
+# Trova tutti i file slowControl*.log e li ordina numericamente
+for f in $(ls "${DIR}"/slowControl*.log 2>/dev/null | sort -V); do
+    # Estrai l'ultima riga
+    last_line=$(tail -n 1 "$f")
+    echo "$last_line" >> "$SUMMARY_FILE"
+done
+
+echo "Creato riepilogo: $SUMMARY_FILE"

boardConfig/slowControl/.gitignore

@@ -113,6 +113,7 @@ typedef enum MZB_OSCMDCODE_t {
 	DIRACWDG,          // Set and show the DIRAC Watchdog status
 	DIRACRST,          // Pulse the DIRAC RESET REQUEST line (0.1s)
 	WATCHDOG,          // Show status for the all implemented watchdog
+	CPULED,            // Blink LEDs
 	RESERVED           //
 } MZB_OSCMDCODE_t;
 
@@ -192,6 +193,7 @@ MZB_OSCMDCODE_MAP_t code_map[] = {{SYNTAX_ERROR, "SYNTAX_ERROR"},
                                   {DIRACWDG, "DIRACWDG"},
                                   {DIRACRST, "DIRACRST"},
                                   {WATCHDOG, "WATCHDOG"},
+                                  {CPULED, "CPULED"},
                                   {RESERVED, "RESERVED"}};
 
 #ifdef GNU_COMP

boardConfig/slowControl/slow_control_summary.sh

@@ -78,8 +78,12 @@ class ROCCalorimeterInterface : public ROCPolarFireCoreInterface {
 
         ROC_ADDRESS_BOARD_U_ID_LSB           = 145,
         ROC_ADDRESS_BOARD_U_ID_CSB           = 146,
-        ROC_ADDRESS_BOARD_U_ID_MSB           = 147
+        ROC_ADDRESS_BOARD_U_ID_MSB           = 147,
 
+        ROC_ADDRESS_SIMWF_ENABLE_A           = 150,
+        ROC_ADDRESS_SIMWF_ENABLE_B           = 151,
+        ROC_ADDRESS_SIMWF_MULTI_A            = 152,
+        ROC_ADDRESS_SIMWF_MULTI_B            = 153
 
 
       };
@@ -115,7 +119,7 @@ class ROCCalorimeterInterface : public ROCPolarFireCoreInterface {
     void SetupForPatternFixedLengthDataTaking		(__ARGS__);
     void SetupForPatternFixedLengthDataTaking       (unsigned int numberOfWords);
     void SetupForADCsDataTaking		(__ARGS__);
-    void SetupForADCsDataTaking		(bool setThr, unsigned int threshold);
+    void SetupForADCsDataTaking		(bool setThr, bool isNfw, unsigned int threshold);
 
     void SendMzCommand(__ARGS__);
     void EvaluateBlockWriteErrorRate(__ARGS__);
@@ -128,6 +132,8 @@ class ROCCalorimeterInterface : public ROCPolarFireCoreInterface {
     void SetupForNoiseTaking(__ARGS__);
     void SetupForNoiseTaking(unsigned int numberOfsamples);
     void RMZB_writeAllSiPMbias(float *hv);
+    void EnableDisableLEDs(__ARGS__);
+
 
     void ConfigureLink(__ARGS__);
     void ConfigureLink(std::string conf, std::string confFile, bool hvonoff, bool doCalibration, bool setThresholds, int offset);
@@ -142,6 +148,7 @@ class ROCCalorimeterInterface : public ROCPolarFireCoreInterface {
 
     void ReadROCErrorCounter		(__ARGS__);
     void ReadMBRegisters		(__ARGS__);
+    void GetMZBStatus		(__ARGS__);