Commit 102cdf4a authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'linter_filter' into 'master' 

Linter: Filter Output

See merge request allpix-squared/allpix-squared!546
parents b0f4c81a 698a45dc

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ fmt:cc7-llvm-lint: 
    extends: .format

    script:

        - cmake -GNinja -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_LCIOWriter=ON -DCMAKE_BUILD_TYPE=RELEASE -DLCIO_DIR=$LCIO_DIR ..

        - ninja check-lint

        - ninja check-lint 2> /dev/null



fmt:cmake-lint:

    extends: .format
@@ -415,7 +415,7 @@ cmp:doxygen: 
    script:

        - source ../.ci/init_x86_64.sh

        - cmake -DBUILD_DOCS_ONLY=ON ..

        - make Allpix-reference

        - make Allpix-reference 1> /dev/null

        - mv reference/html ../public/reference



# Compile LaTeX user manual:

src/core/module/exceptions.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ namespace allpix { 
        /**

         * @brief Constructs request to interrupt event processing

         */

        MissingDependenciesException() {}

        MissingDependenciesException() = default;

    };

} // namespace allpix

src/tools/ROOT.h

+4 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ namespace allpix { 
         *

         * Based on get in https://root.cern/doc/master/classROOT_1_1TThreadedObject.html, optimized for faster retrieval.

         */

        std::shared_ptr<T> Get() {

        std::shared_ptr<T> Get() { // NOLINT

            auto idx = ThreadPool::threadNum();

            auto& object = objects_[idx];

            if(!object) {
@@ -207,7 +207,7 @@ namespace allpix { 
         *

         * Based on merging in https://root.cern/doc/master/classROOT_1_1TThreadedObject.html.

         */

        std::shared_ptr<T> Merge() {

        std::shared_ptr<T> Merge() { // NOLINT

            ROOT::TThreadedObjectUtils::MergeFunctionType<T> mergeFunction = ROOT::TThreadedObjectUtils::MergeTObjects<T>;

            if(is_merged_) {

                return objects_[0];
@@ -270,9 +270,9 @@ namespace allpix { 
        static std::mutex process_id_mutex;

        std::unique_lock<std::mutex> lock(process_id_mutex);



        auto pids = TProcessID::GetPIDs();

        auto* pids = TProcessID::GetPIDs();

        for(int i = 0; i < pids->GetEntries(); ++i) {

            auto pid_ptr = static_cast<TProcessID*>((*pids)[i]);

            auto* pid_ptr = static_cast<TProcessID*>((*pids)[i]);

            pid_ptr->Clear();

        }