Rebasing MR1179

Used to rebase the changes introduced through !1179 (closed)

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);