From 6cbfa7cbae49b1d639d3c28ac7b6837066d8d00b Mon Sep 17 00:00:00 2001
From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de>
Date: Thu, 6 Jul 2023 12:03:30 +0000
Subject: [PATCH] algo: Rename RecoIO to RecoResults.
---
algo/CMakeLists.txt | 2 +-
algo/global/Archive.h | 8 ++++----
algo/global/Reco.cxx | 4 ++--
algo/global/Reco.h | 4 ++--
algo/global/{RecoIO.cxx => RecoResults.cxx} | 8 ++++----
algo/global/{RecoIO.h => RecoResults.h} | 12 ++++++------
algo/global/RecoResultsDescriptor.h | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
rename algo/global/{RecoIO.cxx => RecoResults.cxx} (56%)
rename algo/global/{RecoIO.h => RecoResults.h} (84%)
diff --git a/algo/CMakeLists.txt b/algo/CMakeLists.txt
index e816a0cdd1..02b3dbfb8e 100644
--- a/algo/CMakeLists.txt
+++ b/algo/CMakeLists.txt
@@ -38,7 +38,7 @@ set(SRCS
detectors/rich/RichReadoutConfig.cxx
detectors/rich/UnpackRich.cxx
global/Archive.cxx
- global/RecoIO.cxx
+ global/RecoResults.cxx
global/Reco.cxx
qa/DigiEventQa.cxx
qa/Histo1D.cxx
diff --git a/algo/global/Archive.h b/algo/global/Archive.h
index 1c6289f2d7..ffb683dbc2 100644
--- a/algo/global/Archive.h
+++ b/algo/global/Archive.h
@@ -13,7 +13,7 @@
#include <vector>
#include "ArchiveDescriptor.h"
-#include "RecoIO.h"
+#include "RecoResults.h"
#include "compat/Filesystem.h"
namespace cbm::algo
@@ -38,12 +38,12 @@ namespace cbm::algo
const ArchiveDescriptor& Descriptor() const { return fDescriptor; }
- std::vector<RecoIO>& TimesliceResults() { return fTimesliceResults; }
- const std::vector<RecoIO>& TimesliceResults() const { return fTimesliceResults; }
+ std::vector<RecoResults>& TimesliceResults() { return fTimesliceResults; }
+ const std::vector<RecoResults>& TimesliceResults() const { return fTimesliceResults; }
private:
ArchiveDescriptor fDescriptor;
- std::vector<RecoIO> fTimesliceResults;
+ std::vector<RecoResults> fTimesliceResults;
friend class boost::serialization::access;
template<class Archive>
diff --git a/algo/global/Reco.cxx b/algo/global/Reco.cxx
index cbae1377c9..c485b03a87 100644
--- a/algo/global/Reco.cxx
+++ b/algo/global/Reco.cxx
@@ -75,7 +75,7 @@ void Reco::Init(const Options& opts)
}
-RecoIO Reco::Run(const fles::Timeslice& ts)
+RecoResults Reco::Run(const fles::Timeslice& ts)
{
if (!fInitialized) { throw std::runtime_error("Chain not initialized"); }
@@ -111,7 +111,7 @@ RecoIO Reco::Run(const fles::Timeslice& ts)
PrintTimings(ts_times);
- RecoIO results(RecoResultsDescriptor(Opts(), Params()));
+ RecoResults results(RecoResultsDescriptor(Opts(), Params()));
CbmDigiEvent ev;
ev.fData = std::move(digiTs.fData);
results.Events().emplace_back(std::move(ev));
diff --git a/algo/global/Reco.h b/algo/global/Reco.h
index 3dd0e5cfb4..ff2eae0728 100644
--- a/algo/global/Reco.h
+++ b/algo/global/Reco.h
@@ -6,7 +6,7 @@
#include <xpu/host.h>
-#include "RecoIO.h"
+#include "RecoResults.h"
#include "SubChain.h"
#include "UnpackChain.h"
#include "sts/StsHitfinderChain.h"
@@ -31,7 +31,7 @@ namespace cbm::algo
Reco& operator=(Reco&&) = delete;
void Init(const Options&);
- RecoIO Run(const fles::Timeslice&);
+ RecoResults Run(const fles::Timeslice&);
void Finalize();
void PrintTimings(xpu::timings&);
diff --git a/algo/global/RecoIO.cxx b/algo/global/RecoResults.cxx
similarity index 56%
rename from algo/global/RecoIO.cxx
rename to algo/global/RecoResults.cxx
index 10599bae7c..f2d8d1de1f 100644
--- a/algo/global/RecoIO.cxx
+++ b/algo/global/RecoResults.cxx
@@ -1,12 +1,12 @@
/* Copyright (C) 2023 FIAS Frankfurt Institute for Advanced Studies, Frankfurt / Main
SPDX-License-Identifier: GPL-3.0-only
Authors: Felix Weiglhofer [committer] */
-#include "RecoIO.h"
+#include "RecoResults.h"
#include "CbmDigiEvent.h"
using namespace cbm::algo;
-RecoIO::RecoIO(RecoResultsDescriptor descriptor) : fDescriptor(descriptor) {}
-RecoIO::RecoIO() {}
-RecoIO::~RecoIO() {}
+RecoResults::RecoResults(RecoResultsDescriptor descriptor) : fDescriptor(descriptor) {}
+RecoResults::RecoResults() {}
+RecoResults::~RecoResults() {}
diff --git a/algo/global/RecoIO.h b/algo/global/RecoResults.h
similarity index 84%
rename from algo/global/RecoIO.h
rename to algo/global/RecoResults.h
index 9d6630e9ea..95e6c06772 100644
--- a/algo/global/RecoIO.h
+++ b/algo/global/RecoResults.h
@@ -1,8 +1,8 @@
/* Copyright (C) 2023 FIAS Frankfurt Institute for Advanced Studies, Frankfurt / Main
SPDX-License-Identifier: GPL-3.0-only
Authors: Felix Weiglhofer [committer] */
-#ifndef CBM_ALGO_GLOBAL_RECOIO_H
-#define CBM_ALGO_GLOBAL_RECOIO_H
+#ifndef CBM_ALGO_GLOBAL_RECO_RESULTS_H
+#define CBM_ALGO_GLOBAL_RECO_RESULTS_H
#include <boost/serialization/access.hpp>
@@ -19,12 +19,12 @@ namespace cbm::algo::sts
namespace cbm::algo
{
- class RecoIO {
+ class RecoResults {
public:
// Place ctor / dtor in cxx, so that we can forward-declare the data classes and keep this header small.
- RecoIO(RecoResultsDescriptor descriptor);
- ~RecoIO();
+ RecoResults(RecoResultsDescriptor descriptor);
+ ~RecoResults();
const RecoResultsDescriptor& Descriptor() const { return fDescriptor; }
const std::vector<CbmDigiEvent>& Events() const { return fEvents; }
@@ -36,7 +36,7 @@ namespace cbm::algo
friend class boost::serialization::access;
- RecoIO();
+ RecoResults();
template<class Archive>
void serialize(Archive& ar, const unsigned int /*version*/)
diff --git a/algo/global/RecoResultsDescriptor.h b/algo/global/RecoResultsDescriptor.h
index 39bba9a972..715b7f5653 100644
--- a/algo/global/RecoResultsDescriptor.h
+++ b/algo/global/RecoResultsDescriptor.h
@@ -13,7 +13,7 @@
namespace cbm::algo
{
- class RecoIO;
+ class RecoResults;
}
namespace cbm::algo
@@ -31,7 +31,7 @@ namespace cbm::algo
private: // serialization
friend class boost::serialization::access;
- friend class RecoIO;
+ friend class RecoResults;
RecoResultsDescriptor() = default;
--
GitLab