From 099972b61db6c043f2bba5d5c256f080f5b42ec5 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Fri, 15 Mar 2024 08:58:08 +0100 Subject: [PATCH] Fix pre-commit --- k4FWCore/components/PodioInput.h | 2 +- .../src/components/ExampleEventHeaderConsumer.cpp | 2 +- .../src/components/k4FWCoreTest_AlgorithmWithTFile.h | 10 ++++++---- .../components/k4FWCoreTest_CheckExampleEventData.h | 5 +++-- .../components/k4FWCoreTest_CreateExampleEventData.h | 9 ++++++--- .../src/components/k4FWCoreTest_HelloWorldAlg.h | 2 +- .../src/components/k4FWCoreTest_cellID_reader.h | 8 ++++---- .../src/components/k4FWCoreTest_cellID_writer.h | 6 +++--- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/k4FWCore/components/PodioInput.h b/k4FWCore/components/PodioInput.h index 1b286b0a..db70b69f 100644 --- a/k4FWCore/components/PodioInput.h +++ b/k4FWCore/components/PodioInput.h @@ -19,8 +19,8 @@ #ifndef FWCORE_PODIOINPUT_H #define FWCORE_PODIOINPUT_H // Gaudi -#include "Gaudi/Property.h" #include "Gaudi/Functional/Consumer.h" +#include "Gaudi/Property.h" // STL #include diff --git a/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp index db233fda..7f1f6d70 100644 --- a/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp +++ b/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp @@ -22,8 +22,8 @@ #include "k4FWCore/BaseClass.h" -#include #include +#include #include #include diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h index 492162da..753ac0a6 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h @@ -65,13 +65,15 @@ class k4FWCoreTest_AlgorithmWithTFile : public Gaudi::Algorithm { /// Handle for the genparticles to be written mutable DataHandle m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Writer, this}; /// Handle for the genvertices to be written - mutable DataHandle m_simTrackerHitHandle{"SimTrackerHit", Gaudi::DataHandle::Writer, this}; + mutable DataHandle m_simTrackerHitHandle{"SimTrackerHit", Gaudi::DataHandle::Writer, + this}; - mutable DataHandle> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer, this}; + mutable DataHandle> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer, + this}; /// for testing: write a second TFile by user in an algorithm mutable Float_t m_value; - TFile* m_file; - TTree* m_tree; + TFile* m_file; + TTree* m_tree; }; #endif /* K4FWCORE_K4FWCORETEST_ALGORITHMWITHTFILE */ diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h index 2e55d841..7e5a5970 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h @@ -55,8 +55,9 @@ class k4FWCoreTest_CheckExampleEventData : public Gaudi::Algorithm { Gaudi::Property m_keepEventNumberZero{this, "keepEventNumberZero", false, "Don't add the event number to the dummy values written"}; /// Handle for the MCParticles to be written - mutable DataHandle m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Reader, this}; - mutable DataHandle> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Reader, this}; + mutable DataHandle m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Reader, this}; + mutable DataHandle> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Reader, + this}; mutable int m_event{0}; }; diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h index 736640af..2caed1aa 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h @@ -77,13 +77,16 @@ class k4FWCoreTest_CreateExampleEventData : public Gaudi::Algorithm { /// Handle for the MCParticles to be written mutable DataHandle m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Writer, this}; /// Handle for the SimTrackerHits to be written - mutable DataHandle m_simTrackerHitHandle{"SimTrackerHits", Gaudi::DataHandle::Writer, this}; - mutable DataHandle m_TrackerHitHandle{"TrackerHits", Gaudi::DataHandle::Writer, this}; + mutable DataHandle m_simTrackerHitHandle{"SimTrackerHits", + Gaudi::DataHandle::Writer, this}; + mutable DataHandle m_TrackerHitHandle{"TrackerHits", Gaudi::DataHandle::Writer, + this}; /// Handle for the Tracks to be written mutable DataHandle m_trackHandle{"Tracks", Gaudi::DataHandle::Writer, this}; - mutable DataHandle> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer, this}; + mutable DataHandle> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer, + this}; mutable int m_event{0}; }; diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h index 5f272cb9..4a39f4fc 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h @@ -20,8 +20,8 @@ #define K4FWCORE_K4FWCORETEST_HELLOWORLDALG // GAUDI -#include "Gaudi/Property.h" #include "Gaudi/Algorithm.h" +#include "Gaudi/Property.h" class k4FWCoreTest_HelloWorldAlg : public Gaudi::Algorithm { public: diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h index b2453f36..f6541243 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h @@ -53,9 +53,9 @@ class k4FWCoreTest_cellID_reader : public Gaudi::Algorithm { private: /// Handle for the SimTrackerHits to be read - mutable DataHandle m_simTrackerHitReaderHandle{"SimTrackerHits", Gaudi::DataHandle::Reader, - this}; - mutable MetaDataHandle m_cellIDHandle{m_simTrackerHitReaderHandle, edm4hep::CellIDEncoding, - Gaudi::DataHandle::Reader}; + mutable DataHandle m_simTrackerHitReaderHandle{"SimTrackerHits", + Gaudi::DataHandle::Reader, this}; + mutable MetaDataHandle m_cellIDHandle{m_simTrackerHitReaderHandle, edm4hep::CellIDEncoding, + Gaudi::DataHandle::Reader}; }; #endif /* K4FWCORE_K4FWCORETEST_CELLID */ diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h index 130a00ba..824e48dd 100644 --- a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h +++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h @@ -55,9 +55,9 @@ class k4FWCoreTest_cellID_writer : public Gaudi::Algorithm { private: /// Handle for the SimTrackerHits to be written - mutable DataHandle m_simTrackerHitWriterHandle{"SimTrackerHits", Gaudi::DataHandle::Writer, - this}; - MetaDataHandle m_cellIDHandle{m_simTrackerHitWriterHandle, edm4hep::CellIDEncoding, + mutable DataHandle m_simTrackerHitWriterHandle{"SimTrackerHits", + Gaudi::DataHandle::Writer, this}; + MetaDataHandle m_cellIDHandle{m_simTrackerHitWriterHandle, edm4hep::CellIDEncoding, Gaudi::DataHandle::Writer}; }; #endif /* K4FWCORE_K4FWCORETEST_CELLID_WRITER */