From 3d8a22f685ab0eb309f0217ef1e7065cf58fc871 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Thu, 14 Jan 2021 10:49:48 +0100
Subject: [PATCH] Fix unreachable statement for Max Trigger cut in TimeWin Evt
builder
---
.../CbmMcbm2019TimeWinEventBuilderAlgo.cxx | 22 ++++++++-----------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
index 42e076a49f..c2a98d0446 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
@@ -585,27 +585,23 @@ Bool_t CbmMcbm2019TimeWinEventBuilderAlgo::CheckTriggerConditions(
} // if( !fDigiMan->IsPresent( det ) )
} // else of if( ECbmDataType::kT0Digi == det )
- /// Check Minimal trigger acceptance by minimal number
+ /// Check trigger rejection by minimal number or absence
Int_t iNbDigis = event->GetNofData(det.dataType);
- if ((-1 != iNbDigis)
- && (det.fuTriggerMinDigis <= static_cast<UInt_t>(iNbDigis))) {
- return kTRUE;
- } // if( ( -1 != iNbDigis ) && ( det.fuTriggerMinDigis <= static_cast< UInt_t >( iNbDigis ) )
- else {
+ if ((-1 == iNbDigis)
+ || (static_cast<UInt_t>(iNbDigis) < det.fuTriggerMinDigis)) {
LOG(debug2) << "Event does not have enough digis: " << iNbDigis << " vs "
<< det.fuTriggerMinDigis << " for " << det.sName;
return kFALSE;
- } // else of if( ( -1 != iNbDigis ) && ( det.fuTriggerMinDigis <= static_cast< UInt_t >( iNbDigis ) )
-
+ } // if((-1 == iNbDigis) || (static_cast<UInt_t>(iNbDigis) < det.fuTriggerMinDigis))
/// Check trigger rejection by maximal number
- if (iNbDigis < det.fiTriggerMaxDigis) {
- return kTRUE;
- } // if( iNbDigis < det.fiTriggerMaxDigis )
- else {
+ else if (det.fiTriggerMaxDigis < iNbDigis) {
LOG(debug2) << "Event Has too many digis: " << iNbDigis << " vs "
<< det.fiTriggerMaxDigis << " for " << det.sName;
return kFALSE;
- } // else of if( iNbDigis < det.fiTriggerMaxDigis )
+ } // else if( iNbDigis < det.fiTriggerMaxDigis )
+ else {
+ return kTRUE;
+ } // else of else if( iNbDigis < det.fiTriggerMaxDigis )
}
//----------------------------------------------------------------------
void CbmMcbm2019TimeWinEventBuilderAlgo::CreateHistograms() {
--
GitLab