diff --git a/macro/beamtime/mcbm2020/MonitorTrd.C b/macro/beamtime/mcbm2020/MonitorTrd.C
index c6ee21ff9cd46bfa0ab10fe3f34bb55e5613e5cb..a1d5545f95f001669192169e1dd5736c2a781c8c 100644
--- a/macro/beamtime/mcbm2020/MonitorTrd.C
+++ b/macro/beamtime/mcbm2020/MonitorTrd.C
@@ -3,7 +3,7 @@
  * Created Date: Wednesday March 25th 2020
  * Author: Pascal Raisig -- praisig@ikf.uni-frankfurt.de
  * -----
- * Last Modified: Thursday September 17th 2020 17:20:43
+ * Last Modified: Friday September 18th 2020 10:26:30
  * Modified By: Pascal Raisig
  * -----
  * Purpose: macro to test and run mCbm2020 trd unpacking
@@ -86,7 +86,14 @@ void MonitorTrd(TString inFile           = "",
   // ---- Trd ----
   TList* parFileList = new TList();
   TString geoTagTrd  = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -128,7 +135,7 @@ void MonitorTrd(TString inFile           = "",
     source->SetSubscriberHwm(10);
   }  // else of if( "" != inFile )
 
-  source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);
+  if (isActiveTrd) source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);
   // Trd flibId (0x40) as at desy2019. kTrd defined in CbmDefs.h
 
   source->SetSubscriberHwm(1000);
diff --git a/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C b/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C
index 2ac45c1c9d60cd02aea4ae05e8a1b4c7313448f6..a6603cc7a6d48495f20f806e8d1d5114429cc6ea 100644
--- a/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2020/unpack_check_time_mcbm_kronos.C
@@ -78,7 +78,14 @@ void unpack_check_time_mcbm_kronos(UInt_t uRunIdx  = 99999,
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -534,7 +541,8 @@ void unpack_check_time_mcbm_kronos(UInt_t uRunIdx  = 99999,
 
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);   // Trd
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb
diff --git a/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C b/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C
index f097c1f7fdd9cdecc683e6b6231acea42f15d775..453b8fbd59737376a51aa264f6449a4c734fc3fb 100644
--- a/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_check_timing_any_mcbm.C
@@ -55,7 +55,14 @@ void unpack_check_timing_any_mcbm(TString inFile  = "",
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -496,7 +503,8 @@ void unpack_check_timing_any_mcbm(TString inFile  = "",
 
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);   // Trd
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb
diff --git a/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C b/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C
index d404d58d4aed20e21c85150b26f9bec9eb8fa433..27175dd04c49673411c2f571f97caa06902599ec 100644
--- a/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_pulser_mcbm.C
@@ -55,7 +55,14 @@ void unpack_pulser_mcbm(UInt_t uRunId            = 0,
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -288,11 +295,8 @@ void unpack_pulser_mcbm(UInt_t uRunId            = 0,
   //  source->SetInputDir(inDir);
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(
-    unpacker_trdR,
-    0x40,
-    ECbmModuleId::
-      kTrd);  // Trd flibId (0x40) as at desy2019. kTrd defined in CbmDefs.h
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb
diff --git a/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C b/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C
index da4a29b89bbab62820ad4e422a3f4585bdf3f105..3e4a65a1f95dac5c48c7573a8f2b44be8567ce4e 100644
--- a/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C
+++ b/macro/beamtime/mcbm2020/unpack_pulser_mcbm_stsbinning.C
@@ -55,7 +55,14 @@ void unpack_pulser_mcbm_stsbinning(UInt_t uRunId            = 0,
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -301,11 +308,8 @@ void unpack_pulser_mcbm_stsbinning(UInt_t uRunId            = 0,
   //  source->SetInputDir(inDir);
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(
-    unpacker_trdR,
-    0x40,
-    ECbmModuleId::
-      kTrd);  // Trd flibId (0x40) as at desy2019. kTrd defined in CbmDefs.h
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
index d2ce5a95f148246b13f4d09a56b026483d06e1cf..26f70647a58f55e94af6f6102d624677637b725f 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
@@ -52,7 +52,14 @@ void unpack_tsa_mcbm(TString inFile  = "",
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -480,7 +487,8 @@ void unpack_tsa_mcbm(TString inFile  = "",
 
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);   // Trd
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
index b01fa2db22fc12a9234d807ad80bcac5ac5dfcbf..8324a1f167e14c656039ac783d9f2cd4402ed34f 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
@@ -77,7 +77,14 @@ void unpack_tsa_mcbm_kronos(UInt_t uRunIdx  = 99999,
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -526,7 +533,8 @@ void unpack_tsa_mcbm_kronos(UInt_t uRunIdx  = 99999,
 
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);   // Trd
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C
index 6c63ba62983868bf33440d03cea2996a6a183de8..d65132444ef927644ba7abb042d4763dcf8e4780 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_mfles.C
@@ -53,7 +53,14 @@ void unpack_tsa_mcbm_mfles(UInt_t uRunId   = 0,
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -232,11 +239,8 @@ void unpack_tsa_mcbm_mfles(UInt_t uRunId   = 0,
   //  source->SetInputDir(inDir);
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(
-    unpacker_trdR,
-    0x40,
-    ECbmModuleId::
-      kTrd);  // Trd flibId (0x40) as at desy2019. kTrd defined in CbmDefs.h
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   /// Avoid unpacking runs with RICH calibration triggers in first file until unpacker fixed
diff --git a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C
index 65093cc34f58cb3d8b23688eae4a197a797e67ac..6ee01d6f73823945dd7e6f268e1f23638c0ab538 100644
--- a/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C
+++ b/macro/beamtime/mcbm2020/unpack_tsa_mcbm_stsmuchbinning.C
@@ -52,7 +52,14 @@ void unpack_tsa_mcbm_stsmuchbinning(TString inFile  = "",
 
   // ---- Trd ----
   TString geoTagTrd = "";
-  if (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) {
+  bool isActiveTrd =
+    (geoSetup->GetGeoTag(ECbmModuleId::kTrd, geoTagTrd)) ? true : false;
+  if (!isActiveTrd) {
+    LOG(warning) << Form(
+      "TRD - parameter loading - Trd not found in CbmSetup(%s) -> parameters "
+      "can not be loaded correctly!",
+      geoSetupTag.data());
+  } else {
     TString paramFilesTrd(
       Form("%s/parameters/trd/trd_%s", srcDir.Data(), geoTagTrd.Data()));
     std::vector<std::string> paramFilesVecTrd;
@@ -263,11 +270,8 @@ void unpack_tsa_mcbm_stsmuchbinning(TString inFile  = "",
   //  source->SetInputDir(inDir);
   source->AddUnpacker(unpacker_sts, 0x10, ECbmModuleId::kSts);    //STS xyter
   source->AddUnpacker(unpacker_much, 0x50, ECbmModuleId::kMuch);  //MUCH xyter
-  source->AddUnpacker(
-    unpacker_trdR,
-    0x40,
-    ECbmModuleId::
-      kTrd);  // Trd flibId (0x40) as at desy2019. kTrd defined in CbmDefs.h
+  if (isActiveTrd)
+    source->AddUnpacker(unpacker_trdR, 0x40, ECbmModuleId::kTrd);  // Trd
   source->AddUnpacker(unpacker_tof, 0x60, ECbmModuleId::kTof);  //gDPB A & B & C
   source->AddUnpacker(unpacker_tof, 0x90, ECbmModuleId::kTof);  //gDPB T0 A & B
   source->AddUnpacker(unpacker_rich, 0x30, ECbmModuleId::kRich);  //RICH trb