From eda2f60a789fad56b98deebe0c1ac75be6731b68 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Wed, 27 Nov 2024 14:20:06 +0100 Subject: [PATCH] Add more MuonCollider specific fixes --- source/Refitting/include/RefitFinal.h | 8 +++--- source/Utils/include/FilterClusters.h | 4 +-- source/Utils/include/FilterConeHits.h | 2 ++ source/Utils/include/FilterDoubleLayerHits.h | 26 ++++++++++--------- source/Utils/include/FilterTimeHits.h | 2 ++ source/Utils/include/SplitCollectionByLayer.h | 3 +++ .../include/SplitCollectionByPolarAngle.h | 2 ++ source/Utils/src/FilterClusters.cc | 1 - source/Utils/src/FilterConeHits.cc | 4 +-- source/Utils/src/FilterTimeHits.cc | 4 +-- .../Utils/src/SplitCollectionByPolarAngle.cc | 4 +-- 11 files changed, 35 insertions(+), 25 deletions(-) diff --git a/source/Refitting/include/RefitFinal.h b/source/Refitting/include/RefitFinal.h index 41bcee6..745011e 100644 --- a/source/Refitting/include/RefitFinal.h +++ b/source/Refitting/include/RefitFinal.h @@ -18,8 +18,8 @@ class RefitFinal : public marlin::Processor { /// Nhits cut struct struct NHitsCut{ - std::vector detIDs ; // list of detectors IDs from which hits will be summed - int nHits_min ; // minimum number of hits + std::vector detIDs {} ; // list of detectors IDs from which hits will be summed + int nHits_min {}; // minimum number of hits }; public: @@ -79,8 +79,8 @@ class RefitFinal : public marlin::Processor { bool _MSOn = true; bool _ElossOn = true; - StringVec _NHitsCutsStr ; - std::vector _NHitsCuts ; + StringVec _NHitsCutsStr {}; + std::vector _NHitsCuts {}; double _ReducedChi2Cut = -1.0; bool _SmoothOn = false; diff --git a/source/Utils/include/FilterClusters.h b/source/Utils/include/FilterClusters.h index ab76767..4520935 100644 --- a/source/Utils/include/FilterClusters.h +++ b/source/Utils/include/FilterClusters.h @@ -45,10 +45,10 @@ class FilterClusters : public marlin::Processor std::string _OutRelationCollection {}; //! Ranges for theta - std::vector _ThetaRanges; + std::vector _ThetaRanges {}; //! Cut-offs for cluster size in various theta ranges - std::vector _ClusterSize; + std::vector _ClusterSize {}; //! Layers to be filtered std::vector _Layers; diff --git a/source/Utils/include/FilterConeHits.h b/source/Utils/include/FilterConeHits.h index 1049004..8b6b36d 100644 --- a/source/Utils/include/FilterConeHits.h +++ b/source/Utils/include/FilterConeHits.h @@ -39,6 +39,8 @@ class FilterConeHits : public Processor { FilterConeHits() ; + FilterConeHits(const FilterConeHits&) = delete; + FilterConeHits& operator=(const FilterConeHits&) = delete; virtual void init() ; diff --git a/source/Utils/include/FilterDoubleLayerHits.h b/source/Utils/include/FilterDoubleLayerHits.h index 2b7dbc3..050d597 100644 --- a/source/Utils/include/FilterDoubleLayerHits.h +++ b/source/Utils/include/FilterDoubleLayerHits.h @@ -62,6 +62,8 @@ class FilterDoubleLayerHits : public Processor { FilterDoubleLayerHits() ; + FilterDoubleLayerHits(const FilterDoubleLayerHits) = delete ; + FilterDoubleLayerHits& operator=(const FilterDoubleLayerHits) = delete ; virtual const std::string & name() const { return Processor::name() ; } @@ -92,40 +94,40 @@ class FilterDoubleLayerHits : public Processor { dd4hep::rec::Vector2D globalToLocal(long int cellID, const dd4hep::rec::Vector3D& posGlobal, dd4hep::rec::ISurface** surf) ; ////Input collection name. - std::string _inColName ; + std::string _inColName {}; ////Output collection name. - std::string _outColName ; + std::string _outColName {}; ////Maximum time difference between hits in a doublet - double _dtMax ; + double _dtMax {}; ////Double layer cuts configuration - StringVec _dlCutConfigs ; + StringVec _dlCutConfigs {}; ////Whether to fill diagnostic histograms - bool _fillHistos ; + bool _fillHistos {false}; ////Subdetector name (needed to get the sensor surface manager) - std::string _subDetName ; + std::string _subDetName {}; - std::vector _dlCuts ; + std::vector _dlCuts {}; ////Surface map for getting local hit positions at sensor surface - const dd4hep::rec::SurfaceMap* _map ; + const dd4hep::rec::SurfaceMap* _map {nullptr}; ////Array of flags for hits to be accepted bool _hitAccepted[NHITS_MAX] ; ////Map of vectors of hits grouped by position in the detector - std::map > _hitsGrouped; + std::map > _hitsGrouped{}; ////Monitoring histograms - std::map _histos ; + std::map _histos {}; - int _nRun ; - int _nEvt ; + int _nRun {}; + int _nEvt {}; } ; #endif diff --git a/source/Utils/include/FilterTimeHits.h b/source/Utils/include/FilterTimeHits.h index d98140a..3f25c77 100644 --- a/source/Utils/include/FilterTimeHits.h +++ b/source/Utils/include/FilterTimeHits.h @@ -42,6 +42,8 @@ class FilterTimeHits : public Processor virtual Processor *newProcessor() { return new FilterTimeHits; } FilterTimeHits(); + FilterTimeHits(const FilterTimeHits&) = delete; + FilterTimeHits& operator=(const FilterTimeHits&) = delete; virtual void init(); diff --git a/source/Utils/include/SplitCollectionByLayer.h b/source/Utils/include/SplitCollectionByLayer.h index aa14a97..edd59bb 100644 --- a/source/Utils/include/SplitCollectionByLayer.h +++ b/source/Utils/include/SplitCollectionByLayer.h @@ -30,6 +30,9 @@ class SplitCollectionByLayer : public Processor { ///helper struct struct OutColInfo{ + OutColInfo(const OutColInfo&) = delete; + OutColInfo& operator=(const OutColInfo&) = delete; + std::vector layers{} ; LCCollection* collection{nullptr}; OutColInfo() : layers(std::vector(0)), collection(nullptr) {} diff --git a/source/Utils/include/SplitCollectionByPolarAngle.h b/source/Utils/include/SplitCollectionByPolarAngle.h index c1ad16f..741e5c3 100644 --- a/source/Utils/include/SplitCollectionByPolarAngle.h +++ b/source/Utils/include/SplitCollectionByPolarAngle.h @@ -39,6 +39,8 @@ class SplitCollectionByPolarAngle : public Processor { SplitCollectionByPolarAngle() ; + SplitCollectionByPolarAngle(const SplitCollectionByPolarAngle&) = delete ; + SplitCollectionByPolarAngle& operator=(const SplitCollectionByPolarAngle&) = delete ; virtual void init() ; diff --git a/source/Utils/src/FilterClusters.cc b/source/Utils/src/FilterClusters.cc index 1797855..926de76 100644 --- a/source/Utils/src/FilterClusters.cc +++ b/source/Utils/src/FilterClusters.cc @@ -141,7 +141,6 @@ void FilterClusters::processEvent( LCEvent * evt ) //Get hit subdetector/layer std::string _encoderString = lcio::LCTrackerCellID::encoding_string(); UTIL::CellIDDecoder decoder(_encoderString); - uint32_t systemID = decoder(trkhit)["system"]; uint32_t layerID = decoder(trkhit)["layer"]; bool filter_layer = false; for (size_t j=0; j<_Layers.size(); ++j){ diff --git a/source/Utils/src/FilterConeHits.cc b/source/Utils/src/FilterConeHits.cc index fd52ab7..2265784 100644 --- a/source/Utils/src/FilterConeHits.cc +++ b/source/Utils/src/FilterConeHits.cc @@ -116,7 +116,7 @@ void FilterConeHits::init() { } -void FilterConeHits::processRunHeader( LCRunHeader* run) { +void FilterConeHits::processRunHeader( LCRunHeader* ) { _nRun++ ; @@ -391,7 +391,7 @@ void FilterConeHits::processEvent( LCEvent * evt ) { -void FilterConeHits::check( LCEvent * evt ) { +void FilterConeHits::check( LCEvent * ) { } diff --git a/source/Utils/src/FilterTimeHits.cc b/source/Utils/src/FilterTimeHits.cc index 1419668..8e34ca4 100644 --- a/source/Utils/src/FilterTimeHits.cc +++ b/source/Utils/src/FilterTimeHits.cc @@ -99,7 +99,7 @@ void FilterTimeHits::init() m_corrected_time = new TH1F("m_corrected_time", "Corrected time of the hit [ps]", 1000, -250., 250.); } -void FilterTimeHits::processRunHeader(LCRunHeader *run) +void FilterTimeHits::processRunHeader(LCRunHeader *) { _nRun++; } @@ -326,7 +326,7 @@ void FilterTimeHits::processEvent(LCEvent *evt) _nEvt++; } -void FilterTimeHits::check(LCEvent *evt) +void FilterTimeHits::check(LCEvent *) { } diff --git a/source/Utils/src/SplitCollectionByPolarAngle.cc b/source/Utils/src/SplitCollectionByPolarAngle.cc index 8d5e5a9..ab11d10 100644 --- a/source/Utils/src/SplitCollectionByPolarAngle.cc +++ b/source/Utils/src/SplitCollectionByPolarAngle.cc @@ -108,7 +108,7 @@ void SplitCollectionByPolarAngle::init() { } -void SplitCollectionByPolarAngle::processRunHeader( LCRunHeader* run) { +void SplitCollectionByPolarAngle::processRunHeader( LCRunHeader* ) { _nRun++ ; @@ -116,7 +116,7 @@ void SplitCollectionByPolarAngle::processRunHeader( LCRunHeader* run) { -void SplitCollectionByPolarAngle::processEvent( LCEvent * evt ) { +void SplitCollectionByPolarAngle::processEvent( LCEvent * ) { // --- Check whether the number of input and output collections match