diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx index c2a98d04460b31bde3732913a29ba6aa31b908fe..f33e5c97be26fe6fd0709a39ca5e95045f157c61 100644 --- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx +++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx @@ -738,117 +738,6 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector(ECbmModuleId selDet, fdTimeWinEndIn)); } //---------------------------------------------------------------------- -void CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector( - ECbmModuleId refDet) { - switch (refDet) { - case ECbmModuleId::kSts: { - SetReferenceDetector(kEventBuilderDetSts); - break; - } // case ECbmModuleId::kSts: - case ECbmModuleId::kMuch: { - SetReferenceDetector(kEventBuilderDetMuch); - break; - } // case ECbmModuleId::kMuch: - case ECbmModuleId::kTrd: { - SetReferenceDetector(kEventBuilderDetTrd); - break; - } // case ECbmModuleId::kTrd: - case ECbmModuleId::kTof: { - SetReferenceDetector(kEventBuilderDetTof); - break; - } // case ECbmModuleId::kTof: - case ECbmModuleId::kRich: { - SetReferenceDetector(kEventBuilderDetRich); - break; - } // case ECbmModuleId::kRich: - case ECbmModuleId::kPsd: { - SetReferenceDetector(kEventBuilderDetPsd); - break; - } // case ECbmModuleId::kPsd: - case ECbmModuleId::kT0: { - SetReferenceDetector(kEventBuilderDetT0); - break; - } // case ECbmModuleId::kT0: - default: { - LOG(fatal) - << "CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector => " - << "Trying to change reference to unsupported det: " << refDet - << std::endl - << "This method is deprecated and will be removed soon, " - << "please use the full version of it."; - break; - } // default: - } // switch( refDet ) - - LOG(warning) - << "CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector => " - << "Changing reference detector with deprecated method to: " - << fRefDet.sName << std::endl - << "This method is deprecated, does not set all parameters " - << "and will be removed soon, please use the full version of it."; -} -void CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector(ECbmModuleId selDet) { - switch (selDet) { - case ECbmModuleId::kSts: { - AddDetector(kEventBuilderDetSts); - break; - } // case ECbmModuleId::kSts: - case ECbmModuleId::kMuch: { - AddDetector(kEventBuilderDetMuch); - break; - } // case ECbmModuleId::kMuch: - case ECbmModuleId::kTrd: { - AddDetector(kEventBuilderDetTrd); - break; - } // case ECbmModuleId::kTrd: - case ECbmModuleId::kTof: { - AddDetector(kEventBuilderDetTof); - break; - } // case ECbmModuleId::kTof: - case ECbmModuleId::kRich: { - AddDetector(kEventBuilderDetRich); - break; - } // case ECbmModuleId::kRich: - case ECbmModuleId::kPsd: { - AddDetector(kEventBuilderDetPsd); - break; - } // case ECbmModuleId::kPsd: - case ECbmModuleId::kT0: { - AddDetector(kEventBuilderDetT0); - break; - } // case ECbmModuleId::kT0: - default: { - LOG(fatal) << "CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector => " - << "Trying to change reference to unsupported det: " << selDet - << std::endl - << "This method is deprecated and will be removed soon, " - << "please use the full version of it."; - break; - } // default: - } // switch( selDet ) - - LOG(warning) - << "CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector => " - << "Changing reference detector with deprecated method for: " << selDet - << std::endl - << "This method is deprecated, does not set all parameters " - << "and will be removed soon, please use the full version of it."; -} - -void CbmMcbm2019TimeWinEventBuilderAlgo::RemoveDetector(ECbmModuleId selDet) { - /// Loop on selection detectors - for (std::vector<EventBuilderDetector>::iterator det = fvDets.begin(); - det != fvDets.end(); - ++det) { - if ((*det).detId == selDet) { - fvDets.erase(det); - return; - } // if( (*det).detId == selDet ) - } // for( std::vector< EventBuilderDetector >::iterator det = fvDets.begin(); det != fvDets.end(); ++det ) - LOG(warning) << "CbmMcbm2019TimeWinEventBuilderAlgo::RemoveDetector => Doing " - "nothing, selection detector not in list!" - << selDet; -} //---------------------------------------------------------------------- void CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector( EventBuilderDetector refDetIn) { diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h index 58dcf9b1ae4554cfe2a7def3bc26e73aae34fed4..af47dcd01b414888d19d1086ec3d2f62b0efc6dd 100644 --- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h +++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h @@ -143,10 +143,6 @@ public: Double_t fdTimeWinBegIn = -100, Double_t fdTimeWinEndIn = 100); - void SetReferenceDetector(ECbmModuleId refDet) __attribute__((deprecated)); - void AddDetector(ECbmModuleId selDet) __attribute__((deprecated)); - void RemoveDetector(ECbmModuleId selDet) __attribute__((deprecated)); - void SetReferenceDetector(EventBuilderDetector refDetIn); void AddDetector(EventBuilderDetector selDet); void RemoveDetector(EventBuilderDetector selDet); diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx index 966348364df918d0248e2b29c9a964744dd14048..a3e7cd99b0f07109e25e115cceee3b128482467f 100644 --- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx +++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx @@ -139,17 +139,6 @@ void CbmMcbm2019TimeWinEventBuilderTask::SetOutFilename(TString sNameIn) { fsOutFileName = sNameIn; } -void CbmMcbm2019TimeWinEventBuilderTask::SetReferenceDetector( - ECbmModuleId refDet) { - if (nullptr != fpAlgo) fpAlgo->SetReferenceDetector(refDet); -} -void CbmMcbm2019TimeWinEventBuilderTask::AddDetector(ECbmModuleId selDet) { - if (nullptr != fpAlgo) fpAlgo->AddDetector(selDet); -} -void CbmMcbm2019TimeWinEventBuilderTask::RemoveDetector(ECbmModuleId selDet) { - if (nullptr != fpAlgo) fpAlgo->RemoveDetector(selDet); -} - void CbmMcbm2019TimeWinEventBuilderTask::SetReferenceDetector( EventBuilderDetector refDet) { if (nullptr != fpAlgo) fpAlgo->SetReferenceDetector(refDet); diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h index 4f7a3c16828b1ba1419eb9dc91bacaa2140397c7..4748f0c8c4d2990d498ffafa2581568531a87781 100644 --- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h +++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h @@ -63,10 +63,6 @@ public: void SetFillHistos(Bool_t bFlag = kTRUE); void SetOutFilename(TString sNameIn); - void SetReferenceDetector(ECbmModuleId refDet) __attribute__((deprecated)); - void AddDetector(ECbmModuleId selDet) __attribute__((deprecated)); - void RemoveDetector(ECbmModuleId selDet) __attribute__((deprecated)); - void SetReferenceDetector(EventBuilderDetector refDet); void AddDetector(EventBuilderDetector selDet); void RemoveDetector(EventBuilderDetector selDet);