diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 971b552c7117bf8f29bd4dd14dac9e6aed1924c1..b4ab9b66def54606f33699c05a225e47536decdd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: rev: v2.2.5 hooks: - id: codespell - exclude: ^(.*\.ref|.*\.detdesc|.*\.h|.*\.cpp|.*\.notes|.*\.md)$ + exclude: ^(.*\.ref|.*\.detdesc|.*\.notes|.*\.md)$ args: [ "--skip", "Phys/AnalysisPython/*,Phys/DaVinciTrackScaling/*" diff --git a/Phys/DaVinciMCTools/src/BackgroundCategory.cpp b/Phys/DaVinciMCTools/src/BackgroundCategory.cpp index 980107b1875f373b340a6a843685e4950b8a79b2..683e7263da28e74b14b8aa7656063232e6922711 100644 --- a/Phys/DaVinciMCTools/src/BackgroundCategory.cpp +++ b/Phys/DaVinciMCTools/src/BackgroundCategory.cpp @@ -1,5 +1,5 @@ /*****************************************************************************\ -* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration * +* (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration * * * * This software is distributed under the terms of the GNU General Public * * Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". * @@ -138,7 +138,7 @@ IBackgroundCategory::Result BackgroundCategory::category( const LHCb::Particle* if ( msgLevel( MSG::VERBOSE ) ) verbose() << "Checked if all have common mother" << endmsg; // We are in the territory of signal decays and // "physics" backgrounds (meaning we have reconstructed some actual decay - // that occured, even if not the one we were after). + // that occurred, even if not the one we were after). if ( isTheDecayFullyReconstructed( mc_particles_linked_to_decay ) ) { if ( m_undefined ) return {Undefined, LogicError}; if ( msgLevel( MSG::VERBOSE ) ) verbose() << "Checked if fully reconstructed" << endmsg; @@ -998,7 +998,7 @@ bool BackgroundCategory::wereAnyResonancesMissed( const LHCb::Particle* candidat } //============================================================================= bool BackgroundCategory::checkLowMassBackground( const LHCb::Particle* candidate ) -// This condtion checks whether the MCParticle head of the decay chain is at most +// This condition checks whether the MCParticle head of the decay chain is at most // a given mass (set by the property LowMassBackgroundCut) heavier than the average mass // for a particle of its PID. { @@ -1380,7 +1380,7 @@ bool BackgroundCategory::hierarchyProblem( const MCParticleVector& mc_particles_ if ( !( *iPP2 ) || ( iPP1 == iPP2 ) ) continue; // Check all the mothers for ( MCParticleVector::const_iterator iPPM = tempmothers.begin(); iPPM != ( tempmothers.end() ); ++iPPM ) { - if ( !( *iPPM ) ) break; // Shoudln't happen... + if ( !( *iPPM ) ) break; // Shouldn't happen... if ( ( *iPPM ) == ( *iPP2 ) && ( *iPPM )->particleID().pid() != 22 ) return true; // Warning gamma->ee is a 'stable' composite ! } diff --git a/Phys/DaVinciMCTools/src/BackgroundCategoryViaRelations.cpp b/Phys/DaVinciMCTools/src/BackgroundCategoryViaRelations.cpp index 97aa3a633aa6453cc65cc732c3f3887b0411390e..b3792d4f7f786a4c5862b619d7d52f287df16edb 100755 --- a/Phys/DaVinciMCTools/src/BackgroundCategoryViaRelations.cpp +++ b/Phys/DaVinciMCTools/src/BackgroundCategoryViaRelations.cpp @@ -64,7 +64,7 @@ IBackgroundCategory::Result BackgroundCategoryViaRelations::category( const LHCb // locs.erase( std::unique(locs.begin(),locs.end()), locs.end() ); // Loop over the relations locations and try and find a match - int check = 0; // check for existance of relations table + int check = 0; // check for existence of relations table for ( std::vector<std::string>::const_iterator item = locs.begin(); item != locs.end(); ++item ) { // Try and load the table const std::string& address = *item; diff --git a/Phys/DaVinciMCTools/src/DaVinciAssociatorsWrapper.cpp b/Phys/DaVinciMCTools/src/DaVinciAssociatorsWrapper.cpp index 4d64b802c0245baf18d37d120fc5ba4b0f7d7627..7874ada2c72bb0f6d4a0ee2adbdfa64112013b05 100644 --- a/Phys/DaVinciMCTools/src/DaVinciAssociatorsWrapper.cpp +++ b/Phys/DaVinciMCTools/src/DaVinciAssociatorsWrapper.cpp @@ -84,7 +84,7 @@ StatusCode DaVinciAssociatorsWrapper::finalize() { return GaudiTool::finalize(); // Implementation of Listener interface //============================================================================= void DaVinciAssociatorsWrapper::handle( const Incident& thisIncident ) { - verbose() << "An incident has occured" << endmsg; + verbose() << "An incident has occurred" << endmsg; if ( thisIncident.type() == "EndEvent" ) { verbose() << "Deleting linker at end of event incident" << endmsg; if ( NULL != m_linker ) delete m_linker; diff --git a/Phys/FunTuple/src/FillTuple.h b/Phys/FunTuple/src/FillTuple.h index 4f93e86c710d311bad5b4bc5a15eb2db9dffa79c..3f88eebaefe104648e0aff04eece20ca9260f22f 100755 --- a/Phys/FunTuple/src/FillTuple.h +++ b/Phys/FunTuple/src/FillTuple.h @@ -1,5 +1,5 @@ /*****************************************************************************\ -* (c) Copyright 2020-2022 CERN for the benefit of the LHCb Collaboration * +* (c) Copyright 2020-2023 CERN for the benefit of the LHCb Collaboration * * * * This software is distributed under the terms of the GNU General Public * * Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". * @@ -36,7 +36,7 @@ namespace LHCb::FTuple { constexpr unsigned int maxSizeArray{10000}; // For tupling arrays user can specify variable name (e.g. "PT") and length name ("nPVs") as "PT[nPVs]". - // This function gets "nPVs" from fieldname, if nothing found assignes default name "indx" + // This function gets "nPVs" from fieldname, if nothing found assigns default name "indx" inline std::string get_length_name( const std::string& fieldname ) { std::string idxname = " "; std::string start_del = "["; @@ -53,7 +53,7 @@ namespace LHCb::FTuple { // This function erases the array index name from the fieldname. // Needed to avoid FunTuple from creating matrices instead of arrays. // E.g.: if fieldname = var[nPVs], then FunTuple stores an object as var[nPVs][nPVs] - // removing [nPVs] from fieldname allow to store correcty the object as: var[nPVs]. + // removing [nPVs] from fieldname allow to store correctly the object as: var[nPVs]. inline std::string erase_array_idxname( const std::string fieldname, const std::string& idxname ) { auto full_idxname = std::string( "[" ) + idxname + std::string( "]" ); size_t pos = fieldname.rfind( full_idxname ); diff --git a/Phys/FunTuple/src/FunTuple.cpp b/Phys/FunTuple/src/FunTuple.cpp index af62ccadbab6790348be0c357bf017f5e2b7c69e..8f6310b4fe7e1d763a6c14ec69b93986ab11ac7d 100755 --- a/Phys/FunTuple/src/FunTuple.cpp +++ b/Phys/FunTuple/src/FunTuple.cpp @@ -179,7 +179,7 @@ protected: // functions for instantiating functors and counters StatusCode instantiate_loki(); StatusCode instantiate_thor(); - StatusCode instantiate_dynamic_counters(); // Instantiation of the elements of Gaudi counters deques + StatusCode instantiate_dynamic_counters(); // Instantiation of the elements of Gaudi counters std::deque // function for preparing void thor StatusCode @@ -310,7 +310,7 @@ private: // Thor TBranch names Gaudi::Property<LHCb::FTuple::vec_vec_strings_t> m_funcfieldnames_suffix_thor{ this, "thor_functor_field_names", LHCb::FTuple::vec_vec_strings_t(), - "Contianer of list of ThOr functor TBranch names"}; + "Container of list of ThOr functor TBranch names"}; // user specified precision to cast thor functor output (currently this not available since Gaudi needs to allow this) Gaudi::Property<LHCb::FTuple::vec_vec_strings_t> m_funcreturntypes_thor{ @@ -420,7 +420,7 @@ template <class T> StatusCode FunTupleBase<T>::prepare_thor( LHCb::FTuple::vec_vec_functor_t<typename LHCb::InputTypeSignature<T>::ThOrSignature>& vec_vec_fun ) { if ( this->msgLevel( MSG::VERBOSE ) ) { this->verbose() << "Preparing ThOr functors" << endmsg; } - // retrive factory + // retrieve factory m_factory_thor.retrieve().ignore(); for ( auto& ptp : m_particletupleprops ) { // we need to ensure that the reference of the functor we pass to @@ -445,7 +445,7 @@ template <class T> StatusCode FunTupleBase<T>::prepare_thor_void( LHCb::FTuple::map_functor_t<typename LHCb::InputTypeSignature<T>::ThOrSignatureVoid>& map_fun ) { if ( this->msgLevel( MSG::VERBOSE ) ) { this->verbose() << "Preparing ThOr functors" << endmsg; } - // retrive factory + // retrieve factory m_factory_thor.retrieve().ignore(); for ( auto const& [key, functor_desc] : m_void_functors_thor ) { if ( this->msgLevel( MSG::DEBUG ) ) { @@ -474,7 +474,7 @@ template <class T> template <typename F, typename H> StatusCode FunTupleBase<T>::prepare_loki( F& fun_loki, std::vector<std::vector<F>>& func_loki_vec, H& factory_loki ) { MsgStream debug = this->debug(); - // Instantiate all the functors (the FunctorProp objects created cant hold some reason this info) + // Instantiate all the functors (the FunctorProp objects created can't hold some reason this info) if ( this->msgLevel( MSG::VERBOSE ) ) { this->verbose() << "Preparing LoKi functors" << endmsg; } m_preamble_loki = boost::algorithm::join( m_preamble_def_loki.value(), "\n" ); for ( const auto& ptp : m_particletupleprops ) { diff --git a/Phys/FunTuple/src/FunTupleEvent.cpp b/Phys/FunTuple/src/FunTupleEvent.cpp index 036433e71dc143c97830d2e5f01a17ace30317c7..51fa9a5ee09099036305988ef72d5f143a8b43ab 100755 --- a/Phys/FunTuple/src/FunTupleEvent.cpp +++ b/Phys/FunTuple/src/FunTupleEvent.cpp @@ -85,7 +85,7 @@ StatusCode FunTupleEventBase::initialize() { StatusCode FunTupleEventBase::prepare_thor_void( LHCb::FTuple::map_functor_t& map_fun ) { if ( this->msgLevel( MSG::VERBOSE ) ) { this->verbose() << "Preparing ThOr functors" << endmsg; } - // retrive factory + // retrieve factory m_factory_thor.retrieve().ignore(); for ( auto const& [key, functor_desc] : m_void_functors_thor ) { if ( this->msgLevel( MSG::DEBUG ) ) { diff --git a/Phys/FunTuple/src/InvalidValue.h b/Phys/FunTuple/src/InvalidValue.h index 81b0f3d595a4f42abb3f7078b895f9b80a36abfe..67a23dd8abb78268a710911f44217c0edefa60c9 100644 --- a/Phys/FunTuple/src/InvalidValue.h +++ b/Phys/FunTuple/src/InvalidValue.h @@ -31,7 +31,7 @@ * when the entry in the relations table is empty. Note that the "MAP_INPUT" functor can also * return a custom invalid value for the external functor * if a static member variable ("invalid_value") exists in the external functor - * class defintion, for example see F.BKGCAT (Functors::detail::Background_Category). + * class definition, for example see F.BKGCAT (Functors::detail::Background_Category). * * @see Functors::detail::MapRelInputToFunOutput */ diff --git a/Phys/FunTuple/src/MakeDummyData.cpp b/Phys/FunTuple/src/MakeDummyData.cpp index 1a95badb6654509c169ece525ccfebadefe07608..3c981f99822baed860cbd4c1ee45ff94ce54eead 100755 --- a/Phys/FunTuple/src/MakeDummyData.cpp +++ b/Phys/FunTuple/src/MakeDummyData.cpp @@ -1,4 +1,4 @@ -/*****************************************************************************\ +/***************************************************************************** \ * (c) Copyright 2020-2023 CERN for the benefit of the LHCb Collaboration * * * This software is distributed under the terms of the GNU General Public * @@ -532,7 +532,7 @@ public: const std::map<std::string, std::string> id_to_descriptor = { {"pion", "pi+"}, {"kaon", "K+"}, {"muon", "mu+"}, {"electron", "e+"}, {"proton", "p+"}}; - // check if the specified particle exists in predifined map + // check if the specified particle exists in predefined map const auto result = id_to_descriptor.find( m_particleid.value() ); if ( result == id_to_descriptor.end() ) { return Error( "Unknown ParticleID value: " + m_particleid.value() ); }