From 16065cede07a65951bb8684423bbd3949f6867d1 Mon Sep 17 00:00:00 2001 From: Alexandru Bercuci <abercuci@niham.nipne.ro> Date: Thu, 25 May 2023 12:02:55 +0300 Subject: [PATCH] remove external mapping correction of FASP to pad wrt default distribution --- MQ/mcbm/CbmDeviceUnpack.cxx | 13 ------------- macro/run/run_unpack_tsa.C | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/MQ/mcbm/CbmDeviceUnpack.cxx b/MQ/mcbm/CbmDeviceUnpack.cxx index 242b621f75..bfdf0cd7db 100644 --- a/MQ/mcbm/CbmDeviceUnpack.cxx +++ b/MQ/mcbm/CbmDeviceUnpack.cxx @@ -334,23 +334,10 @@ Bool_t CbmDeviceUnpack::InitContainers() crob_map[i] = crob_map21[i]; } else if (fuRunId >= 2335) { - const size_t nfasp0 = 72; - const size_t nfasps = 36; - uint8_t map22[] = { - 84, 85, 86, 87, 88, 89, // FEB14/0xffc1 - 90, 91, 92, 93, 94, 95, // FEB17/0xffc1 - 96, 97, 98, 99, 100, 101, // FEB18/0xffc1 - 102, 103, 104, 105, 106, 107, // FEB16/0xffc1 - 72, 73, 74, 75, 76, 77, // FEB9/0xffc1 - 78, 79, 80, 81, 82, 83 // FEB8/0xffc1 - }; - for (uint32_t i(0); i < nfasps; i++) - map[i + nfasp0] = map22[i]; uint16_t crob_map22[] = {0xffc2, 0xffc5, 0xffc1, 0, 0}; for (uint32_t i(0); i < NCROBMOD; i++) crob_map[i] = crob_map22[i]; } - trdfasp2dconfig->SetFaspMapping(5, map); trdfasp2dconfig->SetCrobMapping(5, crob_map); std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data()); trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d); diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C index 879ec84c6a..65f975eab1 100644 --- a/macro/run/run_unpack_tsa.C +++ b/macro/run/run_unpack_tsa.C @@ -331,23 +331,10 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid crob_map[i] = crob_map21[i]; } else if (runid >= 2335) { - const size_t nfasp0 = 72; - const size_t nfasps = 36; - uint8_t map22[] = { - 84, 85, 86, 87, 88, 89, // FEB14/0xffc1 - 90, 91, 92, 93, 94, 95, // FEB17/0xffc1 - 96, 97, 98, 99, 100, 101, // FEB18/0xffc1 - 102, 103, 104, 105, 106, 107, // FEB16/0xffc1 - 72, 73, 74, 75, 76, 77, // FEB9/0xffc1 - 78, 79, 80, 81, 82, 83 // FEB8/0xffc1 - }; - for (uint32_t i(0); i < nfasps; i++) - map[i + nfasp0] = map22[i]; uint16_t crob_map22[] = {0xffc2, 0xffc5, 0xffc1, 0, 0}; for (uint32_t i(0); i < NCROBMOD; i++) crob_map[i] = crob_map22[i]; } - trdfasp2dconfig->SetFaspMapping(5, map); trdfasp2dconfig->SetCrobMapping(5, crob_map); std::string parfilesbasepathTrdfasp2d = Form("%s/parameters/trd", srcDir.Data()); trdfasp2dconfig->SetParFilesBasePath(parfilesbasepathTrdfasp2d); -- GitLab