Renamed static Eventbuilder detectors to prevent name clash.

macro/run/run_reco.C

@@ -219,24 +219,12 @@ void run_reco(TString input        = "",
       // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //
       /// to use 2018 version, uncomment this section and comment the prev. one
 
-      /* switch between 2019 and 2021 version here, which have the same interface
+      /* switch between 2019 and 2021 version here
       CbmMcbm2019TimeWinEventBuilderTask* evBuildRaw =
         new CbmMcbm2019TimeWinEventBuilderTask();
 
       //Choose between NoOverlap, MergeOverlap, AllowOverlap
       evBuildRaw->SetEventOverlapMode(EOverlapMode::AllowOverlap);  // for 2019 version
-      */
-
-      CbmTaskBuildRawEvents* evBuildRaw = new CbmTaskBuildRawEvents();
-
-      //Choose between NoOverlap, MergeOverlap, AllowOverlap
-      evBuildRaw->SetEventOverlapMode(
-        EOverlapModeRaw::AllowOverlap);  // for raw version
-
-      evBuildRaw->SetTsParameters(0.0, 1.e7, 0.0);
-
-      // Use CbmMuchDigi instead of CbmMuchBeamtimeDigi
-      evBuildRaw->ChangeMuchBeamtimeDigiFlag(kFALSE);
 
       // Remove detectors where digis not found
       if (!useRich) evBuildRaw->RemoveDetector(kEventBuilderDetRich);
@@ -250,7 +238,30 @@ void run_reco(TString input        = "",
 
       // Set STS as reference detector
       evBuildRaw->SetReferenceDetector(kEventBuilderDetSts);
+*/
+      CbmTaskBuildRawEvents* evBuildRaw = new CbmTaskBuildRawEvents();
+      //Choose between NoOverlap, MergeOverlap, AllowOverlap
+
+      evBuildRaw->SetEventOverlapMode(
+        EOverlapModeRaw::AllowOverlap);  // for raw version
+
+      // Remove detectors where digis not found
+      if (!useRich) evBuildRaw->RemoveDetector(kRawEventBuilderDetRich);
+      if (!useMuch) evBuildRaw->RemoveDetector(kRawEventBuilderDetMuch);
+      if (!usePsd) evBuildRaw->RemoveDetector(kRawEventBuilderDetPsd);
+      if (!useTof) evBuildRaw->RemoveDetector(kRawEventBuilderDetTof);
+      if (!useTrd) evBuildRaw->RemoveDetector(kRawEventBuilderDetTrd);
 
+      // Remove STS as it will be our reference
+      evBuildRaw->RemoveDetector(kRawEventBuilderDetSts);
+
+      // Set STS as reference detector
+      evBuildRaw->SetReferenceDetector(kRawEventBuilderDetSts);
+
+      evBuildRaw->SetTsParameters(0.0, 1.e7, 0.0);
+
+      // Use CbmMuchDigi instead of CbmMuchBeamtimeDigi
+      evBuildRaw->ChangeMuchBeamtimeDigiFlag(kFALSE);
 
       evBuildRaw->SetTriggerMinNumber(ECbmModuleId::kSts, 1000);
       evBuildRaw->SetTriggerMaxNumber(ECbmModuleId::kSts, -1);
@@ -271,6 +282,10 @@ void run_reco(TString input        = "",
   }  //? event-based reco
   // ------------------------------------------------------------------------
 
+  //CbmBuildEventsQA* evBuildQA = new CbmBuildEventsQA();
+  //run->AddTask(evBuildQA);
+
+
   // -----   Local reconstruction in MVD   ----------------------------------
   if (useMvd) {
 
@@ -462,6 +477,7 @@ void run_reco(TString input        = "",
 
   }  //? time-based reco
 
+
   // -----  Parameter database   --------------------------------------------
   std::cout << std::endl << std::endl;
   std::cout << "-I- " << myName << ": Set runtime DB" << std::endl;

reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h

@@ -93,21 +93,21 @@ public:
 };
 
 /// Pre-defined detector types
-static const RawEventBuilderDetector kEventBuilderDetSts =
+static const RawEventBuilderDetector kRawEventBuilderDetSts =
   RawEventBuilderDetector(ECbmModuleId::kSts, ECbmDataType::kStsDigi, "Sts");
-static const RawEventBuilderDetector kEventBuilderDetMuch =
+static const RawEventBuilderDetector kRawEventBuilderDetMuch =
   RawEventBuilderDetector(ECbmModuleId::kMuch, ECbmDataType::kMuchDigi, "Much");
-static const RawEventBuilderDetector kEventBuilderDetTrd =
+static const RawEventBuilderDetector kRawEventBuilderDetTrd =
   RawEventBuilderDetector(ECbmModuleId::kTrd, ECbmDataType::kTrdDigi, "Trd");
-static const RawEventBuilderDetector kEventBuilderDetTof =
+static const RawEventBuilderDetector kRawEventBuilderDetTof =
   RawEventBuilderDetector(ECbmModuleId::kTof, ECbmDataType::kTofDigi, "Tof");
-static const RawEventBuilderDetector kEventBuilderDetRich =
+static const RawEventBuilderDetector kRawEventBuilderDetRich =
   RawEventBuilderDetector(ECbmModuleId::kRich, ECbmDataType::kRichDigi, "Rich");
-static const RawEventBuilderDetector kEventBuilderDetPsd =
+static const RawEventBuilderDetector kRawEventBuilderDetPsd =
   RawEventBuilderDetector(ECbmModuleId::kPsd, ECbmDataType::kPsdDigi, "Psd");
-static const RawEventBuilderDetector kEventBuilderDetT0 =
+static const RawEventBuilderDetector kRawEventBuilderDetT0 =
   RawEventBuilderDetector(ECbmModuleId::kT0, ECbmDataType::kT0Digi, "T0");
-static const RawEventBuilderDetector kEventBuilderDetUndef =
+static const RawEventBuilderDetector kRawEventBuilderDetUndef =
   RawEventBuilderDetector();