From ee50d9f345c298912a3a399d6c1dcc81a54277cf Mon Sep 17 00:00:00 2001
From: Pascal Raisig <praisig@ikf.uni-frankfurt.de>
Date: Wed, 21 Jul 2021 10:40:43 +0200
Subject: [PATCH] Update parameter file for mSts 2021
Fix some warnings for Psd Rich and Tof algorithms
---
macro/beamtime/mcbm2021/mStsPar.par | 65 ++++++++++++++-----
.../detectors/psd/unpack/CbmPsdUnpackAlgo.cxx | 1 +
.../detectors/rich/unpack/CbmRichUnpackAlgo.h | 2 +-
.../detectors/tof/unpack/CbmTofUnpackAlgo.cxx | 2 +
reco/detectors/tof/unpack/CbmTofUnpackAlgo.h | 2 +-
5 files changed, 55 insertions(+), 17 deletions(-)
diff --git a/macro/beamtime/mcbm2021/mStsPar.par b/macro/beamtime/mcbm2021/mStsPar.par
index 4e9941a75f..db18fc93d8 100644
--- a/macro/beamtime/mcbm2021/mStsPar.par
+++ b/macro/beamtime/mcbm2021/mStsPar.par
@@ -4,45 +4,80 @@
##############################################################################
[CbmMcbm2018StsPar]
//----------------------------------------------------------------------------
-// Total number of STS modules in the setup
-NbModules: Int_t 3
+// Total number of STS modules in the setup (11 sensors + 2 pulsers)
+NbModules: Int_t 13
// Type of each module: 0 for connectors on the right, 1 for connectors on the left
ModuleType: Int_t \
- 0 0 0
+ 0 0 \
+ 1 1 1 \
+ 0 0 0 \
+ 1 1 1 1 1
// STS address for the first strip of each module
-// 1 Line per ladder, from above beam to under beam
+// 1 Line per ladder, from above beam to under beam FIXME
ModAddress: Int_t \
- 0x10018002 0x10008002 0x99999999 // addresse matching the current mSTS geometry (PAL, 15/05/2020)
+ 0x10000002 0x10010002 \
+ 0x10000012 0x10010012 0x99999999 \
+ 0x10000022 0x10010022 0x99999998 \
+ 0x10000032 0x10010032 0x10020032 0x10000432 0x10010432
// Offset of module center in X, in mm (Should be done by geometry for the unpacker!)
ModCenterPosX: Double_t \
- 0.0 0.0 0.0
+ 0.0 0.0 \
+ 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 0.0 0.0
// Offset of module center in Y, in mm (Should be done by geometry for the unpacker!)
ModCenterPosY: Double_t \
- 0.0 0.0 0.0
-// Total number of STS DPBs in system
-NrOfDpbs: Int_t 1
-// Array to hold the unique IDs (equipment ID) for all STS DPBs, Array size has to match NrOfDpbs
+ 0.0 0.0 \
+ 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 0.0 0.0
+// Total number of STS DPBs in system FIXME
+NrOfDpbs: Int_t 5
+// Array to hold the unique IDs (equipment ID) for all STS DPBs, Array size has to match NrOfDpbs FIXME
DbpIdArray: Int_t \
- 0x5c0b
+ 0x1003 0x1002 0x1006 0x1005 0x1004
// Array to hold the active flag for all CROBs, [ NbDpb * kuNbCrobPerDpb ] = [ NbDpb * 1 ]
CrobActiveFlag: Int_t \
- 1
+ 1 1 1 1 1
// Index of the STS module for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ] = = [ NbDpb * 1 * 5 ], -1 if inactive
FebModuleIdx: Int_t \
- 2 0 0 1 1
+ -1 0 0 1 1 \
+ 4 2 2 3 3 \
+ 7 5 5 6 6 \
+ 10 9 9 8 8 \
+ 12 12 11 11 10
// STS module side for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ], 0 = P, 1 = N, -1 if inactive
FebModuleSide: Int_t \
- 0 1 0 1 0
+ -1 1 0 1 0 \
+ 1 1 0 1 0 \
+ 1 1 0 1 0 \
+ 0 1 0 1 0 \
+ 1 0 1 0 1
// ADC Gain in e-/ADC bin for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ]
FebAdcGain: Double_t \
+ 1.0 1.0 1.0 1.0 1.0 \
+ 1.0 1.0 1.0 1.0 1.0 \
+ 1.0 1.0 1.0 1.0 1.0 \
+ 1.0 1.0 1.0 1.0 1.0 \
1.0 1.0 1.0 1.0 1.0
// Base at Cal. Thr. in e- for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ]
FebAdcBase: Double_t \
+ 1.0 1.0 1.0 1.0 1.0 \
+ 1.0 1.0 1.0 1.0 1.0 \
+ 1.0 1.0 1.0 1.0 1.0 \
+ 1.0 1.0 1.0 1.0 1.0 \
1.0 1.0 1.0 1.0 1.0
// Thr. step in e-/Thr. Unit for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ]
FebAdcThrGain: Double_t \
+ 0.0 0.0 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 0.0 0.0 \
+ 0.0 0.0 0.0 0.0 0.0 \
0.0 0.0 0.0 0.0 0.0
-// Thr. offset in Units vs Cal. Thr. for each FEB, [ NbDpb * kuNbCrobPerDpb * kuNbFebsPerCrob ]
FebAdcThrOffs: Int_t \
+ 0 0 0 0 0 \
+ 0 0 0 0 0 \
+ 0 0 0 0 0 \
+ 0 0 0 0 0 \
0 0 0 0 0
#######################
diff --git a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
index 9ea813cbea..33e42e95f8 100644
--- a/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
+++ b/reco/detectors/psd/unpack/CbmPsdUnpackAlgo.cxx
@@ -11,6 +11,7 @@
#include <Rtypes.h>
#include <RtypesCore.h>
+#include <cstddef>
#include <cstdint>
#include <numeric>
diff --git a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
index 352adaf7de..014e8882b2 100644
--- a/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
+++ b/reco/detectors/rich/unpack/CbmRichUnpackAlgo.h
@@ -295,7 +295,7 @@ protected:
* @return true
* @return false
*/
- bool setDerivedTsParameters(size_t itimeslice) { return true; }
+ bool setDerivedTsParameters(size_t /*itimeslice*/) { return true; }
/**
* @brief Unpack a given microslice. To be implemented in the derived unpacker algos.
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
index a1285fa8f8..26f9726a85 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
@@ -14,6 +14,8 @@
#include <Rtypes.h>
#include <RtypesCore.h>
+#include <cstddef>
+
CbmTofUnpackAlgo::CbmTofUnpackAlgo() : CbmRecoUnpackAlgo("CbmTofUnpackAlgo") {}
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h
index d2543049bf..c108c0e15f 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.h
@@ -108,7 +108,7 @@ protected:
* @return true
* @return false
*/
- bool setDerivedTsParameters(size_t itimeslice) { return true; }
+ bool setDerivedTsParameters(size_t /*itimeslice*/) { return true; }
/**
* @brief Unpack a given microslice. To be implemented in the derived unpacker algos.
--
GitLab