Skip to content

Some FE updates from MC-2 commissioning #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
giro94 merged 8 commits into from
Feb 12, 2026
Merged

Some FE updates from MC-2 commissioning #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7a38a5
Add blinking cpu led
Feb 11, 2026
80a593a
FE interface updates
Feb 11, 2026
bc7f6ba
cleanup
Feb 11, 2026
003292f
laser board is now 160 (was 199)
Feb 11, 2026
80482dd
Added script for reading slowcontrol
Feb 11, 2026
56cde20
gitignore
Feb 11, 2026
ee901d5
Merge branch 'develop' of github.com:Mu2e/otsdaq-mu2e-calorimeter int…
giro94 Feb 11, 2026
dede4fd
Merge branch 'develop' into pgirotti/FEupdates
giro94 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boardConfig/boardMap.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,4 @@
157 36353 27239
158 0 0
159 0 0
199 36097 8813
160 36097 8813
20 changes: 20 additions & 0 deletions boardConfig/mzbCalib/mzb160.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 0 additions & 20 deletions boardConfig/mzbCalib/mzb199.config
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions boardConfig/nominal/board160.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 0 additions & 20 deletions boardConfig/nominal/board199.config
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions boardConfig/slowControl/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
!.gitignore
*.log
19 changes: 19 additions & 0 deletions boardConfig/slowControl/slow_control_summary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 2 additions & 0 deletions otsdaq-mu2e-calorimeter/FEInterfaces/MZB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions otsdaq-mu2e-calorimeter/FEInterfaces/ROCCalorimeterInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


};
Expand Down Expand Up @@ -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__);
Expand All @@ -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);
Expand All @@ -142,6 +148,7 @@ class ROCCalorimeterInterface : public ROCPolarFireCoreInterface {

void ReadROCErrorCounter (__ARGS__);
void ReadMBRegisters (__ARGS__);
void GetMZBStatus (__ARGS__);



Expand Down
Loading
Loading