diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml new file mode 100644 index 0000000000..98c6418513 --- /dev/null +++ b/.github/workflows/spdx.yml @@ -0,0 +1,14 @@ +name: spdx + +on: + pull_request + +jobs: + check-spdx-headers: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - uses: enarx/spdx@5e6fecdee147bd4cab97893c71d638280e280e66 + with: + licenses: LGPL-3.0-or-later JSA diff --git a/LICENSE.JSA b/LICENSE.JSA new file mode 100644 index 0000000000..317a6658e9 --- /dev/null +++ b/LICENSE.JSA @@ -0,0 +1,33 @@ + +Copyright (c) 2020, Jefferson Science Associates, LLC. All Rights Reserved. Redistribution +and use in source and binary forms, with or without modification, are permitted as a +licensed user provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or other + materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products derived + from this software without specific prior written permission. + +This material resulted from work developed under a United States Government Contract. +The Government retains a paid-up, nonexclusive, irrevocable worldwide license in such +copyrighted data to reproduce, distribute copies to the public, prepare derivative works, +perform publicly and display publicly and to permit others to do so. + +THIS SOFTWARE IS PROVIDED BY JEFFERSON SCIENCE ASSOCIATES LLC "AS IS" AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +JEFFERSON SCIENCE ASSOCIATES, LLC OR THE U.S. GOVERNMENT BE LIABLE TO LICENSEE OR ANY +THIRD PARTES FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +Authors: David Lawrence, Nathan Brei, Paul Mattione + +Origin repository: http://github.com/eic/EICrecon diff --git a/NOTICE.md b/NOTICE.md index d112a346cd..c119ea337c 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -1,10 +1,17 @@ +# Notices for EICrecon -Software contained in the repository exists in the public domain -except where an alternate LICENSE.md file exists. Any other -LICENSE.md file occurring in this repository will apply to the -directory it resides in and all subdirectories from there except -where another LICENSE.md file exists. +This content is produced and maintained by the ePIC collaboration. -By contributing to this repository in any directory on any branch, -you are consenting to that contribution being entered into the public -domain. +## Trademarks + +Jefferson Lab is a trademark of United States Department of Energy. + +## Copyright + +All content is the property of the respective authors or their employers. For more information regarding authorship of content, please consult the listed source code repository logs. + +## Declared Project Licenses + +Software contained in this repository exists in the public domain unless indicated otherwise by the file header. By contributing to this repository in any directory on any branch, you are consenting to that your contribution will be licensed under the GNU Lesser General Public License version 3, or any later version. + +Any other LICENSE.md file occurring in this repository will apply to the files in the directory it resides in and in all subdirectories from there unless indicated otherwise by the file header and except where another LICENSE.md file exists. diff --git a/src/algorithms/calorimetry/CalorimeterClusterRecoCoGConfig.h b/src/algorithms/calorimetry/CalorimeterClusterRecoCoGConfig.h index f6ea18e2e2..86bb936f19 100644 --- a/src/algorithms/calorimetry/CalorimeterClusterRecoCoGConfig.h +++ b/src/algorithms/calorimetry/CalorimeterClusterRecoCoGConfig.h @@ -1,5 +1,5 @@ -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023 - 2024, Wouter Deconinck, Sebouh Paul #pragma once diff --git a/src/algorithms/calorimetry/CalorimeterHitsMergerConfig.h b/src/algorithms/calorimetry/CalorimeterHitsMergerConfig.h index 9d5f92df6c..a18b930d81 100644 --- a/src/algorithms/calorimetry/CalorimeterHitsMergerConfig.h +++ b/src/algorithms/calorimetry/CalorimeterHitsMergerConfig.h @@ -1,5 +1,5 @@ -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Wouter Deconinck #pragma once diff --git a/src/algorithms/interfaces/WithPodConfig.h b/src/algorithms/interfaces/WithPodConfig.h index ac5a113ceb..4c3b15a4b1 100644 --- a/src/algorithms/interfaces/WithPodConfig.h +++ b/src/algorithms/interfaces/WithPodConfig.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once namespace eicrecon { diff --git a/src/algorithms/meta/SubDivideFunctors.h b/src/algorithms/meta/SubDivideFunctors.h index 090b54ad89..90e26182f6 100644 --- a/src/algorithms/meta/SubDivideFunctors.h +++ b/src/algorithms/meta/SubDivideFunctors.h @@ -1,6 +1,6 @@ -// Copyright 2024, Simon Gardner -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2024, Simon Gardner + #pragma once #include diff --git a/src/algorithms/pid/IrtCherenkovParticleID.h b/src/algorithms/pid/IrtCherenkovParticleID.h index ae7763ab64..4cb2c6355b 100644 --- a/src/algorithms/pid/IrtCherenkovParticleID.h +++ b/src/algorithms/pid/IrtCherenkovParticleID.h @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks #pragma once diff --git a/src/algorithms/pid/IrtCherenkovParticleIDConfig.h b/src/algorithms/pid/IrtCherenkovParticleIDConfig.h index 7f0245e367..36a1f86abf 100644 --- a/src/algorithms/pid/IrtCherenkovParticleIDConfig.h +++ b/src/algorithms/pid/IrtCherenkovParticleIDConfig.h @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks #pragma once diff --git a/src/algorithms/pid/MergeTracks.cc b/src/algorithms/pid/MergeTracks.cc index 41087a91fb..df77927549 100644 --- a/src/algorithms/pid/MergeTracks.cc +++ b/src/algorithms/pid/MergeTracks.cc @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks #include "MergeTracks.h" diff --git a/src/algorithms/pid/MergeTracks.h b/src/algorithms/pid/MergeTracks.h index abb5520e13..d14983dc75 100644 --- a/src/algorithms/pid/MergeTracks.h +++ b/src/algorithms/pid/MergeTracks.h @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks // merge together TrackSegments, sorting their TrackPoints by time /* FIXME: only VectorMember `points` is combined, which is all that is needed diff --git a/src/algorithms/pid/ParticlesWithPID.cc b/src/algorithms/pid/ParticlesWithPID.cc index 777f8a93d5..a5f351b6e3 100644 --- a/src/algorithms/pid/ParticlesWithPID.cc +++ b/src/algorithms/pid/ParticlesWithPID.cc @@ -1,4 +1,4 @@ -// Original licence: SPDX-License-Identifier: LGPL-3.0-or-later +// SPDX-License-Identifier: LGPL-3.0-or-later // Copyright (C) 2022, 2023, Sylvester Joosten, Wouter Deconinck, Dmitry Romanov, Christopher Dilks #include "ParticlesWithPID.h" diff --git a/src/algorithms/pid/ParticlesWithPID.h b/src/algorithms/pid/ParticlesWithPID.h index ccd26b7d6f..282e6202c9 100644 --- a/src/algorithms/pid/ParticlesWithPID.h +++ b/src/algorithms/pid/ParticlesWithPID.h @@ -1,4 +1,4 @@ -// Original licence header: SPDX-License-Identifier: LGPL-3.0-or-later +// SPDX-License-Identifier: LGPL-3.0-or-later // Copyright (C) 2022, 2023, Sylvester Joosten, Wouter Deconinck, Dmitry Romanov, Christopher Dilks diff --git a/src/algorithms/pid/ParticlesWithPIDConfig.h b/src/algorithms/pid/ParticlesWithPIDConfig.h index b657576cd4..7674137e75 100644 --- a/src/algorithms/pid/ParticlesWithPIDConfig.h +++ b/src/algorithms/pid/ParticlesWithPIDConfig.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/pid/Tools.h b/src/algorithms/pid/Tools.h index b74d936fa9..b2d03f0e34 100644 --- a/src/algorithms/pid/Tools.h +++ b/src/algorithms/pid/Tools.h @@ -1,5 +1,5 @@ -// Copyright 2023, Alexander Kiselev, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Alexander Kiselev, Christopher Dilks // // Common functions for PID algorithms // Several methods ported from Juggler's JugPID `IRTAlgorithmServices` diff --git a/src/algorithms/reco/ElectronReconstructionConfig.h b/src/algorithms/reco/ElectronReconstructionConfig.h index 4f025ad8d6..4c837b0ee7 100644 --- a/src/algorithms/reco/ElectronReconstructionConfig.h +++ b/src/algorithms/reco/ElectronReconstructionConfig.h @@ -1,4 +1,5 @@ -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Daniel Brandenburg #pragma once diff --git a/src/algorithms/tracking/CKFTrackingConfig.h b/src/algorithms/tracking/CKFTrackingConfig.h index 271e6f0803..ca1b0ec38b 100644 --- a/src/algorithms/tracking/CKFTrackingConfig.h +++ b/src/algorithms/tracking/CKFTrackingConfig.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/tracking/IterativeVertexFinder.cc b/src/algorithms/tracking/IterativeVertexFinder.cc index 432918403f..a08557997c 100644 --- a/src/algorithms/tracking/IterativeVertexFinder.cc +++ b/src/algorithms/tracking/IterativeVertexFinder.cc @@ -1,6 +1,5 @@ -// Created by Joe Osborn -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Joe Osborn #include "IterativeVertexFinder.h" diff --git a/src/algorithms/tracking/IterativeVertexFinder.h b/src/algorithms/tracking/IterativeVertexFinder.h index b666f99861..19932b3bdc 100644 --- a/src/algorithms/tracking/IterativeVertexFinder.h +++ b/src/algorithms/tracking/IterativeVertexFinder.h @@ -1,6 +1,5 @@ -// Created by Joe Osborn -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Joe Osborn #pragma once diff --git a/src/algorithms/tracking/OrthogonalTrackSeedingConfig.h b/src/algorithms/tracking/OrthogonalTrackSeedingConfig.h index 48c281c24b..fcb44916c2 100644 --- a/src/algorithms/tracking/OrthogonalTrackSeedingConfig.h +++ b/src/algorithms/tracking/OrthogonalTrackSeedingConfig.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/tracking/TrackParamTruthInit.cc b/src/algorithms/tracking/TrackParamTruthInit.cc index 9c29f47401..b164ea8ca7 100644 --- a/src/algorithms/tracking/TrackParamTruthInit.cc +++ b/src/algorithms/tracking/TrackParamTruthInit.cc @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include "TrackParamTruthInit.h" diff --git a/src/algorithms/tracking/TrackParamTruthInit.h b/src/algorithms/tracking/TrackParamTruthInit.h index 7f9de2c0e9..9051bc937e 100644 --- a/src/algorithms/tracking/TrackParamTruthInit.h +++ b/src/algorithms/tracking/TrackParamTruthInit.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/tracking/TrackParamTruthInitConfig.h b/src/algorithms/tracking/TrackParamTruthInitConfig.h index b7a3b22136..f725ce5138 100644 --- a/src/algorithms/tracking/TrackParamTruthInitConfig.h +++ b/src/algorithms/tracking/TrackParamTruthInitConfig.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/tracking/TrackProjector.h b/src/algorithms/tracking/TrackProjector.h index d1aa9fa5d2..b15bf3807c 100644 --- a/src/algorithms/tracking/TrackProjector.h +++ b/src/algorithms/tracking/TrackProjector.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/tracking/TrackSeeding.cc b/src/algorithms/tracking/TrackSeeding.cc index 4491473623..39261f815a 100644 --- a/src/algorithms/tracking/TrackSeeding.cc +++ b/src/algorithms/tracking/TrackSeeding.cc @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include "TrackSeeding.h" diff --git a/src/algorithms/tracking/TrackSeeding.h b/src/algorithms/tracking/TrackSeeding.h index 2f0b8d885b..e9b7ad8597 100644 --- a/src/algorithms/tracking/TrackSeeding.h +++ b/src/algorithms/tracking/TrackSeeding.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/algorithms/tracking/TrackerMeasurementFromHits.h b/src/algorithms/tracking/TrackerMeasurementFromHits.h index 5c7de0275a..40c2dbe77f 100644 --- a/src/algorithms/tracking/TrackerMeasurementFromHits.h +++ b/src/algorithms/tracking/TrackerMeasurementFromHits.h @@ -1,9 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// Original header from Gaudi algorithm // SPDX-License-Identifier: LGPL-3.0-or-later // Copyright (C) 2022 Whitney Armstrong, Sylvester Joosten, Wouter Deconinck, Shujie Li -// TODO refactor header when license is clear #pragma once diff --git a/src/detectors/B0ECAL/B0ECAL.cc b/src/detectors/B0ECAL/B0ECAL.cc index 6b4f8e211a..94945be149 100644 --- a/src/detectors/B0ECAL/B0ECAL.cc +++ b/src/detectors/B0ECAL/B0ECAL.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/detectors/B0TRK/B0TRK.cc b/src/detectors/B0TRK/B0TRK.cc index a6f0473391..ef9c37fb35 100644 --- a/src/detectors/B0TRK/B0TRK.cc +++ b/src/detectors/B0TRK/B0TRK.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc index 2802e780df..d83767d5d8 100644 --- a/src/detectors/BEMC/BEMC.cc +++ b/src/detectors/BEMC/BEMC.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/detectors/BTOF/BTOF.cc b/src/detectors/BTOF/BTOF.cc index 113912c8c8..edf187447c 100644 --- a/src/detectors/BTOF/BTOF.cc +++ b/src/detectors/BTOF/BTOF.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/BTRK/BTRK.cc b/src/detectors/BTRK/BTRK.cc index 18693f5c81..5d6ef6c563 100644 --- a/src/detectors/BTRK/BTRK.cc +++ b/src/detectors/BTRK/BTRK.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/BVTX/BVTX.cc b/src/detectors/BVTX/BVTX.cc index 4c60d8d240..4c3c49e635 100644 --- a/src/detectors/BVTX/BVTX.cc +++ b/src/detectors/BVTX/BVTX.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/DIRC/DIRC.cc b/src/detectors/DIRC/DIRC.cc index f8c64fa58a..20a32a53e4 100644 --- a/src/detectors/DIRC/DIRC.cc +++ b/src/detectors/DIRC/DIRC.cc @@ -1,7 +1,5 @@ -// Copyright 2022,2023 Christopher Dilks, Nilanga Wickramaarachchi -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 - 2023, Christopher Dilks, Nilanga Wickramaarachchi #include #include diff --git a/src/detectors/DRICH/DRICH.cc b/src/detectors/DRICH/DRICH.cc index d244dd9c5f..b8dfe90a54 100644 --- a/src/detectors/DRICH/DRICH.cc +++ b/src/detectors/DRICH/DRICH.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks, Luigi Dello Stritto -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 - 2023, Christopher Dilks, Luigi Dello Stritto #include #include diff --git a/src/detectors/ECTOF/ECTOF.cc b/src/detectors/ECTOF/ECTOF.cc index e26a1caf63..7fa552b0c0 100644 --- a/src/detectors/ECTOF/ECTOF.cc +++ b/src/detectors/ECTOF/ECTOF.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/ECTRK/ECTRK.cc b/src/detectors/ECTRK/ECTRK.cc index 621e665c53..9833d5db22 100644 --- a/src/detectors/ECTRK/ECTRK.cc +++ b/src/detectors/ECTRK/ECTRK.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/EEMC/EEMC.cc b/src/detectors/EEMC/EEMC.cc index 48d9311b23..c25b617726 100644 --- a/src/detectors/EEMC/EEMC.cc +++ b/src/detectors/EEMC/EEMC.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/detectors/EHCAL/EHCAL.cc b/src/detectors/EHCAL/EHCAL.cc index 69596c9a60..1fe0e85f73 100644 --- a/src/detectors/EHCAL/EHCAL.cc +++ b/src/detectors/EHCAL/EHCAL.cc @@ -1,7 +1,5 @@ -// Copyright 2023, Friederike Bock -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Friederike Bock #include #include diff --git a/src/detectors/FEMC/FEMC.cc b/src/detectors/FEMC/FEMC.cc index 2921c3c593..c91e653631 100644 --- a/src/detectors/FEMC/FEMC.cc +++ b/src/detectors/FEMC/FEMC.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/detectors/FOFFMTRK/FOFFMTRK.cc b/src/detectors/FOFFMTRK/FOFFMTRK.cc index 4fea2aa927..ff2a499bfd 100644 --- a/src/detectors/FOFFMTRK/FOFFMTRK.cc +++ b/src/detectors/FOFFMTRK/FOFFMTRK.cc @@ -1,7 +1,5 @@ -// Copyright 2023, Alex Jentsch -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Alex Jentsch #include #include diff --git a/src/detectors/LOWQ2/LOWQ2.cc b/src/detectors/LOWQ2/LOWQ2.cc index 361b780d5f..c1d02ddd7c 100644 --- a/src/detectors/LOWQ2/LOWQ2.cc +++ b/src/detectors/LOWQ2/LOWQ2.cc @@ -1,7 +1,5 @@ -// Copyright 2023-2024, Simon Gardner -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023 - 2024, Simon Gardner #include #include diff --git a/src/detectors/LUMISPECCAL/LUMISPECCAL.cc b/src/detectors/LUMISPECCAL/LUMISPECCAL.cc index f5937494aa..857f08831e 100644 --- a/src/detectors/LUMISPECCAL/LUMISPECCAL.cc +++ b/src/detectors/LUMISPECCAL/LUMISPECCAL.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, David Lawrence #include #include diff --git a/src/detectors/MPGD/MPGD.cc b/src/detectors/MPGD/MPGD.cc index 8cb695596c..1430ee4b9f 100644 --- a/src/detectors/MPGD/MPGD.cc +++ b/src/detectors/MPGD/MPGD.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include diff --git a/src/detectors/RPOTS/RPOTS.cc b/src/detectors/RPOTS/RPOTS.cc index 89c85215af..b9cbd7e89f 100644 --- a/src/detectors/RPOTS/RPOTS.cc +++ b/src/detectors/RPOTS/RPOTS.cc @@ -1,7 +1,5 @@ -// Copyright 2023, Alex Jentsch -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Alex Jentsch #include #include diff --git a/src/detectors/ZDC/ZDC.cc b/src/detectors/ZDC/ZDC.cc index 90917a4203..a617223a72 100644 --- a/src/detectors/ZDC/ZDC.cc +++ b/src/detectors/ZDC/ZDC.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/extensions/jana/JChainMultifactoryGeneratorT.h b/src/extensions/jana/JChainMultifactoryGeneratorT.h index 4f75ce23c6..ba49e8f412 100644 --- a/src/extensions/jana/JChainMultifactoryGeneratorT.h +++ b/src/extensions/jana/JChainMultifactoryGeneratorT.h @@ -1,6 +1,5 @@ - -// Copyright 2023, Jefferson Science Associates, LLC. -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/extensions/jana/JChainMultifactoryT.h b/src/extensions/jana/JChainMultifactoryT.h index 63412b544b..1c8c4afa0a 100644 --- a/src/extensions/jana/JChainMultifactoryT.h +++ b/src/extensions/jana/JChainMultifactoryT.h @@ -1,13 +1,8 @@ - -// Copyright 2023, Jefferson Science Associates, LLC. -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// - /** * JChainFactories aim to easier wrap framework independent algorithms * It is assumed multiple input data (controlled by input tags) diff --git a/src/extensions/jana/JOmniFactory.h b/src/extensions/jana/JOmniFactory.h index 4ee9aff7d8..e3a77dada6 100644 --- a/src/extensions/jana/JOmniFactory.h +++ b/src/extensions/jana/JOmniFactory.h @@ -1,6 +1,5 @@ -// Copyright 2023, Jefferson Science Associates, LLC. -// Subject to the terms in the LICENSE file found in the top-level directory. -// Created by Nathan Brei +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Nathan Brei #pragma once diff --git a/src/extensions/jana/JOmniFactoryGeneratorT.h b/src/extensions/jana/JOmniFactoryGeneratorT.h index 14ed7080b9..64033725f4 100644 --- a/src/extensions/jana/JOmniFactoryGeneratorT.h +++ b/src/extensions/jana/JOmniFactoryGeneratorT.h @@ -1,6 +1,5 @@ -// Copyright 2023, Jefferson Science Associates, LLC. -// Subject to the terms in the LICENSE file found in the top-level directory. -// Created by Nathan Brei +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Nathan Brei #pragma once diff --git a/src/extensions/spdlog/SpdlogExtensions.h b/src/extensions/spdlog/SpdlogExtensions.h index aeaeb8117f..63b7bb2b5c 100644 --- a/src/extensions/spdlog/SpdlogExtensions.h +++ b/src/extensions/spdlog/SpdlogExtensions.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/extensions/spdlog/SpdlogMixin.h b/src/extensions/spdlog/SpdlogMixin.h index b134daa334..a543392205 100644 --- a/src/extensions/spdlog/SpdlogMixin.h +++ b/src/extensions/spdlog/SpdlogMixin.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/factories/calorimetry/CalorimeterClusterRecoCoG_factory.h b/src/factories/calorimetry/CalorimeterClusterRecoCoG_factory.h index 228b42dca9..880166dd46 100644 --- a/src/factories/calorimetry/CalorimeterClusterRecoCoG_factory.h +++ b/src/factories/calorimetry/CalorimeterClusterRecoCoG_factory.h @@ -1,6 +1,5 @@ -// Copyright 2023, Wouter Deconinck -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Wouter Deconinck #pragma once diff --git a/src/factories/calorimetry/CalorimeterHitDigi_factory.h b/src/factories/calorimetry/CalorimeterHitDigi_factory.h index 98cf78c937..54cb123d61 100644 --- a/src/factories/calorimetry/CalorimeterHitDigi_factory.h +++ b/src/factories/calorimetry/CalorimeterHitDigi_factory.h @@ -1,5 +1,5 @@ -// Copyright 2023, Wouter Deconinck -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Wouter Deconinck #pragma once diff --git a/src/factories/calorimetry/CalorimeterTruthClustering_factory.h b/src/factories/calorimetry/CalorimeterTruthClustering_factory.h index 79a18e1d8f..a2ae749800 100644 --- a/src/factories/calorimetry/CalorimeterTruthClustering_factory.h +++ b/src/factories/calorimetry/CalorimeterTruthClustering_factory.h @@ -1,6 +1,5 @@ -// Copyright 2023, Wouter Deconinck -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Wouter Deconinck #pragma once diff --git a/src/factories/fardetectors/MatrixTransferStatic_factory.h b/src/factories/fardetectors/MatrixTransferStatic_factory.h index b762cd0db4..ed9cfb4f3a 100644 --- a/src/factories/fardetectors/MatrixTransferStatic_factory.h +++ b/src/factories/fardetectors/MatrixTransferStatic_factory.h @@ -1,6 +1,5 @@ -// Created by Alex Jentsch -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2023, Alex Jentsch #include #include "services/geometry/dd4hep/DD4hep_service.h" diff --git a/src/global/beam/beam.cc b/src/global/beam/beam.cc index d424e1b11d..3d26da8ef4 100644 --- a/src/global/beam/beam.cc +++ b/src/global/beam/beam.cc @@ -1,7 +1,5 @@ -// Copyright 2024, Simon Gardner -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Wouter Deconinck #include #include diff --git a/src/global/pid/IrtCherenkovParticleID_factory.cc b/src/global/pid/IrtCherenkovParticleID_factory.cc index dfca32fba8..2778e653a0 100644 --- a/src/global/pid/IrtCherenkovParticleID_factory.cc +++ b/src/global/pid/IrtCherenkovParticleID_factory.cc @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks #include "IrtCherenkovParticleID_factory.h" diff --git a/src/global/pid/IrtCherenkovParticleID_factory.h b/src/global/pid/IrtCherenkovParticleID_factory.h index 5b9bdef8f8..4aa2a68674 100644 --- a/src/global/pid/IrtCherenkovParticleID_factory.h +++ b/src/global/pid/IrtCherenkovParticleID_factory.h @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks #pragma once diff --git a/src/global/pid/MergeTrack_factory.h b/src/global/pid/MergeTrack_factory.h index 89a8f3900d..9becded67d 100644 --- a/src/global/pid/MergeTrack_factory.h +++ b/src/global/pid/MergeTrack_factory.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022 - 2024 Christopher Dilks, Wouter Deconinck -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2024, Christopher Dilks, Wouter Deconinck #pragma once diff --git a/src/global/pid/ParticlesWithPID_factory.h b/src/global/pid/ParticlesWithPID_factory.h index e01f879b58..4bba60909e 100644 --- a/src/global/pid/ParticlesWithPID_factory.h +++ b/src/global/pid/ParticlesWithPID_factory.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #pragma once diff --git a/src/global/pid/RichTrackConfig.h b/src/global/pid/RichTrackConfig.h index 906e87e561..63525d4e8a 100644 --- a/src/global/pid/RichTrackConfig.h +++ b/src/global/pid/RichTrackConfig.h @@ -1,5 +1,5 @@ -// Copyright 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Christopher Dilks #pragma once diff --git a/src/global/pid/RichTrack_factory.cc b/src/global/pid/RichTrack_factory.cc index f47535653e..ed46d4b918 100644 --- a/src/global/pid/RichTrack_factory.cc +++ b/src/global/pid/RichTrack_factory.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #include "RichTrack_factory.h" diff --git a/src/global/pid/RichTrack_factory.h b/src/global/pid/RichTrack_factory.h index 463d392403..33dcf187ac 100644 --- a/src/global/pid/RichTrack_factory.h +++ b/src/global/pid/RichTrack_factory.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023 Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #pragma once diff --git a/src/global/tracking/TrackSeeding_factory.h b/src/global/tracking/TrackSeeding_factory.h index 299a8fb7dd..4642f448cf 100644 --- a/src/global/tracking/TrackSeeding_factory.h +++ b/src/global/tracking/TrackSeeding_factory.h @@ -1,6 +1,5 @@ -// Created by Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2023, Wouter Deconinck #pragma once diff --git a/src/services/geometry/acts/ACTSGeo_service.cc b/src/services/geometry/acts/ACTSGeo_service.cc index 78fad80d79..2eb1dc3daa 100644 --- a/src/services/geometry/acts/ACTSGeo_service.cc +++ b/src/services/geometry/acts/ACTSGeo_service.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include "ACTSGeo_service.h" diff --git a/src/services/geometry/acts/acts.cc b/src/services/geometry/acts/acts.cc index a0e9c7f104..4d274b85ee 100644 --- a/src/services/geometry/acts/acts.cc +++ b/src/services/geometry/acts/acts.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/services/geometry/dd4hep/dd4hep.cc b/src/services/geometry/dd4hep/dd4hep.cc index 90ef62bfbc..ac8f224e83 100644 --- a/src/services/geometry/dd4hep/dd4hep.cc +++ b/src/services/geometry/dd4hep/dd4hep.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/services/geometry/richgeo/ActsGeo.cc b/src/services/geometry/richgeo/ActsGeo.cc index adaea676e7..6617ec9c43 100644 --- a/src/services/geometry/richgeo/ActsGeo.cc +++ b/src/services/geometry/richgeo/ActsGeo.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #include "ActsGeo.h" diff --git a/src/services/geometry/richgeo/ActsGeo.h b/src/services/geometry/richgeo/ActsGeo.h index d88c6180d6..16f0d7fa00 100644 --- a/src/services/geometry/richgeo/ActsGeo.h +++ b/src/services/geometry/richgeo/ActsGeo.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks // bind IRT and DD4hep geometries for the RICHes #pragma once diff --git a/src/services/geometry/richgeo/IrtGeo.cc b/src/services/geometry/richgeo/IrtGeo.cc index f2a1f7fce1..6a421b2347 100644 --- a/src/services/geometry/richgeo/IrtGeo.cc +++ b/src/services/geometry/richgeo/IrtGeo.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #include "IrtGeo.h" diff --git a/src/services/geometry/richgeo/IrtGeo.h b/src/services/geometry/richgeo/IrtGeo.h index 8d930b081e..f30240c48c 100644 --- a/src/services/geometry/richgeo/IrtGeo.h +++ b/src/services/geometry/richgeo/IrtGeo.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks // bind IRT and DD4hep geometries for the RICHes #pragma once diff --git a/src/services/geometry/richgeo/IrtGeoDRICH.cc b/src/services/geometry/richgeo/IrtGeoDRICH.cc index d6f4cf1848..90962c1de5 100644 --- a/src/services/geometry/richgeo/IrtGeoDRICH.cc +++ b/src/services/geometry/richgeo/IrtGeoDRICH.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #include "IrtGeoDRICH.h" diff --git a/src/services/geometry/richgeo/IrtGeoDRICH.h b/src/services/geometry/richgeo/IrtGeoDRICH.h index 23d86f37c5..5907d8b404 100644 --- a/src/services/geometry/richgeo/IrtGeoDRICH.h +++ b/src/services/geometry/richgeo/IrtGeoDRICH.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks // bind IRT and DD4hep geometries for the dRICH #pragma once diff --git a/src/services/geometry/richgeo/IrtGeoPFRICH.cc b/src/services/geometry/richgeo/IrtGeoPFRICH.cc index 55dde3d8eb..e7acc47a0f 100644 --- a/src/services/geometry/richgeo/IrtGeoPFRICH.cc +++ b/src/services/geometry/richgeo/IrtGeoPFRICH.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #include "IrtGeoPFRICH.h" diff --git a/src/services/geometry/richgeo/IrtGeoPFRICH.h b/src/services/geometry/richgeo/IrtGeoPFRICH.h index 35aa449b73..172d7d9c45 100644 --- a/src/services/geometry/richgeo/IrtGeoPFRICH.h +++ b/src/services/geometry/richgeo/IrtGeoPFRICH.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks // bind IRT and DD4hep geometries for the pfRICH #pragma once diff --git a/src/services/geometry/richgeo/ReadoutGeo.cc b/src/services/geometry/richgeo/ReadoutGeo.cc index 0bdebc13ad..ad0a40efc2 100644 --- a/src/services/geometry/richgeo/ReadoutGeo.cc +++ b/src/services/geometry/richgeo/ReadoutGeo.cc @@ -1,7 +1,5 @@ +// SPDX-License-Identifier: JSA // Copyright (C) 2023, Christopher Dilks, Luigi Dello Stritto -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// #include "ReadoutGeo.h" diff --git a/src/services/geometry/richgeo/ReadoutGeo.h b/src/services/geometry/richgeo/ReadoutGeo.h index 00c952a10e..30b57ce9bd 100644 --- a/src/services/geometry/richgeo/ReadoutGeo.h +++ b/src/services/geometry/richgeo/ReadoutGeo.h @@ -1,6 +1,5 @@ +// SPDX-License-Identifier: JSA // Copyright (C) 2023, Christopher Dilks, Luigi Dello Stritto -// Subject to the terms in the LICENSE file found in the top-level directory. -// // helper functions for RICH readout diff --git a/src/services/geometry/richgeo/RichGeo.h b/src/services/geometry/richgeo/RichGeo.h index f8f38d7d02..bbdfc5519f 100644 --- a/src/services/geometry/richgeo/RichGeo.h +++ b/src/services/geometry/richgeo/RichGeo.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #pragma once diff --git a/src/services/geometry/richgeo/RichGeo_service.cc b/src/services/geometry/richgeo/RichGeo_service.cc index 0f8ac714b9..c0c2e98e5c 100644 --- a/src/services/geometry/richgeo/RichGeo_service.cc +++ b/src/services/geometry/richgeo/RichGeo_service.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #include "RichGeo_service.h" diff --git a/src/services/geometry/richgeo/RichGeo_service.h b/src/services/geometry/richgeo/RichGeo_service.h index 1cb7c04551..e292b13449 100644 --- a/src/services/geometry/richgeo/RichGeo_service.h +++ b/src/services/geometry/richgeo/RichGeo_service.h @@ -1,5 +1,5 @@ -// Copyright (C) 2022, 2023, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. +// SPDX-License-Identifier: LGPL-3.0-or-later +// Copyright (C) 2022 - 2023, Christopher Dilks #pragma once diff --git a/src/services/geometry/richgeo/richgeo.cc b/src/services/geometry/richgeo/richgeo.cc index da7a90f7aa..b64a46880d 100644 --- a/src/services/geometry/richgeo/richgeo.cc +++ b/src/services/geometry/richgeo/richgeo.cc @@ -1,7 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later // Copyright (C) 2022, Christopher Dilks -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// #include #include diff --git a/src/services/io/podio/JEventSourcePODIO.cc b/src/services/io/podio/JEventSourcePODIO.cc index 6e37dfa079..b09b123077 100644 --- a/src/services/io/podio/JEventSourcePODIO.cc +++ b/src/services/io/podio/JEventSourcePODIO.cc @@ -1,6 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence // // This is a JANA event source that uses PODIO to read from a ROOT // file created using the EDM4hep Data Model. diff --git a/src/services/io/podio/JEventSourcePODIO.h b/src/services/io/podio/JEventSourcePODIO.h index 21dc45c999..7594493791 100644 --- a/src/services/io/podio/JEventSourcePODIO.h +++ b/src/services/io/podio/JEventSourcePODIO.h @@ -1,6 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #pragma once diff --git a/src/services/io/podio/JEventSourcePODIOLegacy.cc b/src/services/io/podio/JEventSourcePODIOLegacy.cc index f250d8c401..0c086e05b4 100644 --- a/src/services/io/podio/JEventSourcePODIOLegacy.cc +++ b/src/services/io/podio/JEventSourcePODIOLegacy.cc @@ -1,6 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence // // This is a JANA event source that uses PODIO to read from a ROOT // file created using the EDM4hep Data Model. diff --git a/src/services/io/podio/JEventSourcePODIOLegacy.h b/src/services/io/podio/JEventSourcePODIOLegacy.h index fcb9369b97..adc296ee80 100644 --- a/src/services/io/podio/JEventSourcePODIOLegacy.h +++ b/src/services/io/podio/JEventSourcePODIOLegacy.h @@ -1,6 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #pragma once diff --git a/src/services/io/podio/datamodel_LinkDef.h b/src/services/io/podio/datamodel_LinkDef.h index 1dba35ae28..2b0bde4123 100644 --- a/src/services/io/podio/datamodel_LinkDef.h +++ b/src/services/io/podio/datamodel_LinkDef.h @@ -1,6 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence // // This is used when generating the ROOT dictionary file needed to define // the vector types like "vector". diff --git a/src/services/io/podio/make_datamodel_glue.py b/src/services/io/podio/make_datamodel_glue.py index d45a8252e9..e33f919765 100644 --- a/src/services/io/podio/make_datamodel_glue.py +++ b/src/services/io/podio/make_datamodel_glue.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -# Copyright 2022, David Lawrence -# Subject to the terms in the LICENSE file found in the top-level directory. +# SPDX-License-Identifier: JSA +# Copyright (C) 2022 David Lawrence # # This is a stop gap and not intended for long term. 2022-07-09 DL # diff --git a/src/services/io/podio/podio.cc b/src/services/io/podio/podio.cc index f7cb6a6acb..747898b591 100644 --- a/src/services/io/podio/podio.cc +++ b/src/services/io/podio/podio.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/services/log/Log_service.cc b/src/services/log/Log_service.cc index fd83730ed9..f1fd1ea9d5 100644 --- a/src/services/log/Log_service.cc +++ b/src/services/log/Log_service.cc @@ -1,7 +1,6 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 Dmitry Romanov + #include "Log_service.h" #include diff --git a/src/services/log/log.cc b/src/services/log/log.cc index b1f6db3d37..14c253b639 100644 --- a/src/services/log/log.cc +++ b/src/services/log/log.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence #include #include diff --git a/src/services/rootfile/rootfile.cc b/src/services/rootfile/rootfile.cc index 01499013cd..f89336983b 100644 --- a/src/services/rootfile/rootfile.cc +++ b/src/services/rootfile/rootfile.cc @@ -1,6 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022 David Lawrence // #include diff --git a/src/tests/geometry_navigation_test/geometry_navigation_test.cc b/src/tests/geometry_navigation_test/geometry_navigation_test.cc index e451412ee9..929bd1ba98 100644 --- a/src/tests/geometry_navigation_test/geometry_navigation_test.cc +++ b/src/tests/geometry_navigation_test/geometry_navigation_test.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, David Lawrence #include diff --git a/src/tests/reco_test/reco_test.cc b/src/tests/reco_test/reco_test.cc index 447f119a5a..62d92bd0ae 100644 --- a/src/tests/reco_test/reco_test.cc +++ b/src/tests/reco_test/reco_test.cc @@ -1,19 +1,13 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, David Lawrence #include #include "GlobalReconstructionTest_processor.h" -//#include "JFactory_EcalBarrelRawCalorimeterHit.h.bck" -//#include "JFactory_RawCalorimeterHit_EcalBarrelRawCalorimeterHits.h.bck" extern "C" { void InitPlugin(JApplication *app) { InitJANAPlugin(app); app->Add(new GlobalReconstructionTest_processor(app)); - //app->Add(new JFactoryGeneratorT()); - //app->Add(new JFactoryGeneratorT()); } } diff --git a/src/tests/track_propagation_test/track_propagation_test.cc b/src/tests/track_propagation_test/track_propagation_test.cc index d43b59a782..0a5f18e803 100644 --- a/src/tests/track_propagation_test/track_propagation_test.cc +++ b/src/tests/track_propagation_test/track_propagation_test.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, David Lawrence #include diff --git a/src/tests/tracking_test/tracking_test.cc b/src/tests/tracking_test/tracking_test.cc index d81de9dfcf..52d83e4906 100644 --- a/src/tests/tracking_test/tracking_test.cc +++ b/src/tests/tracking_test/tracking_test.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, David Lawrence #include diff --git a/src/utilities/dump_flags/dump_flags.cc b/src/utilities/dump_flags/dump_flags.cc index a5fec81ee2..f2d6c8df99 100644 --- a/src/utilities/dump_flags/dump_flags.cc +++ b/src/utilities/dump_flags/dump_flags.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include diff --git a/src/utilities/eicrecon/eicrecon.cc b/src/utilities/eicrecon/eicrecon.cc index b19e43381b..ca442ce620 100644 --- a/src/utilities/eicrecon/eicrecon.cc +++ b/src/utilities/eicrecon/eicrecon.cc @@ -1,7 +1,5 @@ -// Copyright 2022, David Lawrence -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, David Lawrence #include #include diff --git a/src/utilities/janatop/janatop.cc b/src/utilities/janatop/janatop.cc index c2d07ed9be..8a0a04cf01 100644 --- a/src/utilities/janatop/janatop.cc +++ b/src/utilities/janatop/janatop.cc @@ -1,7 +1,5 @@ -// Copyright 2022, Dmitry Romanov -// Subject to the terms in the LICENSE file found in the top-level directory. -// -// +// SPDX-License-Identifier: JSA +// Copyright (C) 2022, Dmitry Romanov #include #include