From fc7d5fe152a8ce30b5df8c1eb84f1c4c3b45acfc Mon Sep 17 00:00:00 2001 From: Christopher Dilks <c-dilks@users.noreply.github.com> Date: Sat, 20 May 2023 13:30:13 -0400 Subject: [PATCH] style: rename `PhotoMultiplierHitDigiAnalysis` -> `RawHitAnalysis` --- ...{PhotoMultiplierHitDigiAnalysis.h => RawHitAnalysis.h} | 8 +++++--- ...hotoMultiplierHitDigiAnalysis.cc => RawHitAnalysis.cc} | 8 ++++---- benchmarks/rich/src/benchmark.cc | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) rename benchmarks/rich/include/{PhotoMultiplierHitDigiAnalysis.h => RawHitAnalysis.h} (85%) rename benchmarks/rich/src/{PhotoMultiplierHitDigiAnalysis.cc => RawHitAnalysis.cc} (87%) diff --git a/benchmarks/rich/include/PhotoMultiplierHitDigiAnalysis.h b/benchmarks/rich/include/RawHitAnalysis.h similarity index 85% rename from benchmarks/rich/include/PhotoMultiplierHitDigiAnalysis.h rename to benchmarks/rich/include/RawHitAnalysis.h index 8816d0d9..44d211db 100644 --- a/benchmarks/rich/include/PhotoMultiplierHitDigiAnalysis.h +++ b/benchmarks/rich/include/RawHitAnalysis.h @@ -4,19 +4,21 @@ #pragma once #include <spdlog/spdlog.h> + #include <TH1D.h> #include <TH2D.h> #include <TMath.h> + #include <edm4eic/RawTrackerHitCollection.h> namespace benchmarks { - class PhotoMultiplierHitDigiAnalysis { + class RawHitAnalysis { public: - PhotoMultiplierHitDigiAnalysis() = default; - ~PhotoMultiplierHitDigiAnalysis() {} + RawHitAnalysis() = default; + ~RawHitAnalysis() {} // algorithm methods void AlgorithmInit(std::shared_ptr<spdlog::logger>& logger); diff --git a/benchmarks/rich/src/PhotoMultiplierHitDigiAnalysis.cc b/benchmarks/rich/src/RawHitAnalysis.cc similarity index 87% rename from benchmarks/rich/src/PhotoMultiplierHitDigiAnalysis.cc rename to benchmarks/rich/src/RawHitAnalysis.cc index 8c0f7e70..75ee8685 100644 --- a/benchmarks/rich/src/PhotoMultiplierHitDigiAnalysis.cc +++ b/benchmarks/rich/src/RawHitAnalysis.cc @@ -1,11 +1,11 @@ // Copyright 2023, Christopher Dilks // Subject to the terms in the LICENSE file found in the top-level directory. -#include "PhotoMultiplierHitDigiAnalysis.h" +#include "RawHitAnalysis.h" // AlgorithmInit //--------------------------------------------------------------------------- -void benchmarks::PhotoMultiplierHitDigiAnalysis::AlgorithmInit( +void benchmarks::RawHitAnalysis::AlgorithmInit( std::shared_ptr<spdlog::logger>& logger ) { @@ -31,7 +31,7 @@ void benchmarks::PhotoMultiplierHitDigiAnalysis::AlgorithmInit( // AlgorithmProcess //--------------------------------------------------------------------------- -void benchmarks::PhotoMultiplierHitDigiAnalysis::AlgorithmProcess( +void benchmarks::RawHitAnalysis::AlgorithmProcess( const edm4eic::RawTrackerHitCollection& hits ) { @@ -48,5 +48,5 @@ void benchmarks::PhotoMultiplierHitDigiAnalysis::AlgorithmProcess( // AlgorithmFinish //--------------------------------------------------------------------------- -void benchmarks::PhotoMultiplierHitDigiAnalysis::AlgorithmFinish() { +void benchmarks::RawHitAnalysis::AlgorithmFinish() { } diff --git a/benchmarks/rich/src/benchmark.cc b/benchmarks/rich/src/benchmark.cc index d0664cc0..d231d938 100644 --- a/benchmarks/rich/src/benchmark.cc +++ b/benchmarks/rich/src/benchmark.cc @@ -11,7 +11,7 @@ #include <podio/ROOTFrameReader.h> #include <podio/Frame.h> -#include "PhotoMultiplierHitDigiAnalysis.h" +#include "RawHitAnalysis.h" using namespace benchmarks; @@ -32,7 +32,7 @@ int main(int argc, char** argv) { std::string ana_file_name = "out_rich.root"; std::vector<std::string> rec_files; std::vector<std::string> analysis_algorithms = { - "PhotoMultiplierHitDigi" + "RawHit" }; // usage guide @@ -150,8 +150,8 @@ int main(int argc, char** argv) { // -------------------------------------------------------------- // digitizer .................................................... - if(analysis_algorithm == "PhotoMultiplierHitDigi") { - auto digi_algo = std::make_shared<PhotoMultiplierHitDigiAnalysis>(); + if(analysis_algorithm == "RawHit") { + auto digi_algo = std::make_shared<RawHitAnalysis>(); ana_file->mkdir("digi")->cd(); digi_algo->AlgorithmInit(algo.log); algo.process = [digi_algo] (podio::Frame& frame) { -- GitLab