diff --git a/external/InstallParameter.cmake b/external/InstallParameter.cmake index 093fe60b04cd983c936ea3a5de1fb5a9557d59e4..97b566fb39a6220ff4db78228043b008b9f6b0f6 100644 --- a/external/InstallParameter.cmake +++ b/external/InstallParameter.cmake @@ -1,4 +1,4 @@ -set(PARAMETER_VERSION e4125bd3c05e40a1dc674567b43da85cc88d5639) +set(PARAMETER_VERSION 849f5cf315a9c8ac40dc9e93fa90015b1535f6e4) set(PARAMETER_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_parameter.git") diff --git a/macro/run/run_unpack_online.C b/macro/run/run_unpack_online.C index 9e67428a176778521c9940195ea676db41165f95..6d067c9c656c9ea7f33b52067e794e69c2b81981 100644 --- a/macro/run/run_unpack_online.C +++ b/macro/run/run_unpack_online.C @@ -210,6 +210,13 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55 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 //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()); trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d); trdfasp2dconfig->SetSystemTimeOffset(-1800); // [ns] value to be updated diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C index 4e48bc995c28f068eb0409d1cfd6116bdeaa4d50..968398813474961eaede7293702ef601c5c7b492 100644 --- a/macro/run/run_unpack_tsa.C +++ b/macro/run/run_unpack_tsa.C @@ -222,6 +222,13 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid 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 // 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()); trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d); trdfasp2dconfig->SetSystemTimeOffset(-1800); // [ns] value to be updated diff --git a/reco/detectors/trd/unpack/CbmTrdUnpackConfigFasp2D.cxx b/reco/detectors/trd/unpack/CbmTrdUnpackConfigFasp2D.cxx index 282b33053876e2f27694d3617935fdf6ed0f31c2..51f00f1f197b25badb681b031b7512708e9147b5 100644 --- a/reco/detectors/trd/unpack/CbmTrdUnpackConfigFasp2D.cxx +++ b/reco/detectors/trd/unpack/CbmTrdUnpackConfigFasp2D.cxx @@ -35,7 +35,7 @@ void CbmTrdUnpackConfigFasp2D::InitAlgo() { if (fDoLog) LOG(info) << fName << "::InitAlgo - SetFaspMapping"; fAlgo->SetAsicMapping(fFaspMap); - if (fDoLog) fAlgo->PrintAsicMapping(); + /*if (fDoLog) */fAlgo->PrintAsicMapping(); // Now we have all information required to initialise the algorithm fAlgo->Init();