From 61e2adfb2b8930b0fd502d5d1ca60f80980c1202 Mon Sep 17 00:00:00 2001
From: P-A Loizeau <p.-a.loizeau@gsi.de>
Date: Tue, 21 Jul 2020 18:08:09 +0200
Subject: [PATCH] Apply clang-format to changed files
---
.../CbmMcbm2019TimeWinEventBuilderAlgo.cxx | 14 ++---
.../CbmMcbm2019TimeWinEventBuilderAlgo.h | 55 +++++++------------
.../CbmMcbm2019TimeWinEventBuilderTask.cxx | 6 +-
.../CbmMcbm2019TimeWinEventBuilderTask.h | 6 +-
4 files changed, 35 insertions(+), 46 deletions(-)
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
index aed78fbf..7cd22333 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
@@ -715,7 +715,7 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector(
uTriggerMinDigisIn,
iTriggerMaxDigisIn,
fdTimeWinBegIn,
- fdTimeWinEndIn) );
+ fdTimeWinEndIn));
}
void CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector(ECbmModuleId selDet,
ECbmDataType dataTypeIn,
@@ -847,8 +847,8 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::RemoveDetector(ECbmModuleId selDet) {
<< selDet;
}
//----------------------------------------------------------------------
-void CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector(EventBuilderDetector refDetIn)
-{
+void CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector(
+ EventBuilderDetector refDetIn) {
/// Loop on selection detectors
for (std::vector<EventBuilderDetector>::iterator det = fvDets.begin();
det != fvDets.end();
@@ -894,8 +894,8 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::SetReferenceDetector(EventBuilderDetect
/// Update the variable storing the size if widest time window for overlap detection
UpdateWidestTimeWinRange();
}
-void CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector(EventBuilderDetector selDet)
-{
+void CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector(
+ EventBuilderDetector selDet) {
if (fRefDet == selDet) {
LOG(fatal) << "CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector => Cannot "
"add the reference detector as selection detector!"
@@ -922,8 +922,8 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::AddDetector(EventBuilderDetector selDet
/// Update the variable storing the size if widest time window for overlap detection
UpdateWidestTimeWinRange();
}
-void CbmMcbm2019TimeWinEventBuilderAlgo::RemoveDetector(EventBuilderDetector selDet)
-{
+void CbmMcbm2019TimeWinEventBuilderAlgo::RemoveDetector(
+ EventBuilderDetector selDet) {
/// Loop on selection detectors
for (std::vector<EventBuilderDetector>::iterator det = fvDets.begin();
det != fvDets.end();
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
index 8acbf864..efe475a3 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
@@ -59,10 +59,10 @@ public:
fdTimeWinEnd = fdTimeWinEndIn;
}
- bool operator ==(const EventBuilderDetector &other) const {
+ bool operator==(const EventBuilderDetector& other) const {
return (other.detId == this->detId);
}
- bool operator !=(const EventBuilderDetector &other) const {
+ bool operator!=(const EventBuilderDetector& other) const {
return (other.detId != this->detId);
}
@@ -84,35 +84,22 @@ public:
};
/// Pre-defined detector types
-static const EventBuilderDetector kEventBuilderDetSts = EventBuilderDetector(
- ECbmModuleId::kSts,
- ECbmDataType::kStsDigi,
- "Sts");
-static const EventBuilderDetector kEventBuilderDetMuch = EventBuilderDetector(
- ECbmModuleId::kMuch,
- ECbmDataType::kMuchDigi,
- "Much");
-static const EventBuilderDetector kEventBuilderDetTrd = EventBuilderDetector(
- ECbmModuleId::kTrd,
- ECbmDataType::kTrdDigi,
- "Trd");
-static const EventBuilderDetector kEventBuilderDetTof = EventBuilderDetector(
- ECbmModuleId::kTof,
- ECbmDataType::kTofDigi,
- "Tof");
-static const EventBuilderDetector kEventBuilderDetRich = EventBuilderDetector(
- ECbmModuleId::kRich,
- ECbmDataType::kRichDigi,
- "Rich");
-static const EventBuilderDetector kEventBuilderDetPsd = EventBuilderDetector(
- ECbmModuleId::kPsd,
- ECbmDataType::kPsdDigi,
- "Psd");
-static const EventBuilderDetector kEventBuilderDetT0 = EventBuilderDetector(
- ECbmModuleId::kT0,
- ECbmDataType::kT0Digi,
- "T0");
-static const EventBuilderDetector kEventBuilderDetUndef = EventBuilderDetector();
+static const EventBuilderDetector kEventBuilderDetSts =
+ EventBuilderDetector(ECbmModuleId::kSts, ECbmDataType::kStsDigi, "Sts");
+static const EventBuilderDetector kEventBuilderDetMuch =
+ EventBuilderDetector(ECbmModuleId::kMuch, ECbmDataType::kMuchDigi, "Much");
+static const EventBuilderDetector kEventBuilderDetTrd =
+ EventBuilderDetector(ECbmModuleId::kTrd, ECbmDataType::kTrdDigi, "Trd");
+static const EventBuilderDetector kEventBuilderDetTof =
+ EventBuilderDetector(ECbmModuleId::kTof, ECbmDataType::kTofDigi, "Tof");
+static const EventBuilderDetector kEventBuilderDetRich =
+ EventBuilderDetector(ECbmModuleId::kRich, ECbmDataType::kRichDigi, "Rich");
+static const EventBuilderDetector kEventBuilderDetPsd =
+ EventBuilderDetector(ECbmModuleId::kPsd, ECbmDataType::kPsdDigi, "Psd");
+static const EventBuilderDetector kEventBuilderDetT0 =
+ EventBuilderDetector(ECbmModuleId::kT0, ECbmDataType::kT0Digi, "T0");
+static const EventBuilderDetector kEventBuilderDetUndef =
+ EventBuilderDetector();
class CbmMcbm2019TimeWinEventBuilderAlgo {
public:
@@ -154,9 +141,9 @@ 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(ECbmModuleId refDet) __attribute__((deprecated));
+ void AddDetector(ECbmModuleId selDet) __attribute__((deprecated));
+ void RemoveDetector(ECbmModuleId selDet) __attribute__((deprecated));
void SetReferenceDetector(EventBuilderDetector refDetIn);
void AddDetector(EventBuilderDetector selDet);
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
index aeb6c54e..b3789f45 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
@@ -154,10 +154,12 @@ void CbmMcbm2019TimeWinEventBuilderTask::SetReferenceDetector(
EventBuilderDetector refDet) {
if (nullptr != fpAlgo) fpAlgo->SetReferenceDetector(refDet);
}
-void CbmMcbm2019TimeWinEventBuilderTask::AddDetector(EventBuilderDetector selDet) {
+void CbmMcbm2019TimeWinEventBuilderTask::AddDetector(
+ EventBuilderDetector selDet) {
if (nullptr != fpAlgo) fpAlgo->AddDetector(selDet);
}
-void CbmMcbm2019TimeWinEventBuilderTask::RemoveDetector(EventBuilderDetector selDet) {
+void CbmMcbm2019TimeWinEventBuilderTask::RemoveDetector(
+ EventBuilderDetector selDet) {
if (nullptr != fpAlgo) fpAlgo->RemoveDetector(selDet);
}
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h
index 6c387fb7..4f7a3c16 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.h
@@ -63,9 +63,9 @@ 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(ECbmModuleId refDet) __attribute__((deprecated));
+ void AddDetector(ECbmModuleId selDet) __attribute__((deprecated));
+ void RemoveDetector(ECbmModuleId selDet) __attribute__((deprecated));
void SetReferenceDetector(EventBuilderDetector refDet);
void AddDetector(EventBuilderDetector selDet);
--
GitLab