diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index 271315ca45fa716aca8f57130a3de1b4bc9e39fe..b01535d2cb6321c4439ad5c6b4669408efd95d30 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -279,7 +279,7 @@ void CbmMcbm2018TofPar::BuildChannelsUidMap()
LOG(error) << "Invalid Tof Type specifier for GBTx " << std::setw(2) << uGbtx << ": " << fiRpcType[uGbtx];
}
} // switch (fiRpcType[uGbtx])
- if (uCh - uCh0 != fiNrOfFeesPerGdpb * fiNrOfGet4PerFee * fiNrOfChannelsPerGet4 / 2) {
+ if ((int32_t)(uCh - uCh0) != fiNrOfFeesPerGdpb * fiNrOfGet4PerFee * fiNrOfChannelsPerGet4 / 2) {
LOG(fatal) << "Tof mapping error for Gbtx " << uGbtx << ", diff = " << uCh - uCh0;
}
} // for (UInt_t uGbtx = 0; uGbtx < uNrOfGbtx; ++uGbtx)
@@ -379,13 +379,15 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapT0_2022(UInt_t& uCh, UInt_t uGbtx)
for (UInt_t uGet4 = 0; uGet4 < kuNbGet4PerGbtx; ++uGet4) {
for (UInt_t uGet4Ch = 0; uGet4Ch < kuNbChannelsPerGet4; ++uGet4Ch) {
/// Mapping for the 2022 beamtime
- if (0 == uGet4 % 4 && 0 == uGet4Ch && -1 < fiModuleId[uGbtx]) {
- UInt_t uChannelT0 = uGet4 / 8; // + 4 * fiRpcSide[uGbtx];
+ if (-1 < fiModuleId[uGbtx] && uGet4 < 32 && 0 == uGet4 % 4 && 0 == uGet4Ch) {
+ /// 1 channel per physical GET4, 2 links per physical GET4, 4 physical GET4s per GBTx, 1 GBTx per comp.
+ /// 8 channels for one side, 8 for the other
+ UInt_t uChannelT0 = (uGet4 / 8 + 4 * (uGbtx / 2)) % 8;
/// Type hard-coded to allow different parameter values to separate 2022 T0 and pre-2022 T0
- fviRpcChUId[uCh] = CbmTofAddress::GetUniqueAddress(fiModuleId[uGbtx], 0, uChannelT0, 0, 5);
- LOG(info) << Form(" T0 channel: %u from GBTx %2u, "
+ fviRpcChUId[uCh] = CbmTofAddress::GetUniqueAddress(fiModuleId[uGbtx], 0, uChannelT0, fiRpcSide[uGbtx], 5);
+ LOG(info) << Form(" Bmon channel: %u side %u from GBTx %2u, "
"indx %d address %08x",
- uChannelT0, uGbtx, uCh, fviRpcChUId[uCh]);
+ uChannelT0, fiRpcSide[uGbtx], uGbtx, uCh, fviRpcChUId[uCh]);
} // Valid T0 channel
else {
fviRpcChUId[uCh] = 0;
@@ -541,6 +543,7 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapBuc(UInt_t& uCh, UInt_t uGbtx)
case 7: {
// clang-format off
+ /*
const Int_t iChMap[160]={
127, 126, 125, 124, 12, 13, 14, 15, 7, 6, 5, 4, 28, 29, 30, 31, 123, 122, 121, 120, 8, 9, 10, 11, 107, 106, 105, 104, 108, 109, 110, 111,
39, 38, 37, 36, 52, 53, 54, 55, 63, 62, 61, 60, 128, 129, 130, 131, 43, 42, 41, 40, 148, 149, 150, 151, 59, 58, 57, 56, 132, 133, 134, 135,
@@ -548,6 +551,14 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapBuc(UInt_t& uCh, UInt_t uGbtx)
159, 158, 157, 156, 144, 145, 146, 147, 47, 46, 45, 44, 76, 77, 78, 79, 51, 50, 49, 48, 20, 21, 22, 23, 35, 34, 33, 32, 116, 117, 118, 119,
75, 74, 73, 72, 92, 93, 94, 95, 19, 18, 17, 16, 80, 81, 82, 83, 115, 114, 113, 112, 24, 25, 26, 27, 91, 90, 89, 88, 0, 1, 2, 3
};
+ */
+ const Int_t iChMap[160]={
+ 124, 125, 126, 127, 12, 13, 14, 15, 4, 5, 6, 7, 28, 29, 30, 31, 120, 121, 122, 123, 8, 9, 10, 11, 104, 105, 106, 107, 108, 109, 110, 111,
+ 36, 37, 38, 39, 52, 53, 54, 55, 60, 61, 62, 63, 128, 129, 130, 131, 40, 41, 42, 43, 148, 149, 150, 151, 56, 57, 58, 59, 132, 133, 134, 135,
+ 136, 137, 138, 139, 140, 141, 142, 143, 96, 97, 98, 99, 64, 65, 66, 67, 100, 101, 102, 103, 84, 85, 86, 87, 152, 153, 154, 155, 68, 69, 70, 71,
+ 156, 157, 158, 159, 144, 145, 146, 147, 44, 45, 46, 47, 76, 77, 78, 79, 48, 49, 50, 51, 20, 21, 22, 23, 32, 33, 34, 35, 116, 117, 118, 119,
+ 75, 74, 73, 72, 92, 93, 94, 95, 16, 17, 18, 19, 80, 81, 82, 83, 115, 114, 113, 112, 24, 25, 26, 27, 88, 89, 90, 91, 0, 1, 2, 3
+ };
// clang-format on
Int_t iInd = iFeet * 32 + iStr;
Int_t i = 0;
@@ -555,7 +566,7 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapBuc(UInt_t& uCh, UInt_t uGbtx)
if (iInd == iChMap[i]) break;
iStrMap = i % 32;
Int_t iFeetInd = (i - iStrMap) / 32;
- switch (iFeet) {
+ switch (iFeetInd) {
case 0:
iRpcMap = 0;
iSideMap = 1;
@@ -565,11 +576,11 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapBuc(UInt_t& uCh, UInt_t uGbtx)
iSideMap = 1;
break;
case 2:
- iRpcMap = 0;
+ iRpcMap = 1;
iSideMap = 0;
break;
case 3:
- iRpcMap = 1;
+ iRpcMap = 0;
iSideMap = 0;
break;
case 4: iSideMap = -1; break;
diff --git a/macro/beamtime/mcbm2022/mBmonCriPar.par b/macro/beamtime/mcbm2022/mBmonCriPar.par
index 330ca7e7a6a5a7a6107e304a87c91e03ea042963..ba7da7cc52b2e3cf48a3fcf680bf481ad8a51b7c 100644
--- a/macro/beamtime/mcbm2022/mBmonCriPar.par
+++ b/macro/beamtime/mcbm2022/mBmonCriPar.par
@@ -3,7 +3,7 @@
//----------------------------------------------------------------------------
NrOfGdpbs: Int_t 4
GdpbIdArray: Int_t \
-0xabf0 0xabf1 0xabf2 0xabf3
+0xabf3 0xabf2 0xabf0 0xabf1
NrOfFeesPerGdpb: Int_t 10
NrOfGet4PerFee: Int_t 8
NrOfChannelsPerGet4: Int_t 4
@@ -14,9 +14,9 @@ NrOfRpc: Int_t \
RpcType: Int_t \
99 -1 99 -1 99 -1 99 -1
RpcSide: Int_t \
- 0 0 1 0 0 0 1 0
+ 0 0 0 0 1 0 1 0
ModuleId: Int_t \
- 1 -1 1 -1 0 -1 0 -1
+ 0 -1 0 -1 0 -1 0 -1
NbMsTot: Int_t 100
NbMsOverlap: Int_t 1
SizeMsInNs: Double_t 102400.0
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
index e962d40299755f0f6af32962164bf495e792c8f1..1b95f9c895fcfa6e623f065ad8fdc3237e2e6830 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
+++ b/reco/detectors/tof/unpack/CbmTofUnpackAlgo.cxx
@@ -116,7 +116,10 @@ Bool_t CbmTofUnpackAlgo::initParSet(CbmMcbm2018TofPar* parset)
TString sPrintout = "";
for (UInt_t uCh = 0; uCh < uNrOfChannels; ++uCh) {
if (0 == uCh % 8) sPrintout += "\n";
- if (0 == uCh % fuNrOfChannelsPerGdpb) sPrintout += Form("\n Gdpb %u\n", uCh / fuNrOfChannelsPerGdpb);
+ if (0 == uCh % fuNrOfChannelsPerGdpb) {
+ uint32_t uGdpbIdx = uCh / fuNrOfChannelsPerGdpb;
+ sPrintout += Form("\n Gdpb %u (0x%x)\n", uGdpbIdx, parset->GetGdpbId(uGdpbIdx));
+ }
if (0 == fviRpcChUId[uCh]) {
/// Tricking clang to avoid one liner
sPrintout += " ----------";
@@ -125,7 +128,7 @@ Bool_t CbmTofUnpackAlgo::initParSet(CbmMcbm2018TofPar* parset)
sPrintout += Form(" 0x%08x", fviRpcChUId[uCh]);
}
} // for( UInt_t i = 0; i < uNrOfChannels; ++i)
- LOG(info) << sPrintout;
+ LOG(debug) << sPrintout;
LOG(info) << fName << "::initParSetTofMcbm2018 - Successfully initialized TOF settings";
diff --git a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
index 69372384ff04fca7bab402b9a2bc14e0477b0a55..7c29a41a31b7ec44c9647862c56e189a64744b30 100644
--- a/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
+++ b/reco/detectors/tof/unpack/CbmTofUnpackMonitor.h
@@ -152,9 +152,9 @@ private:
UInt_t fuOffSpillCountLimitNonPulser = 80;
Double_t fdSpillCheckInterval = 1.0;
/// Map from electronics channel to BMon strip
- /// 2022 mapping: Y[0-3] on c0, Y[4-7] on c1, X[0-3] on c2, X[4-7] on c3
+ /// 2022 mapping: Y[0-3] on c0, Y[4-7] on c1, X[4-7] on c2, X[0-3] on c3, re-ordered in par file and par class
/// Y not cabled for diamond but pulser there
- UInt_t fuBmonChanMap[kuNbChanBmon] = {8, 9, 10, 11, 12, 13, 14, 15, 4, 5, 6, 7, 0, 1, 2, 3};
+ UInt_t fuBmonChanMap[kuNbChanBmon] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
/// MS size histograms
TH1* fvhMsSize[kuMaxNbFlibLinks];