Skip to content
Snippets Groups Projects
Commit c66db4f9 authored by Alexandru Bercuci's avatar Alexandru Bercuci
Browse files

add FASP mapping on GEO for mCBM 21, explicit printing of the mapping,

and revert to old par hash to allow project build
parent 9200ad6e
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !728. Comments created here will be created in the context of that merge request.
set(PARAMETER_VERSION e4125bd3c05e40a1dc674567b43da85cc88d5639) set(PARAMETER_VERSION 849f5cf315a9c8ac40dc9e93fa90015b1535f6e4)
set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git") set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git")
......
...@@ -210,6 +210,13 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55 ...@@ -210,6 +210,13 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
trdfasp2dconfig->SetDoWriteOutput(); trdfasp2dconfig->SetDoWriteOutput();
// Activate the line below to write Trd1D digis to a separate "TrdFaspDigi" branch. Can be used to separate between Fasp and Spadic digis // Activate the line below to write Trd1D digis to a separate "TrdFaspDigi" branch. Can be used to separate between Fasp and Spadic digis
//trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi"); //trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi");
if (runid <= 1588) {
uint8_t map[NFASPMOD],
map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
for (int i(0); i< NFASPMOD; i++) map[i] = (i<12 ? map21[i] : i);
trdfasp2dconfig->SetFaspMapping(5, map);
}
std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data()); std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data());
trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d); trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d);
trdfasp2dconfig->SetSystemTimeOffset(-1800); // [ns] value to be updated trdfasp2dconfig->SetSystemTimeOffset(-1800); // [ns] value to be updated
......
...@@ -222,6 +222,13 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid ...@@ -222,6 +222,13 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
trdfasp2dconfig->SetDoWriteOutput(); trdfasp2dconfig->SetDoWriteOutput();
// Activate the line below to write Trd1D digis to a separate "TrdFaspDigi" branch. Can be used to separate between Fasp and Spadic digis // Activate the line below to write Trd1D digis to a separate "TrdFaspDigi" branch. Can be used to separate between Fasp and Spadic digis
// trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi"); // trdfasp2dconfig->SetOutputBranchName("TrdFaspDigi");
if (runid <= 1588) {
uint8_t map[NFASPMOD],
map21[] = {9, 2, 3, 11, 10, 7, 8, 0, 1, 4, 6, 5};
for (int i(0); i< NFASPMOD; i++) map[i] = (i<12 ? map21[i] : i);
trdfasp2dconfig->SetFaspMapping(5, map);
}
std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data()); std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data());
trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d); trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d);
trdfasp2dconfig->SetSystemTimeOffset(-1800); // [ns] value to be updated trdfasp2dconfig->SetSystemTimeOffset(-1800); // [ns] value to be updated
......
...@@ -35,7 +35,7 @@ void CbmTrdUnpackConfigFasp2D::InitAlgo() ...@@ -35,7 +35,7 @@ void CbmTrdUnpackConfigFasp2D::InitAlgo()
{ {
if (fDoLog) LOG(info) << fName << "::InitAlgo - SetFaspMapping"; if (fDoLog) LOG(info) << fName << "::InitAlgo - SetFaspMapping";
fAlgo->SetAsicMapping(fFaspMap); fAlgo->SetAsicMapping(fFaspMap);
if (fDoLog) fAlgo->PrintAsicMapping(); /*if (fDoLog) */fAlgo->PrintAsicMapping();
// Now we have all information required to initialise the algorithm // Now we have all information required to initialise the algorithm
fAlgo->Init(); fAlgo->Init();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment