Skip to content
Snippets Groups Projects
Commit 8ab51f57 authored by Pierre-Alain Loizeau's avatar Pierre-Alain Loizeau
Browse files

Update mTOF unpack par class + use 2022 par file to support new modules for runs from 2060 on

parent e13ab847
No related branches found
No related tags found
1 merge request!809Changes to mTOF and mBMON from march 2022 runs
......@@ -216,6 +216,7 @@ void CbmMcbm2018TofPar::BuildChannelsUidMap()
UInt_t uCh = 0;
for (UInt_t uGbtx = 0; uGbtx < uNrOfGbtx; ++uGbtx) {
switch (fiRpcType[uGbtx]) {
case 2: // intended fall-through
case 0: {
// CBM modules
BuildChannelsUidMapCbm(uCh, uGbtx);
......@@ -419,6 +420,21 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapStar2(UInt_t& uCh, UInt_t uGbtx)
default:;
}
break;
case 3: // direct beam 20210524
switch (iFeet) {
case 0:
iRpcMap = 0;
iSideMap = 0;
iStrMap = iStr;
break;
case 1:
iRpcMap = 0;
iSideMap = 1;
iStrMap = 31 - iStr;
break;
default: iSideMap = -1;
}
break;
}
if (iSideMap > -1)
fviRpcChUId[uCh] =
......
####################################################################################################
[CbmMcbm2018TofPar]
//----------------------------------------------------------------------------
NrOfGdpbs: Int_t 7
NrOfGdpbs: Int_t 8
GdpbIdArray: Int_t \
0xabc0 0xabc1 0xabc2 0xabc3 0xabc4 0xabc5 0xabc6
0xabc0 0xabc1 0xabc2 0xabc3 0xabc4 0xabc5 0xabc6 0xabc7
NrOfFeesPerGdpb: Int_t 10
NrOfGet4PerFee: Int_t 8
NrOfChannelsPerGet4: Int_t 4
NrOfGbtx: Int_t 13
NrOfModule: Int_t 7
NrOfGbtx: Int_t 16
NrOfModule: Int_t 20
NrOfRpc: Int_t \
5 5 5 5 5 5 5 5 5 5 5 5 2
5 5 5 5 5 5 5 5 5 5 5 5 2 2 2 2
RpcType: Int_t \
0 0 0 0 2 2 0 0 0 0 0 0 9
0 0 0 0 2 2 0 0 0 0 0 0 9 9 6 9
RpcSide: Int_t \
1 0 1 0 1 0 1 0 0 1 0 1 0
0 1 0 1 0 1 0 1 0 1 0 1 2 2 2 0
ModuleId: Int_t \
0 0 1 1 0 0 2 2 3 3 4 4 0
0 0 1 1 0 0 2 2 3 3 4 4 0 -1 0 1
NbMsTot: Int_t 100
NbMsOverlap: Int_t 1
SizeMsInNs: Double_t 102400.0
......
all_*.par
data/*.root
......@@ -236,6 +236,10 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
tofconfig->SetDoWriteOutput();
// tofconfig->SetDoWriteOptOutA("CbmTofErrors");
std::string parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
if (2060 <= runid ) {
/// Additional modules added just before the 10/03/2022 Carbon run
parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2022/", srcDir.Data());
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
tofconfig->SetSystemTimeOffset(-1220); // [ns] value to be updated
if (runid <= 1659) {
......
......@@ -248,6 +248,10 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
tofconfig->SetDoWriteOutput();
// tofconfig->SetDoWriteOptOutA("CbmTofErrors");
std::string parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2021/", srcDir.Data());
if (2060 <= runid ) {
/// Additional modules added just before the 10/03/2022 Carbon run
parfilesbasepathTof = Form("%s/macro/beamtime/mcbm2022/", srcDir.Data());
}
tofconfig->SetParFilesBasePath(parfilesbasepathTof);
tofconfig->SetSystemTimeOffset(-1220); // [ns] value to be updated
if (runid <= 1659) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment