From 516b922b38332874b2d9e57d2a1e22d18871b6c5 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Thu, 24 Sep 2026 09:09:37 +0200 Subject: [PATCH] updated licensing info --- AGENTS.md | 8 + CMakeLists.txt | 4 +- LICENSES/LGPL-2.1-or-later.txt | 459 ++++++++++++++++++ LICENSES/MIT.txt | 21 + README.md | 14 + RELEASE.md | 18 +- THIRD-PARTY-NOTICES.txt | 137 ++++++ cmake/FindSphinx.cmake | 2 + cmake/helpers.cmake | 1 + cmake/package_config.cmake | 2 + cmake/project-config.cmake.in | 1 + conda-recipe/meta.yaml | 7 +- docs/conf.py.in | 1 + etc/add_license.py | 21 +- etc/update_version.py | 1 - include/aare/ProducerConsumerQueue.hpp | 10 +- include/aare/ROI.hpp | 1 + include/aare/ROIGeometry.hpp | 1 + .../hist/PedestalTrackingPixelHistogram.hpp | 1 + include/aare/hist/PixelHistogram.hpp | 1 + include/aare/hist/PixelHistogramImpl.hpp | 1 + include/aare/utils/math_helpers.hpp | 1 + pyproject.toml | 5 +- python/aare/Cluster.py | 1 + python/aare/_version.py | 1 + python/src/bind_Defs.hpp | 1 + python/src/bind_Eta.hpp | 1 + python/src/module_config.hpp | 1 + python/tests/test_CtbRawFile.py | 1 + python/tests/test_FastPedestal.py | 1 + python/tests/test_InterpolationAPI.py | 1 + python/tests/test_Pedestal.py | 1 + python/tests/test_ROI.py | 1 + python/tests/test_RawMasterFile.py | 1 + python/tests/test_Transformation.py | 1 + python/tests/test_interpolation_simulated.py | 1 + src/Interpolation.test.cpp | 1 + src/NumpyHelpers.cpp | 2 +- src/ROI.cpp | 1 + src/ROI.test.cpp | 1 + src/ROIGeometry.cpp | 1 + src/hist/PedestalTrackingPixelHistogram.cpp | 1 + src/hist/PixelHistogram.test.cpp | 1 + src/hist/PixelHistogramImpl.test.cpp | 1 + src/to_string.cpp | 1 + tests/test_config.hpp.in | 1 + 46 files changed, 722 insertions(+), 20 deletions(-) create mode 100644 LICENSES/LGPL-2.1-or-later.txt create mode 100644 LICENSES/MIT.txt create mode 100644 THIRD-PARTY-NOTICES.txt diff --git a/AGENTS.md b/AGENTS.md index 7311e097..c4918858 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -188,6 +188,14 @@ headers never leak into the public API. Minuit2 is a private, namespace/module. - Start new source files with `SPDX-License-Identifier: MPL-2.0`, using the appropriate comment syntax. +- Code copied from other projects keeps its original license. Retain its + copyright and license notice, set the SPDX identifier to that license, and + list the license in `LICENSES/`, `pyproject.toml`, `conda-recipe/meta.yaml`, + and `README.md`. `etc/add_license.py` skips files with a license notice. +- When adding or bumping a fetched dependency that is compiled into the + Python extension, update its version and notice in + `THIRD-PARTY-NOTICES.txt` and the license expressions in `pyproject.toml` + and `conda-recipe/meta.yaml`. - Prefer descriptive names to comments that only restate the code. - Do not add a dependency unless the benefit justifies the packaging and deployment cost. diff --git a/CMakeLists.txt b/CMakeLists.txt index 89cb0e52..1998de15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ if(AARE_FETCH_MINUIT2) FetchContent_Declare( Minuit2 GIT_REPOSITORY https://github.com/GooFit/Minuit2.git - GIT_TAG master + GIT_TAG v6-40-02 UPDATE_DISCONNECTED 1) # Disable Minuit2 extras we don't need set(minuit2_mpi @@ -153,7 +153,7 @@ if(AARE_FETCH_ZMQ) FetchContent_Declare( libzmq GIT_REPOSITORY https://github.com/zeromq/libzmq.git - GIT_TAG v4.3.4 + GIT_TAG v4.3.5 PATCH_COMMAND ${ZMQ_PATCH_COMMAND} UPDATE_DISCONNECTED 1) # Disable unwanted options from libzmq diff --git a/LICENSES/LGPL-2.1-or-later.txt b/LICENSES/LGPL-2.1-or-later.txt new file mode 100644 index 00000000..7f01a06c --- /dev/null +++ b/LICENSES/LGPL-2.1-or-later.txt @@ -0,0 +1,459 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 00000000..7dfed9f2 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright 2017-2023 Leon Merten Lohse + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index ca41ae10..7a9f1c8a 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,20 @@ Detailed documentation including installation can be found in [Documentation](ht This project is licensed under the MPL-2.0 license. See the LICENSE file or https://www.mozilla.org/en-US/MPL/ for details. +Two files contain code from other projects and keep their original licenses: + +- `include/aare/ProducerConsumerQueue.hpp` is Apache-2.0, from + [folly](https://github.com/facebook/folly) by Meta Platforms. +- `src/NumpyHelpers.cpp` is MIT, from + [libnpy](https://github.com/llohse/libnpy) by Leon Merten Lohse. + +The full license texts are in the `LICENSES` directory. + +The Python wheels and conda packages also contain Minuit2 +(LGPL-2.1-or-later), {fmt} and nlohmann/json (MIT), and pybind11 +(BSD-3-Clause), which CMake downloads at build time. See +`THIRD-PARTY-NOTICES.txt` for their notices. + ## Build and install Prerequisites diff --git a/RELEASE.md b/RELEASE.md index c5287bb4..0a897d00 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -87,10 +87,20 @@ ``std::invalid_argument`` in all build types. The previous assertion was compiled out of Release builds, so a zero-size queue overflowed its buffer on the first write. -- Corrected the license metadata for the vendored ``ProducerConsumerQueue``. - The header is tagged ``Apache-2.0`` like upstream folly, the MPL 2.0 and - Apache 2.0 texts ship in ``LICENSES/``, and the conda package declares - ``MPL-2.0 AND Apache-2.0`` with both license files. +- Corrected the license metadata for vendored third-party code. + ``ProducerConsumerQueue.hpp`` is tagged ``Apache-2.0`` like upstream folly + and ``NumpyHelpers.cpp`` is tagged ``MIT`` like upstream libnpy. The MPL 2.0, + Apache 2.0, and MIT texts ship in ``LICENSES/``, and both the conda package + and the Python wheel declare ``MPL-2.0 AND Apache-2.0 AND MIT`` with all + three license files. Building the wheel now requires scikit-build-core 0.11 + or newer. +- The wheel and conda package now ship ``THIRD-PARTY-NOTICES.txt`` and the + LGPL 2.1 text for the libraries compiled into the extension: Minuit2 + (LGPL-2.1-or-later), {fmt} and nlohmann/json (MIT), and pybind11 + (BSD-3-Clause). Their license expressions include these licenses. + Minuit2 is now fetched at tag ``v6-40-02`` instead of ``master``, and + libzmq at ``v4.3.5`` (MPL-2.0) instead of ``v4.3.4`` (LGPL-3.0 with a + static-linking exception). - ``RawFile`` and ``File`` reject raw files with frame padding disabled unless the frame discard policy is ``discardpartial``. The constructor reports the master path before opening data subfiles. Legacy ``.raw`` master files now diff --git a/THIRD-PARTY-NOTICES.txt b/THIRD-PARTY-NOTICES.txt new file mode 100644 index 00000000..3d07d9c7 --- /dev/null +++ b/THIRD-PARTY-NOTICES.txt @@ -0,0 +1,137 @@ +Third-party notices for aare binary packages +============================================ + +The aare Python wheels and conda packages compile the following libraries into +the aare extension module. They are not part of the aare source repository; +CMake downloads them at build time. Their license notices follow below. + + Minuit2 v6-40-02 LGPL-2.1-or-later https://github.com/GooFit/Minuit2 + {fmt} 12.1.0 MIT https://github.com/fmtlib/fmt + nlohmann/json 3.11.3 MIT https://github.com/nlohmann/json + pybind11 3.0.3 BSD-3-Clause https://github.com/pybind/pybind11 + +Minuit2 is linked statically. To use aare with a modified Minuit2, build aare +from source (https://github.com/slsdetectorgroup/aare) with +-DAARE_FETCH_MINUIT2=OFF and make your Minuit2 build findable by CMake's +find_package(Minuit2). + +------------------------------------------------------------------------------ +Minuit2 +------------------------------------------------------------------------------ + +Copyright (c) 2005 LCG ROOT Math team, CERN/PH-SFT + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +See LGPL2_1.txt next to this file for the text of the LGPL version 2.1. +For questions regarding the ROOT license, please contact rootdev@cern.ch. + +The precompiled binary distributions provided as a service to our community +may feature packages released with licenses different from LGPL. + +In aare packages the text of the LGPL version 2.1 is in +LICENSES/LGPL-2.1-or-later.txt. + +------------------------------------------------------------------------------ +{fmt} +------------------------------------------------------------------------------ + +Copyright (c) 2012 - present, Victor Zverovich and {fmt} contributors + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +--- Optional exception to the license --- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into a machine-executable object form of such +source code, you may redistribute such embedded portions in such object form +without including the above copyright and permission notices. + +------------------------------------------------------------------------------ +nlohmann/json +------------------------------------------------------------------------------ + +MIT License + +Copyright (c) 2013-2022 Niels Lohmann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +------------------------------------------------------------------------------ +pybind11 +------------------------------------------------------------------------------ + +Copyright (c) 2016 Wenzel Jakob , All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted 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. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +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. + +Please also refer to the file .github/CONTRIBUTING.md, which clarifies licensing of +external contributions to this project including patches, pull requests, etc. diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake index a052e1d4..b980c93d 100644 --- a/cmake/FindSphinx.cmake +++ b/cmake/FindSphinx.cmake @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MPL-2.0 + # Look for an executable called sphinx-build find_program( SPHINX_EXECUTABLE diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index 595f9530..2fe1d7cf 100644 --- a/cmake/helpers.cmake +++ b/cmake/helpers.cmake @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 function(default_build_type val) if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "No build type selected, default to Release") diff --git a/cmake/package_config.cmake b/cmake/package_config.cmake index d018a7f0..0d9c0dcb 100644 --- a/cmake/package_config.cmake +++ b/cmake/package_config.cmake @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: MPL-2.0 + # This cmake code creates the configuration that is found and used by # find_package() of another cmake project diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 793a373f..b3f0d569 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 # Config file for @PROJECT_NAME_LOWER@ # # It defines the following variables: diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 70ec7076..d2d39b53 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -26,7 +26,7 @@ requirements: - python - pip - numpy >=2.1 - - scikit-build-core + - scikit-build-core >=0.11 - pybind11 >=3.0.3 - matplotlib # needed in host to solve the environment for run @@ -50,8 +50,11 @@ test: - python -m pytest python/tests about: - license: MPL-2.0 AND Apache-2.0 + license: MPL-2.0 AND Apache-2.0 AND MIT AND BSD-3-Clause AND LGPL-2.1-or-later license_file: - LICENSES/MPL-2.0.txt - LICENSES/Apache-2.0.txt + - LICENSES/MIT.txt + - LICENSES/LGPL-2.1-or-later.txt + - THIRD-PARTY-NOTICES.txt summary: Data analysis library for hybrid pixel detectors from PSI diff --git a/docs/conf.py.in b/docs/conf.py.in index ad735752..1e0b5a71 100644 --- a/docs/conf.py.in +++ b/docs/conf.py.in @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 # Configuration file for the Sphinx documentation builder. # # This file only contains a selection of the most common options. For a full diff --git a/etc/add_license.py b/etc/add_license.py index f43b6cdb..ca02ba43 100644 --- a/etc/add_license.py +++ b/etc/add_license.py @@ -4,13 +4,17 @@ import fnmatch import os from pathlib import Path -CPP_PATTERNS = ["*.h", "*.hpp", "*.cpp"] -PY_PATTERNS = ["*.py"] -CMAKE_PATTERNS = ["CMakeLists.txt"] +CPP_PATTERNS = ["*.h", "*.hpp", "*.cpp", "*.hpp.in"] +PY_PATTERNS = ["*.py", "*.py.in"] +CMAKE_PATTERNS = ["CMakeLists.txt", "*.cmake", "*.cmake.in"] FILE_PATTERNS = CPP_PATTERNS + PY_PATTERNS + CMAKE_PATTERNS LICENSE_TEXT = "SPDX-License-Identifier: MPL-2.0" +# Text found in license notices of code copied from other projects. Such files +# keep their original license and must be tagged by hand. +THIRD_PARTY_MARKERS = ["Copyright", "Permission is hereby granted", "Licensed under"] + def get_comment_prefix(filename: str) -> str | None: if any(fnmatch.fnmatch(filename, p) for p in CPP_PATTERNS): @@ -43,6 +47,10 @@ def process_file(filepath: Path) -> bool: if any("SPDX-License-Identifier" in line for line in lines): return False + if any(marker in line for line in lines for marker in THIRD_PARTY_MARKERS): + print(f"⚠️ Skipped {filepath}: contains a license notice, tag it by hand") + return False + insert_index = 0 # For Python, keep shebang on the very first line @@ -50,6 +58,11 @@ def process_file(filepath: Path) -> bool: if lines[0].startswith("#!"): insert_index = 1 + # cmake-format merges consecutive comment lines into one paragraph + if any(fnmatch.fnmatch(filename, p) for p in CMAKE_PATTERNS): + if len(lines) > insert_index and lines[insert_index].startswith("#"): + lines.insert(insert_index, "\n") + lines.insert(insert_index, license_line) try: @@ -69,7 +82,7 @@ def main() -> None: parser.add_argument( "path", help="Root directory to recursively process " - "(*.h, *.cpp, *.py, and CMakeLists.txt).", + "(C++, Python, and CMake sources, and their .in templates).", ) args = parser.parse_args() diff --git a/etc/update_version.py b/etc/update_version.py index 78eea2a3..a939d9f7 100644 --- a/etc/update_version.py +++ b/etc/update_version.py @@ -1,5 +1,4 @@ # SPDX-License-Identifier: MPL-2.0 -# Copyright (C) 2021 Contributors to the Aare Package """ Script to update VERSION file with semantic versioning if provided as an argument, or with 0.0.0 if no argument is provided. """ diff --git a/include/aare/ProducerConsumerQueue.hpp b/include/aare/ProducerConsumerQueue.hpp index dc5670a5..d630490f 100644 --- a/include/aare/ProducerConsumerQueue.hpp +++ b/include/aare/ProducerConsumerQueue.hpp @@ -18,10 +18,12 @@ // @author Bo Hu (bhu@fb.com) // @author Jordan DeLong (delong.j@fb.com) -// Changes made by the PSD Detector Group (PSI) relative to -// folly/ProducerConsumerQueue.h: -// - Copied constexpr hardware_destructive_interference_size = 128 from -// folly/lang/Align.h into this file. +// Changes made by the CPS Detector Group at PSI relative to +// folly/ProducerConsumerQueue.h in folly v2024.03.18.00 (commit 8aceb9bf727c; +// the file is identical in v2022.01.03.00 through v2024.03.18.00): +// - Replaced the include of folly/concurrency/CacheLocality.h with a local +// constexpr hardware_destructive_interference_size = 128, the value that +// folly/lang/Align.h uses except on ARM and s390x. // - Changed the file extension to .hpp and the namespace to aare. // - Added a default constructor equivalent to ProducerConsumerQueue(2). // - Declared the move constructor and move assignment deleted. The queue is diff --git a/include/aare/ROI.hpp b/include/aare/ROI.hpp index 81c2a84e..36838f43 100644 --- a/include/aare/ROI.hpp +++ b/include/aare/ROI.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include "aare/defs.hpp" #include diff --git a/include/aare/ROIGeometry.hpp b/include/aare/ROIGeometry.hpp index 739b24c3..a8a90c37 100644 --- a/include/aare/ROIGeometry.hpp +++ b/include/aare/ROIGeometry.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include "aare/DetectorGeometry.hpp" #include "aare/ROI.hpp" diff --git a/include/aare/hist/PedestalTrackingPixelHistogram.hpp b/include/aare/hist/PedestalTrackingPixelHistogram.hpp index 88ca7f2f..2025d053 100644 --- a/include/aare/hist/PedestalTrackingPixelHistogram.hpp +++ b/include/aare/hist/PedestalTrackingPixelHistogram.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include "aare/FastPedestal.hpp" #include "aare/NDArray.hpp" diff --git a/include/aare/hist/PixelHistogram.hpp b/include/aare/hist/PixelHistogram.hpp index 05432d65..c9b199b9 100644 --- a/include/aare/hist/PixelHistogram.hpp +++ b/include/aare/hist/PixelHistogram.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include "aare/NDArray.hpp" #include "aare/NDView.hpp" diff --git a/include/aare/hist/PixelHistogramImpl.hpp b/include/aare/hist/PixelHistogramImpl.hpp index d68795c8..9af42fe1 100644 --- a/include/aare/hist/PixelHistogramImpl.hpp +++ b/include/aare/hist/PixelHistogramImpl.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once /* Basic pixel histogram class with templated axis and storage type. diff --git a/include/aare/utils/math_helpers.hpp b/include/aare/utils/math_helpers.hpp index 9481bd8a..6d9b3c80 100644 --- a/include/aare/utils/math_helpers.hpp +++ b/include/aare/utils/math_helpers.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include diff --git a/pyproject.toml b/pyproject.toml index 8fa52bde..6054356c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ regex = '^(?P\d+(?:\.\d+)*(?:[\.\+\w]+)?)$' result = "{version}" [build-system] -requires = ["scikit-build-core>=0.10", "pybind11", "numpy"] +requires = ["scikit-build-core>=0.11", "pybind11", "numpy"] build-backend = "scikit_build_core.build" [project] @@ -16,7 +16,8 @@ dependencies = [ "numpy", "matplotlib", ] -license = { file = "LICENSE" } +license = "MPL-2.0 AND Apache-2.0 AND MIT AND BSD-3-Clause AND LGPL-2.1-or-later" +license-files = ["LICENSES/*", "THIRD-PARTY-NOTICES.txt"] diff --git a/python/aare/Cluster.py b/python/aare/Cluster.py index 7946567d..2da800b9 100644 --- a/python/aare/Cluster.py +++ b/python/aare/Cluster.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 from . import _aare import numpy as np from .factory import _type_to_char diff --git a/python/aare/_version.py b/python/aare/_version.py index f3530c4c..c2bab73f 100644 --- a/python/aare/_version.py +++ b/python/aare/_version.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 # This file is used to get the version of the package from the VERSION file from importlib.metadata import PackageNotFoundError, version from pathlib import Path diff --git a/python/src/bind_Defs.hpp b/python/src/bind_Defs.hpp index c6e7d185..c6592f24 100644 --- a/python/src/bind_Defs.hpp +++ b/python/src/bind_Defs.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include #include diff --git a/python/src/bind_Eta.hpp b/python/src/bind_Eta.hpp index 716b0e72..e2b9302e 100644 --- a/python/src/bind_Eta.hpp +++ b/python/src/bind_Eta.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/CalculateEta.hpp" #include "aare/to_string.hpp" diff --git a/python/src/module_config.hpp b/python/src/module_config.hpp index e2f4e8a7..ad5d7ca1 100644 --- a/python/src/module_config.hpp +++ b/python/src/module_config.hpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include diff --git a/python/tests/test_CtbRawFile.py b/python/tests/test_CtbRawFile.py index 6485b076..e23c99f2 100644 --- a/python/tests/test_CtbRawFile.py +++ b/python/tests/test_CtbRawFile.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import pytest diff --git a/python/tests/test_FastPedestal.py b/python/tests/test_FastPedestal.py index f93560cb..1feacaea 100644 --- a/python/tests/test_FastPedestal.py +++ b/python/tests/test_FastPedestal.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import numpy as np import pytest diff --git a/python/tests/test_InterpolationAPI.py b/python/tests/test_InterpolationAPI.py index e110087a..48686253 100644 --- a/python/tests/test_InterpolationAPI.py +++ b/python/tests/test_InterpolationAPI.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import pytest from aare import Interpolator, ClusterVector, Etai, Cluster diff --git a/python/tests/test_Pedestal.py b/python/tests/test_Pedestal.py index 27f9897a..4248d157 100644 --- a/python/tests/test_Pedestal.py +++ b/python/tests/test_Pedestal.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import numpy as np import pytest diff --git a/python/tests/test_ROI.py b/python/tests/test_ROI.py index f0b98de0..3a117016 100644 --- a/python/tests/test_ROI.py +++ b/python/tests/test_ROI.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import pytest import numpy as np diff --git a/python/tests/test_RawMasterFile.py b/python/tests/test_RawMasterFile.py index 5ad68b48..94669d77 100644 --- a/python/tests/test_RawMasterFile.py +++ b/python/tests/test_RawMasterFile.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import json diff --git a/python/tests/test_Transformation.py b/python/tests/test_Transformation.py index 2b381085..0d91c10a 100644 --- a/python/tests/test_Transformation.py +++ b/python/tests/test_Transformation.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 import pytest import numpy as np from aare import CtbRawFile, transform diff --git a/python/tests/test_interpolation_simulated.py b/python/tests/test_interpolation_simulated.py index 5a3cdf3c..57a6ab63 100644 --- a/python/tests/test_interpolation_simulated.py +++ b/python/tests/test_interpolation_simulated.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: MPL-2.0 #test script to test interpolation on simulated data diff --git a/src/Interpolation.test.cpp b/src/Interpolation.test.cpp index 41a8b70a..764de414 100644 --- a/src/Interpolation.test.cpp +++ b/src/Interpolation.test.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/ClusterVector.hpp" #include "aare/Interpolator.hpp" #include "aare/NDArray.hpp" diff --git a/src/NumpyHelpers.cpp b/src/NumpyHelpers.cpp index a5448338..75462953 100644 --- a/src/NumpyHelpers.cpp +++ b/src/NumpyHelpers.cpp @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: MPL-2.0 +// SPDX-License-Identifier: MIT /* 28-03-2024 modified by: Bechir Braham diff --git a/src/ROI.cpp b/src/ROI.cpp index 9cb37961..7e91c49d 100644 --- a/src/ROI.cpp +++ b/src/ROI.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/ROI.hpp" #include "aare/DetectorGeometry.hpp" #include "aare/ROIGeometry.hpp" diff --git a/src/ROI.test.cpp b/src/ROI.test.cpp index 6cc7bb26..9bbe4dff 100644 --- a/src/ROI.test.cpp +++ b/src/ROI.test.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/ROI.hpp" #include diff --git a/src/ROIGeometry.cpp b/src/ROIGeometry.cpp index f61f9079..8008118d 100644 --- a/src/ROIGeometry.cpp +++ b/src/ROIGeometry.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/ROIGeometry.hpp" #include diff --git a/src/hist/PedestalTrackingPixelHistogram.cpp b/src/hist/PedestalTrackingPixelHistogram.cpp index f02004ab..b97b5ad9 100644 --- a/src/hist/PedestalTrackingPixelHistogram.cpp +++ b/src/hist/PedestalTrackingPixelHistogram.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/hist/PedestalTrackingPixelHistogram.hpp" #include "aare/File.hpp" #include "aare/MultiThreadedFileReader.hpp" diff --git a/src/hist/PixelHistogram.test.cpp b/src/hist/PixelHistogram.test.cpp index d681c789..50b1fcec 100644 --- a/src/hist/PixelHistogram.test.cpp +++ b/src/hist/PixelHistogram.test.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include #include diff --git a/src/hist/PixelHistogramImpl.test.cpp b/src/hist/PixelHistogramImpl.test.cpp index f3526c17..f9456efa 100644 --- a/src/hist/PixelHistogramImpl.test.cpp +++ b/src/hist/PixelHistogramImpl.test.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include #include diff --git a/src/to_string.cpp b/src/to_string.cpp index 8776c501..2753695f 100644 --- a/src/to_string.cpp +++ b/src/to_string.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #include "aare/to_string.hpp" namespace aare { diff --git a/tests/test_config.hpp.in b/tests/test_config.hpp.in index e314b8fe..8030213e 100644 --- a/tests/test_config.hpp.in +++ b/tests/test_config.hpp.in @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MPL-2.0 #pragma once #include #include