diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index bf0415e7d..4db277142 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package cmake_minimum_required(VERSION 3.12) project(slsDetectorPackage) set(PROJECT_VERSION 6.0.0) diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..59fcd11b7 --- /dev/null +++ b/COPYING @@ -0,0 +1,17 @@ +The SLS Detector Package is provided under: + + SPDX-License-Identifier: LGPL-3.0-or-later + +Being under the terms of the GNU Lesser General Public License version 3 or later, +according with: + + LICENSES/LGPL-3.0 + +Source code under the Apache 2.0 License have the SPDX Identifier and are +according with: + + LICENSES/ThirdParty/Apache-2.0 + +All contributions to the SLS Detector Package are subject to this COPYING file. + + diff --git a/LICENSE b/LICENSES/GPL-3.0 similarity index 98% rename from LICENSE rename to LICENSES/GPL-3.0 index f288702d2..16d2eeb5e 100644 --- a/LICENSE +++ b/LICENSES/GPL-3.0 @@ -1,3 +1,17 @@ +Valid-License-Identifier: GPL-3.0 +Valid-License-Identifier: GPL-3.0+ +SPDX-URL: https://spdx.org/licenses/GPL-3.0-or-later.html +Usage-Guide: + To use this license in source code, put one of the following SPDX + tag/value pairs into a comment according to the placement + guidelines in the licensing rules documentation. + For 'GNU Library General Public License (LGPL) version 3.0 only' use: + SPDX-License-Identifier: GPL-3.0 + For 'GNU Library General Public License (LGPL) version 3.0 or any later + version' use: + SPDX-License-Identifier: GPL-3.0-or-later +License-Text: + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/LICENSE.lesser b/LICENSES/LGPL-3.0 similarity index 92% rename from LICENSE.lesser rename to LICENSES/LGPL-3.0 index 0a041280b..4f5dc3f1a 100644 --- a/LICENSE.lesser +++ b/LICENSES/LGPL-3.0 @@ -1,3 +1,17 @@ +Valid-License-Identifier: LGPL-3.0 +Valid-License-Identifier: LGPL-3.0+ +SPDX-URL: https://spdx.org/licenses/LGPL-3.0-or-later.html +Usage-Guide: + To use this license in source code, put one of the following SPDX + tag/value pairs into a comment according to the placement + guidelines in the licensing rules documentation. + For 'GNU Library General Public License (LGPL) version 3.0 only' use: + SPDX-License-Identifier: LGPL-3.0 + For 'GNU Library General Public License (LGPL) version 3.0 or any later + version' use: + SPDX-License-Identifier: LGPL-3.0-or-later +License-Text: + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/LICENSES/Third Party/Apache-2.0 b/LICENSES/Third Party/Apache-2.0 new file mode 100644 index 000000000..ffd8b79df --- /dev/null +++ b/LICENSES/Third Party/Apache-2.0 @@ -0,0 +1,210 @@ +Valid-License-Identifier: Apache-2.0 +SPDX-URL: https://spdx.org/licenses/Apache-2.0.html +Usage-Guide: + To use this license in source code, put one of the following SPDX + tag/value pairs into a comment according to the placement + guidelines in the licensing rules documentation. + SPDX-License-Identifier: Apache-2.0 +License-Text: + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/checkLicenceNotice.sh b/checkLicenceNotice.sh new file mode 100644 index 000000000..414ee838f --- /dev/null +++ b/checkLicenceNotice.sh @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package +#!/bin/bash +RED='\033[0;31m' +NC='\033[0m' # No Color +WD=$PWD + +if [ $# -lt 2 ]; then + echo "Wrong usage of updateLicenseNotice.sh. Requires atleast 1 argument [RELATIVE PATH] [.h/.cpp etc]" + return [-1] +fi + +CURRENT=$WD/$1 +FILE_TYPE=$2 + +if [ ! -d "$CURRENT" ]; then + echo "This directory ${CURRENT} does not exist" + return [-1] +fi + +cd $CURRENT + + +NOTICE="SPDX-License-Identifier" +#echo -e "Notice is \n$NOTICE" + + +for file in $(find $CURRENT -name "$FILE_TYPE" -not -path "*./build/*" -not -path "*./libs/*"); do + #echo -e "\nProcessing $file" + #echo "$file" + firstline=$(head -n 1 $file) + +#< $file.modified + + #mv $file.modified $file +#testing +done + + +cd $WD diff --git a/cmk.sh b/cmk.sh old mode 100755 new mode 100644 index bceabc589..0bfe0d918 --- a/cmk.sh +++ b/cmk.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/bin/bash CMAKE="cmake3" BUILDDIR="build" diff --git a/conda-recepie/build.sh b/conda-recepie/build.sh old mode 100755 new mode 100644 index d7558adc5..62b9ca1d9 --- a/conda-recepie/build.sh +++ b/conda-recepie/build.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package mkdir build mkdir install diff --git a/conda-recepie/build_pylib.sh b/conda-recepie/build_pylib.sh old mode 100755 new mode 100644 index fb8723e22..f7cbdc496 --- a/conda-recepie/build_pylib.sh +++ b/conda-recepie/build_pylib.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package echo "|<-------- starting python build" cd python diff --git a/conda-recepie/copy_ctbgui.sh b/conda-recepie/copy_ctbgui.sh index 91ebc1a6d..b4f52efce 100644 --- a/conda-recepie/copy_ctbgui.sh +++ b/conda-recepie/copy_ctbgui.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package mkdir $PREFIX/lib mkdir $PREFIX/bin mkdir $PREFIX/include diff --git a/conda-recepie/copy_gui.sh b/conda-recepie/copy_gui.sh old mode 100755 new mode 100644 index c35d018b0..a6bce55d8 --- a/conda-recepie/copy_gui.sh +++ b/conda-recepie/copy_gui.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #Copy the GUI mkdir -p $PREFIX/bin cp build/install/bin/slsDetectorGui $PREFIX/bin/. diff --git a/conda-recepie/copy_lib.sh b/conda-recepie/copy_lib.sh old mode 100755 new mode 100644 index e153ad869..71870c916 --- a/conda-recepie/copy_lib.sh +++ b/conda-recepie/copy_lib.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package mkdir -p $PREFIX/lib mkdir -p $PREFIX/bin diff --git a/conda-recepie/copy_moench.sh b/conda-recepie/copy_moench.sh index 7b4d34c74..7c4742f32 100644 --- a/conda-recepie/copy_moench.sh +++ b/conda-recepie/copy_moench.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #Copy the Moench executables mkdir -p $PREFIX/bin cp build/install/bin/moench04ZmqProcess $PREFIX/bin/. diff --git a/conda-recepie/run_test.sh b/conda-recepie/run_test.sh old mode 100755 new mode 100644 index e707b86f7..24068d625 --- a/conda-recepie/run_test.sh +++ b/conda-recepie/run_test.sh @@ -1 +1,3 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package ctest -j2 \ No newline at end of file diff --git a/ctbGui/CMakeLists.txt b/ctbGui/CMakeLists.txt index 758d8175d..c6371ea92 100644 --- a/ctbGui/CMakeLists.txt +++ b/ctbGui/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package find_package(ROOT CONFIG REQUIRED COMPONENTS Core Gui) diff --git a/ctbGui/Makefile.root5 b/ctbGui/Makefile.root5 index 698a06e4c..050acbc17 100644 --- a/ctbGui/Makefile.root5 +++ b/ctbGui/Makefile.root5 @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package INCS=ctbMain.h ctbDacs.h ctbPattern.h ctbSignals.h ctbAdcs.h ctbAcquisition.h ctbPowers.h ctbSlowAdcs.h diff --git a/ctbGui/Makefile.root6 b/ctbGui/Makefile.root6 index 1c4c552ce..338949617 100644 --- a/ctbGui/Makefile.root6 +++ b/ctbGui/Makefile.root6 @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package INCS=ctbMain.h ctbDacs.h ctbPattern.h ctbSignals.h ctbAdcs.h ctbAcquisition.h ctbPowers.h ctbSlowAdcs.h diff --git a/ctbGui/ctbAcquisition.cpp b/ctbGui/ctbAcquisition.cpp old mode 100755 new mode 100644 index d719802ff..d545ac680 --- a/ctbGui/ctbAcquisition.cpp +++ b/ctbGui/ctbAcquisition.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#define TESTADC diff --git a/ctbGui/ctbAcquisition.h b/ctbGui/ctbAcquisition.h old mode 100755 new mode 100644 index 212bc5e1a..7693b177b --- a/ctbGui/ctbAcquisition.h +++ b/ctbGui/ctbAcquisition.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBACQUISITION_H #define CTBACQUISITION_H #include diff --git a/ctbGui/ctbAdcs.cpp b/ctbGui/ctbAdcs.cpp old mode 100755 new mode 100644 index dbf2b4e63..694f5ff13 --- a/ctbGui/ctbAdcs.cpp +++ b/ctbGui/ctbAdcs.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/ctbGui/ctbAdcs.h b/ctbGui/ctbAdcs.h old mode 100755 new mode 100644 index 5e85891de..3a4cf35da --- a/ctbGui/ctbAdcs.h +++ b/ctbGui/ctbAdcs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package diff --git a/ctbGui/ctbDacs.cpp b/ctbGui/ctbDacs.cpp old mode 100755 new mode 100644 index f386492f6..dd2763fdf --- a/ctbGui/ctbDacs.cpp +++ b/ctbGui/ctbDacs.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include diff --git a/ctbGui/ctbDacs.h b/ctbGui/ctbDacs.h old mode 100755 new mode 100644 index aa19720f3..818c0c42d --- a/ctbGui/ctbDacs.h +++ b/ctbGui/ctbDacs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBDACS_H diff --git a/ctbGui/ctbDefs.h b/ctbGui/ctbDefs.h old mode 100755 new mode 100644 index 6cfad7fa1..85d7e1b8a --- a/ctbGui/ctbDefs.h +++ b/ctbGui/ctbDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/ctbGui/ctbGui.cpp b/ctbGui/ctbGui.cpp old mode 100755 new mode 100644 index 50df983eb..5c34d8ee0 --- a/ctbGui/ctbGui.cpp +++ b/ctbGui/ctbGui.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include diff --git a/ctbGui/ctbLinkDef.h b/ctbGui/ctbLinkDef.h old mode 100755 new mode 100644 index dd61a0bba..f041a01fd --- a/ctbGui/ctbLinkDef.h +++ b/ctbGui/ctbLinkDef.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma link C++ class ctbMain; #pragma link C++ class ctbDacs; #pragma link C++ class ctbDac; diff --git a/ctbGui/ctbMain.cpp b/ctbGui/ctbMain.cpp old mode 100755 new mode 100644 index d5d698e74..0308589bb --- a/ctbGui/ctbMain.cpp +++ b/ctbGui/ctbMain.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/ctbGui/ctbMain.h b/ctbGui/ctbMain.h old mode 100755 new mode 100644 index 9f2b9b3fb..34ff8d429 --- a/ctbGui/ctbMain.h +++ b/ctbGui/ctbMain.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBMAIN_H #define CTBMAIN_H #include diff --git a/ctbGui/ctbPattern.cpp b/ctbGui/ctbPattern.cpp old mode 100755 new mode 100644 index 7e902db50..5d3d49a5e --- a/ctbGui/ctbPattern.cpp +++ b/ctbGui/ctbPattern.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/ctbGui/ctbPattern.h b/ctbGui/ctbPattern.h old mode 100755 new mode 100644 index 0bb565f4b..6f85974a1 --- a/ctbGui/ctbPattern.h +++ b/ctbGui/ctbPattern.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBPATTERN_H #define CTBPATTERN_H #include diff --git a/ctbGui/ctbPowers.cpp b/ctbGui/ctbPowers.cpp index 42a3eca81..498ec2c13 100644 --- a/ctbGui/ctbPowers.cpp +++ b/ctbGui/ctbPowers.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include diff --git a/ctbGui/ctbPowers.h b/ctbGui/ctbPowers.h index e7a47bdfe..d0c39f1c7 100644 --- a/ctbGui/ctbPowers.h +++ b/ctbGui/ctbPowers.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBPOWERS_H #define CTBPOWERS_H diff --git a/ctbGui/ctbSignals.cpp b/ctbGui/ctbSignals.cpp old mode 100755 new mode 100644 index 84cd221fc..f1e0c840f --- a/ctbGui/ctbSignals.cpp +++ b/ctbGui/ctbSignals.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/ctbGui/ctbSignals.h b/ctbGui/ctbSignals.h old mode 100755 new mode 100644 index 08e524f74..eb3deb221 --- a/ctbGui/ctbSignals.h +++ b/ctbGui/ctbSignals.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBSIGNALS_H #define CTBSIGNALS_H #include diff --git a/ctbGui/ctbSlowAdcs.cpp b/ctbGui/ctbSlowAdcs.cpp index 8228fe117..6507e0d17 100644 --- a/ctbGui/ctbSlowAdcs.cpp +++ b/ctbGui/ctbSlowAdcs.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include diff --git a/ctbGui/ctbSlowAdcs.h b/ctbGui/ctbSlowAdcs.h index f49daeb3d..a25bbe5b1 100644 --- a/ctbGui/ctbSlowAdcs.h +++ b/ctbGui/ctbSlowAdcs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CTBSLOWADCS_H diff --git a/ctbGui/patternGenerator/deserializer.cpp b/ctbGui/patternGenerator/deserializer.cpp index c315ca419..0a52f4ad9 100644 --- a/ctbGui/patternGenerator/deserializer.cpp +++ b/ctbGui/patternGenerator/deserializer.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include diff --git a/ctbGui/patternGenerator/generate.sh b/ctbGui/patternGenerator/generate.sh old mode 100755 new mode 100644 index 6f5512c8c..0887503be --- a/ctbGui/patternGenerator/generate.sh +++ b/ctbGui/patternGenerator/generate.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package if [ "$#" -eq 0 ]; then echo "Wrong number of arguments: usage should be $0 patname" exit 1 diff --git a/ctbGui/patternGenerator/generator.c b/ctbGui/patternGenerator/generator.c old mode 100755 new mode 100644 index ae3e1c8b7..c6c7406a8 --- a/ctbGui/patternGenerator/generator.c +++ b/ctbGui/patternGenerator/generator.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /**************************************************************************** usage to generate a patter test.pat from test.p diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 524c41f93..7f3fa8c04 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package find_package(Doxygen REQUIRED) find_package(Sphinx REQUIRED) diff --git a/docs/src/gendoc.cpp b/docs/src/gendoc.cpp index 6d3278850..9044f563e 100644 --- a/docs/src/gendoc.cpp +++ b/docs/src/gendoc.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /** * Utility program to generate input files for the command line * documentation. Uses the string returned from sls_detector_help cmd diff --git a/evalVersionVariables.sh b/evalVersionVariables.sh old mode 100755 new mode 100644 index 5824ca13c..6cd4d8b8f --- a/evalVersionVariables.sh +++ b/evalVersionVariables.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package GITREPO1='git remote -v' GITREPO2=" | grep \"fetch\" | cut -d' ' -f1" BRANCH1='git branch -v' diff --git a/genVersionHeader.sh b/genVersionHeader.sh old mode 100755 new mode 100644 index 12b5d8c26..5b1ee9076 --- a/genVersionHeader.sh +++ b/genVersionHeader.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #####! /bin/awk -f diff --git a/integrationTests/CMakeLists.txt b/integrationTests/CMakeLists.txt old mode 100755 new mode 100644 index 5aba78ee0..a270593fe --- a/integrationTests/CMakeLists.txt +++ b/integrationTests/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package # MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} ) # MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) diff --git a/integrationTests/test-eigerIntegration.cpp b/integrationTests/test-eigerIntegration.cpp index a02b85677..0f7fea11f 100644 --- a/integrationTests/test-eigerIntegration.cpp +++ b/integrationTests/test-eigerIntegration.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "DetectorImpl.h" #include "catch.hpp" #include "sls/string_utils.h" diff --git a/integrationTests/test-integrationDectector.cpp b/integrationTests/test-integrationDectector.cpp index 3dc71326a..9d0847b4f 100644 --- a/integrationTests/test-integrationDectector.cpp +++ b/integrationTests/test-integrationDectector.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" diff --git a/integrationTests/test-integrationMulti.cpp b/integrationTests/test-integrationMulti.cpp index eaa5edd11..3dd6b1903 100644 --- a/integrationTests/test-integrationMulti.cpp +++ b/integrationTests/test-integrationMulti.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "DetectorImpl.h" #include "catch.hpp" #include "sls/string_utils.h" diff --git a/integrationTests/test.cpp b/integrationTests/test.cpp old mode 100755 new mode 100644 index 8daed99c4..39e7230ab --- a/integrationTests/test.cpp +++ b/integrationTests/test.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package // tests-main.cpp #define CATCH_CONFIG_MAIN #include "catch.hpp" \ No newline at end of file diff --git a/notice_to_add_for_every_file b/notice_to_add_for_every_file index f2385ffa1..1c092a9b1 100644 --- a/notice_to_add_for_every_file +++ b/notice_to_add_for_every_file @@ -1,16 +1,2 @@ - Copyright (C) 2021 Contributors to the SLS Detector Package - - This file is part of the SLS Detector Package. - - SLS Detector Package 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 3 of the License, or - (at your option) any later version. - - SLS Detector Package 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 SLS Detector Package. If not, see . +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt old mode 100755 new mode 100644 index 8337a811b..21c02761a --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package pybind11_add_module(_slsdet src/main.cpp diff --git a/python/examples/exposure_time.py b/python/examples/exposure_time.py index eab8c12f0..510562f27 100644 --- a/python/examples/exposure_time.py +++ b/python/examples/exposure_time.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ Example showing how to set and get exposure times """ diff --git a/python/examples/manipulate_pattern.py b/python/examples/manipulate_pattern.py index 0e11979c3..9d5263ef8 100644 --- a/python/examples/manipulate_pattern.py +++ b/python/examples/manipulate_pattern.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from slsdet import Detector, patternParameters diff --git a/python/examples/non-blocking-acquire-process.py b/python/examples/non-blocking-acquire-process.py index 486a3dd93..0d7c41f98 100644 --- a/python/examples/non-blocking-acquire-process.py +++ b/python/examples/non-blocking-acquire-process.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import time from multiprocessing import Process from slsdet import Detector, runStatus diff --git a/python/examples/non-blocking-acquire.py b/python/examples/non-blocking-acquire.py index dd434b2a0..de430f677 100644 --- a/python/examples/non-blocking-acquire.py +++ b/python/examples/non-blocking-acquire.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import time from slsdet import Detector, runStatus diff --git a/python/examples/reading_dacs.py b/python/examples/reading_dacs.py index 8a17b1b61..8b208f0ce 100644 --- a/python/examples/reading_dacs.py +++ b/python/examples/reading_dacs.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from slsdet import Detector, Eiger, dacIndex diff --git a/python/examples/reading_temperature.py b/python/examples/reading_temperature.py index e167e3860..2b88d3ddb 100644 --- a/python/examples/reading_temperature.py +++ b/python/examples/reading_temperature.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from slsdet import Detector, Eiger, dacIndex diff --git a/python/examples/threshold_scan.py b/python/examples/threshold_scan.py index 6505b64b3..aa81b57a0 100644 --- a/python/examples/threshold_scan.py +++ b/python/examples/threshold_scan.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from slsdet import Eiger d = Eiger() diff --git a/python/examples/use_currentsource.py b/python/examples/use_currentsource.py index ecc0a588f..7b61f3199 100644 --- a/python/examples/use_currentsource.py +++ b/python/examples/use_currentsource.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from slsdet import Detector, currentSrcParameters s = currentSrcParameters() diff --git a/python/examples/use_enum.py b/python/examples/use_enum.py index 8e8eaf210..1b7298298 100644 --- a/python/examples/use_enum.py +++ b/python/examples/use_enum.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package # Most settings are represented as enums that can be # explicitly imported diff --git a/python/examples/using_scan.py b/python/examples/using_scan.py index 2d8f5a74a..c665eb40a 100644 --- a/python/examples/using_scan.py +++ b/python/examples/using_scan.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from slsdet import Mythen3, scanParameters, dacIndex diff --git a/python/scripts/basic.py b/python/scripts/basic.py old mode 100755 new mode 100644 index 2135b4a58..f07e8285b --- a/python/scripts/basic.py +++ b/python/scripts/basic.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import os import sys import numpy as np diff --git a/python/scripts/compare_with_commandline.py b/python/scripts/compare_with_commandline.py index 9d4474b20..3a584252c 100644 --- a/python/scripts/compare_with_commandline.py +++ b/python/scripts/compare_with_commandline.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import subprocess import locale out = subprocess.run(['g', 'list'], stdout = subprocess.PIPE, encoding=locale.getpreferredencoding()) diff --git a/python/scripts/compile_servers.py b/python/scripts/compile_servers.py index e3395a06f..30422d110 100644 --- a/python/scripts/compile_servers.py +++ b/python/scripts/compile_servers.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import subprocess import os import sys diff --git a/python/scripts/generate_enums.py b/python/scripts/generate_enums.py index bfc02897b..a3e9b534e 100644 --- a/python/scripts/generate_enums.py +++ b/python/scripts/generate_enums.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ Code generator for enum bindings in the Python extension. Reads the sls_detector_defs.h and enums_in.cpp then outputs diff --git a/python/scripts/generate_functions.py b/python/scripts/generate_functions.py index 5a955e63b..242cd2bb3 100644 --- a/python/scripts/generate_functions.py +++ b/python/scripts/generate_functions.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ This file is used to auto generate Python bindings for the sls::Detector class. The tool needs the libclang bindings diff --git a/python/scripts/list_tested_cmd.py b/python/scripts/list_tested_cmd.py old mode 100755 new mode 100644 index 4e4cbe6c8..4ccda78d9 --- a/python/scripts/list_tested_cmd.py +++ b/python/scripts/list_tested_cmd.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ Utility to find and list which command line functions have tests and where the tests are located diff --git a/python/scripts/parse.py b/python/scripts/parse.py index c8b44ec8c..310a6af36 100644 --- a/python/scripts/parse.py +++ b/python/scripts/parse.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import re import subprocess from subprocess import PIPE diff --git a/python/scripts/test_virtual.py b/python/scripts/test_virtual.py index 2024194ac..f7d11b03b 100644 --- a/python/scripts/test_virtual.py +++ b/python/scripts/test_virtual.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import pytest import subprocess import os diff --git a/python/setup.py b/python/setup.py old mode 100755 new mode 100644 index 61e070e4f..6a4c6bbed --- a/python/setup.py +++ b/python/setup.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ Setup file for slsdet Build upon the pybind11 example found here: https://github.com/pybind/python_example diff --git a/python/slsdet/__init__.py b/python/slsdet/__init__.py old mode 100755 new mode 100644 index 698224525..4055393e8 --- a/python/slsdet/__init__.py +++ b/python/slsdet/__init__.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package # from .detector import Detector, DetectorError, free_shared_memory from .eiger import Eiger from .ctb import Ctb diff --git a/python/slsdet/adcs.py b/python/slsdet/adcs.py old mode 100755 new mode 100644 index 9534a38cb..e57d3e260 --- a/python/slsdet/adcs.py +++ b/python/slsdet/adcs.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from functools import partial class Adc: def __init__(self, name, enum, detector): diff --git a/python/slsdet/ctb.py b/python/slsdet/ctb.py index 73a2328e7..10afd3ae3 100644 --- a/python/slsdet/ctb.py +++ b/python/slsdet/ctb.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from .detector import Detector from .utils import element_if_equal from .dacs import DetectorDacs diff --git a/python/slsdet/dacs.py b/python/slsdet/dacs.py old mode 100755 new mode 100644 index 2ce69a4a1..5628eb3a6 --- a/python/slsdet/dacs.py +++ b/python/slsdet/dacs.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from .detector_property import DetectorProperty from functools import partial import numpy as np diff --git a/python/slsdet/decorators.py b/python/slsdet/decorators.py old mode 100755 new mode 100644 index 8e8f2c600..6fb1d06cf --- a/python/slsdet/decorators.py +++ b/python/slsdet/decorators.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py old mode 100755 new mode 100644 index 17b11e405..6c610de27 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from _slsdet import CppDetectorApi from _slsdet import slsDetectorDefs from _slsdet import IpAddr, MacAddr diff --git a/python/slsdet/detector_property.py b/python/slsdet/detector_property.py old mode 100755 new mode 100644 index 3ca69ed36..c7b49b03e --- a/python/slsdet/detector_property.py +++ b/python/slsdet/detector_property.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from collections.abc import Iterable import numpy as np diff --git a/python/slsdet/eiger.py b/python/slsdet/eiger.py old mode 100755 new mode 100644 index 3e45b1e1d..a65532677 --- a/python/slsdet/eiger.py +++ b/python/slsdet/eiger.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/enums.py b/python/slsdet/enums.py index fdbfe7d2f..02e3c5126 100644 --- a/python/slsdet/enums.py +++ b/python/slsdet/enums.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ Automatically improt all enums from slsDetectorDefs and give an alias with their name in the enum module. All names from the enum diff --git a/python/slsdet/errors.py b/python/slsdet/errors.py old mode 100755 new mode 100644 index f16ceeb9f..51a24a5cb --- a/python/slsdet/errors.py +++ b/python/slsdet/errors.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/gotthard.py b/python/slsdet/gotthard.py index ea33b7462..9468c78a3 100644 --- a/python/slsdet/gotthard.py +++ b/python/slsdet/gotthard.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/gotthard2.py b/python/slsdet/gotthard2.py index 8194c7a96..bdb36097f 100644 --- a/python/slsdet/gotthard2.py +++ b/python/slsdet/gotthard2.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/jungfrau.py b/python/slsdet/jungfrau.py index bd92ac757..9da5b7771 100644 --- a/python/slsdet/jungfrau.py +++ b/python/slsdet/jungfrau.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/lookup.py b/python/slsdet/lookup.py index be157841d..9bb99fe29 100644 --- a/python/slsdet/lookup.py +++ b/python/slsdet/lookup.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from .detector import Detector def view(name, det = Detector): diff --git a/python/slsdet/moench.py b/python/slsdet/moench.py index 0398841b1..6ed49a43d 100644 --- a/python/slsdet/moench.py +++ b/python/slsdet/moench.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/mythen3.py b/python/slsdet/mythen3.py index 055ee343a..b018699df 100644 --- a/python/slsdet/mythen3.py +++ b/python/slsdet/mythen3.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/python/slsdet/pattern.py b/python/slsdet/pattern.py index fc223ff8e..a2d80fdfe 100644 --- a/python/slsdet/pattern.py +++ b/python/slsdet/pattern.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import _slsdet from _slsdet import Pattern diff --git a/python/slsdet/proxy.py b/python/slsdet/proxy.py index 0cc498ba6..440433ccb 100644 --- a/python/slsdet/proxy.py +++ b/python/slsdet/proxy.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from .utils import element_if_equal from .enums import dacIndex diff --git a/python/slsdet/registers.py b/python/slsdet/registers.py old mode 100755 new mode 100644 index ae7eeda5e..79da39fff --- a/python/slsdet/registers.py +++ b/python/slsdet/registers.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package class Register: def __init__(self, detector): self._detector = detector diff --git a/python/slsdet/temperature.py b/python/slsdet/temperature.py index ef609eeb8..c34e2f02b 100644 --- a/python/slsdet/temperature.py +++ b/python/slsdet/temperature.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package from functools import partial from collections.abc import Iterable import numpy as np diff --git a/python/slsdet/utils.py b/python/slsdet/utils.py old mode 100755 new mode 100644 index f7d4fbd9d..989cf93e0 --- a/python/slsdet/utils.py +++ b/python/slsdet/utils.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package """ Utility functions that are useful for testing and troubleshooting but not directly used in controlling the detector diff --git a/python/src/current.cpp b/python/src/current.cpp index f24ced0c4..487f9e35f 100644 --- a/python/src/current.cpp +++ b/python/src/current.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/python/src/detector.cpp b/python/src/detector.cpp index 0141bcd8d..9bc381c5a 100644 --- a/python/src/detector.cpp +++ b/python/src/detector.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* WARINING This file is auto generated any edits might be overwritten without * warning */ diff --git a/python/src/detector_in.cpp b/python/src/detector_in.cpp index c08cdf764..0aa492189 100644 --- a/python/src/detector_in.cpp +++ b/python/src/detector_in.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/python/src/enums.cpp b/python/src/enums.cpp index c04f4e852..5c2528e80 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* WARINING This file is auto generated any edits might be overwritten without * warning */ diff --git a/python/src/enums_in.cpp b/python/src/enums_in.cpp index 129114845..4530ca924 100644 --- a/python/src/enums_in.cpp +++ b/python/src/enums_in.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/python/src/main.cpp b/python/src/main.cpp old mode 100755 new mode 100644 index 7afa194b2..67a9f89e5 --- a/python/src/main.cpp +++ b/python/src/main.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/python/src/mythenFileIO.h b/python/src/mythenFileIO.h index 1a89b18c3..c9551a273 100644 --- a/python/src/mythenFileIO.h +++ b/python/src/mythenFileIO.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/python/src/network.cpp b/python/src/network.cpp index 8130c3e96..f6c8a1fad 100644 --- a/python/src/network.cpp +++ b/python/src/network.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* This file contains Python bindings for the IpAddr and MacAddr classes. diff --git a/python/src/pattern.cpp b/python/src/pattern.cpp index c12bc96d9..e618f2954 100644 --- a/python/src/pattern.cpp +++ b/python/src/pattern.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/python/src/scan.cpp b/python/src/scan.cpp index afd83832b..308c28c1a 100644 --- a/python/src/scan.cpp +++ b/python/src/scan.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/python/src/typecaster.h b/python/src/typecaster.h index 15f884b45..dfe562640 100644 --- a/python/src/typecaster.h +++ b/python/src/typecaster.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include #include "sls/Result.h" diff --git a/python/tests/test_utils.py b/python/tests/test_utils.py old mode 100755 new mode 100644 index 500b7858c..1dd8dd152 --- a/python/tests/test_utils.py +++ b/python/tests/test_utils.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 98ae46d35..d73e539c5 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(using_logger using_logger.cpp) target_link_libraries(using_logger slsSupportShared diff --git a/sample/api.cpp b/sample/api.cpp index 705fba788..c39d84544 100644 --- a/sample/api.cpp +++ b/sample/api.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include diff --git a/sample/time.cpp b/sample/time.cpp index 96f10e349..09beca9e7 100644 --- a/sample/time.cpp +++ b/sample/time.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/sample/udp.cpp b/sample/udp.cpp index b647992c9..dcc9689d5 100644 --- a/sample/udp.cpp +++ b/sample/udp.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/UdpRxSocket.h" #include "sls/sls_detector_defs.h" #include diff --git a/sample/useResult.cpp b/sample/useResult.cpp index e7944f628..eda206e83 100644 --- a/sample/useResult.cpp +++ b/sample/useResult.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /** Examples on how to use Result */ #include "sls/Result.h" diff --git a/sample/using_logger.cpp b/sample/using_logger.cpp index ec46588af..7557d5c83 100644 --- a/sample/using_logger.cpp +++ b/sample/using_logger.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/logger.h" #include #include @@ -7,7 +9,8 @@ int main() { std::cout << "Compare output between old and new:\n"; LOG(logINFO) << "Some info message"; LOG(logERROR) << "This is an error"; - LOG(logWARNING) << "While this is only a warning"; + LOG(logWARNING) << "While this is only a warning"; prefix="/afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorPackage/" + p=${file#"$prefix"} //Logging level can be configure at runtime std::cout << "\n\n"; diff --git a/slsDetectorCalibration/MovingStat.h b/slsDetectorCalibration/MovingStat.h old mode 100755 new mode 100644 index 31fb59c59..d069cc6d0 --- a/slsDetectorCalibration/MovingStat.h +++ b/slsDetectorCalibration/MovingStat.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOVINGSTAT_H #define MOVINGSTAT_H diff --git a/slsDetectorCalibration/RunningStat.h b/slsDetectorCalibration/RunningStat.h old mode 100755 new mode 100644 index 1197ffc0f..aca704097 --- a/slsDetectorCalibration/RunningStat.h +++ b/slsDetectorCalibration/RunningStat.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package class RunningStat { public: diff --git a/slsDetectorCalibration/Stat.h b/slsDetectorCalibration/Stat.h index 196f5bbb7..6521aa933 100644 --- a/slsDetectorCalibration/Stat.h +++ b/slsDetectorCalibration/Stat.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package class Stat { public: diff --git a/slsDetectorCalibration/analogDetector.h b/slsDetectorCalibration/analogDetector.h index 56b3feb29..bda071176 100644 --- a/slsDetectorCalibration/analogDetector.h +++ b/slsDetectorCalibration/analogDetector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ANALOGDETECTOR_H #define ANALOGDETECTOR_H diff --git a/slsDetectorCalibration/circularFifo.h b/slsDetectorCalibration/circularFifo.h index f0b4eeb34..cf373d279 100644 --- a/slsDetectorCalibration/circularFifo.h +++ b/slsDetectorCalibration/circularFifo.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /* CircularFifo.h * Code & platform dependent issues with it was originally diff --git a/slsDetectorCalibration/commonModeSubtraction.h b/slsDetectorCalibration/commonModeSubtraction.h index 0484e6746..3ab9f896f 100644 --- a/slsDetectorCalibration/commonModeSubtraction.h +++ b/slsDetectorCalibration/commonModeSubtraction.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef COMMONMODESUBTRACTION_H #define COMMONMODESUBTRACTION_H diff --git a/slsDetectorCalibration/commonModeSubtractionNew.h b/slsDetectorCalibration/commonModeSubtractionNew.h index 1add20cc2..b0bb311ee 100644 --- a/slsDetectorCalibration/commonModeSubtractionNew.h +++ b/slsDetectorCalibration/commonModeSubtractionNew.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef COMMONMODESUBTRACTION_H #define COMMONMODESUBTRACTION_H diff --git a/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h b/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h index 63352bbce..0a33f1cf2 100644 --- a/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h +++ b/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MYTHEN301JCTBDATA_H #define MYTHEN301JCTBDATA_H diff --git a/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h b/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h index 0719301ca..deca0d9e5 100644 --- a/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h +++ b/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MYTHEN302JCTBDATA_H #define MYTHEN302JCTBDATA_H diff --git a/slsDetectorCalibration/dataStructures/adcSar2_jctbData.h b/slsDetectorCalibration/dataStructures/adcSar2_jctbData.h index 0b0665aaf..f7dfae566 100644 --- a/slsDetectorCalibration/dataStructures/adcSar2_jctbData.h +++ b/slsDetectorCalibration/dataStructures/adcSar2_jctbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ADCSAR2_JCTBDATA_H #define ADCSAR2_JCTBDATA_H diff --git a/slsDetectorCalibration/dataStructures/chiptestBoardData.h b/slsDetectorCalibration/dataStructures/chiptestBoardData.h index 0ef633c44..c6019a9eb 100644 --- a/slsDetectorCalibration/dataStructures/chiptestBoardData.h +++ b/slsDetectorCalibration/dataStructures/chiptestBoardData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CHIPTESTDATA_H #define CHIPTESTDATA_H diff --git a/slsDetectorCalibration/dataStructures/deserializer.h b/slsDetectorCalibration/dataStructures/deserializer.h index a14da9e15..4bdce415c 100644 --- a/slsDetectorCalibration/dataStructures/deserializer.h +++ b/slsDetectorCalibration/dataStructures/deserializer.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef DESERIALIZER_H #define DESERIALIZER_H #include diff --git a/slsDetectorCalibration/dataStructures/gotthardDoubleModuleDataNew.h b/slsDetectorCalibration/dataStructures/gotthardDoubleModuleDataNew.h index 9cf11c540..657728724 100644 --- a/slsDetectorCalibration/dataStructures/gotthardDoubleModuleDataNew.h +++ b/slsDetectorCalibration/dataStructures/gotthardDoubleModuleDataNew.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef GOTTHARD2MODULEDATANEW_H #define GOTTHARD2MODULEDATANEW_H #include "gotthardModuleDataNew.h" diff --git a/slsDetectorCalibration/dataStructures/gotthardShortModuleData.h b/slsDetectorCalibration/dataStructures/gotthardShortModuleData.h index 4d853c7b0..a546140d2 100644 --- a/slsDetectorCalibration/dataStructures/gotthardShortModuleData.h +++ b/slsDetectorCalibration/dataStructures/gotthardShortModuleData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef GOTTHARDSHORTMODULEDATA_H #define GOTTHARDSHORTMODULEDATA_H #include "slsReceiverData.h" diff --git a/slsDetectorCalibration/dataStructures/imageZmq16bit.h b/slsDetectorCalibration/dataStructures/imageZmq16bit.h index efba95bdf..cb28f36be 100644 --- a/slsDetectorCalibration/dataStructures/imageZmq16bit.h +++ b/slsDetectorCalibration/dataStructures/imageZmq16bit.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef IMAGEZMQ16BIT_H #define IMAGEZMQ16BIT_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/imageZmq32bit.h b/slsDetectorCalibration/dataStructures/imageZmq32bit.h index 7217c09d6..c5240c35c 100644 --- a/slsDetectorCalibration/dataStructures/imageZmq32bit.h +++ b/slsDetectorCalibration/dataStructures/imageZmq32bit.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef IMAGEZMQ32BIT_H #define IMAGEZMQ32BIT_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/jungfrauHighZSingleChipData.h b/slsDetectorCalibration/dataStructures/jungfrauHighZSingleChipData.h index d3bc61f62..7983c34e4 100644 --- a/slsDetectorCalibration/dataStructures/jungfrauHighZSingleChipData.h +++ b/slsDetectorCalibration/dataStructures/jungfrauHighZSingleChipData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef JUNGFRAUHIGHZSINGLECHIPDATA_H #define JUNGFRAUHIGHZSINGLECHIPDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench02CtbData.h b/slsDetectorCalibration/dataStructures/moench02CtbData.h index 937c427db..14fcaa840 100644 --- a/slsDetectorCalibration/dataStructures/moench02CtbData.h +++ b/slsDetectorCalibration/dataStructures/moench02CtbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH02CTBDATA_H #define MOENCH02CTBDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03CtbData.h b/slsDetectorCalibration/dataStructures/moench03CtbData.h index 66ae0cbda..8fee232c2 100644 --- a/slsDetectorCalibration/dataStructures/moench03CtbData.h +++ b/slsDetectorCalibration/dataStructures/moench03CtbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03CTBDATA_H #define MOENCH03CTBDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03T1CtbData.h b/slsDetectorCalibration/dataStructures/moench03T1CtbData.h index 4a99d3746..6a4e31e0f 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1CtbData.h +++ b/slsDetectorCalibration/dataStructures/moench03T1CtbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03T1CTBDATA_H #define MOENCH03T1CTBDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNew.h b/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNew.h index 799fa0293..47a681156 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNew.h +++ b/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNew.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03T1RECDATANEW_H #define MOENCH03T1RECDATANEW_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNewRect.h b/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNewRect.h index ad2e8df80..6529ec4b8 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNewRect.h +++ b/slsDetectorCalibration/dataStructures/moench03T1ReceiverDataNewRect.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03T1RECDATANEWRECT_H #define MOENCH03T1RECDATANEWRECT_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03T1ReorderedData.h b/slsDetectorCalibration/dataStructures/moench03T1ReorderedData.h index d5f988922..5e710f262 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1ReorderedData.h +++ b/slsDetectorCalibration/dataStructures/moench03T1ReorderedData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03T1REORDERED_H #define MOENCH03T1REORDERED_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03T1ZmqData.h b/slsDetectorCalibration/dataStructures/moench03T1ZmqData.h index 5c01eb3bc..ad5f83086 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1ZmqData.h +++ b/slsDetectorCalibration/dataStructures/moench03T1ZmqData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03T1ZMQDATA_H #define MOENCH03T1ZMQDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h b/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h index c04d035d2..2a5fbecba 100644 --- a/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h +++ b/slsDetectorCalibration/dataStructures/moench03T1ZmqDataNew.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03T1ZMQDATANEW_H #define MOENCH03T1ZMQDATANEW_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench03TCtbData.h b/slsDetectorCalibration/dataStructures/moench03TCtbData.h index 5edbdd247..71caf17d3 100644 --- a/slsDetectorCalibration/dataStructures/moench03TCtbData.h +++ b/slsDetectorCalibration/dataStructures/moench03TCtbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03TCTBDATA_H #define MOENCH03TCTBDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench04CtbReceiver10GbData.h b/slsDetectorCalibration/dataStructures/moench04CtbReceiver10GbData.h index 916f95c65..556246699 100644 --- a/slsDetectorCalibration/dataStructures/moench04CtbReceiver10GbData.h +++ b/slsDetectorCalibration/dataStructures/moench04CtbReceiver10GbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH04REC10GBDATA_H #define MOENCH04REC10GBDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench04CtbReceiverData.h b/slsDetectorCalibration/dataStructures/moench04CtbReceiverData.h index 0ee4c8458..e3ec74a73 100644 --- a/slsDetectorCalibration/dataStructures/moench04CtbReceiverData.h +++ b/slsDetectorCalibration/dataStructures/moench04CtbReceiverData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH04RECDATA_H #define MOENCH04RECDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h index 53a0042ec..64b0587a8 100644 --- a/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h +++ b/slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH04ZMQ10GBDATA_H #define MOENCH04ZMQ10GBDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/moench04CtbZmqData.h b/slsDetectorCalibration/dataStructures/moench04CtbZmqData.h index ba57d99f0..94c5c6a88 100644 --- a/slsDetectorCalibration/dataStructures/moench04CtbZmqData.h +++ b/slsDetectorCalibration/dataStructures/moench04CtbZmqData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH04ZMQDATA_H #define MOENCH04ZMQDATA_H #include "slsDetectorData.h" diff --git a/slsDetectorCalibration/dataStructures/slsDetectorData.h b/slsDetectorCalibration/dataStructures/slsDetectorData.h index 493a2d73b..d36657f62 100644 --- a/slsDetectorCalibration/dataStructures/slsDetectorData.h +++ b/slsDetectorCalibration/dataStructures/slsDetectorData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLSDETECTORDATA_H #define SLSDETECTORDATA_H diff --git a/slsDetectorCalibration/dataStructures/slsReceiverData.h b/slsDetectorCalibration/dataStructures/slsReceiverData.h index da5be060e..220026e90 100644 --- a/slsDetectorCalibration/dataStructures/slsReceiverData.h +++ b/slsDetectorCalibration/dataStructures/slsReceiverData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLSRECEIVERDATA_H #define SLSRECEIVERDATA_H diff --git a/slsDetectorCalibration/energyCalibration.cpp b/slsDetectorCalibration/energyCalibration.cpp index 7461eca45..a1f443fd5 100644 --- a/slsDetectorCalibration/energyCalibration.cpp +++ b/slsDetectorCalibration/energyCalibration.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "energyCalibration.h" #ifdef __CINT diff --git a/slsDetectorCalibration/energyCalibration.h b/slsDetectorCalibration/energyCalibration.h index cef73d3f0..800f838cb 100644 --- a/slsDetectorCalibration/energyCalibration.h +++ b/slsDetectorCalibration/energyCalibration.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ENERGYCALIBRATION_H #define ENERGYCALIBRATION_H diff --git a/slsDetectorCalibration/ghostSummation.h b/slsDetectorCalibration/ghostSummation.h index 12d0806c9..82721059d 100644 --- a/slsDetectorCalibration/ghostSummation.h +++ b/slsDetectorCalibration/ghostSummation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef GHOSTSUMMATION_H #define GHOSTSUMMATION_H diff --git a/slsDetectorCalibration/gotthardExecutables/Makefile b/slsDetectorCalibration/gotthardExecutables/Makefile index 5d11522b1..3c24a910f 100644 --- a/slsDetectorCalibration/gotthardExecutables/Makefile +++ b/slsDetectorCalibration/gotthardExecutables/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package slsReceiver --rx_tcpport 1954 & slsReceiver --rx_tcpport 1955 & diff --git a/slsDetectorCalibration/interpolatingDetector.h b/slsDetectorCalibration/interpolatingDetector.h index 973bd57ed..7053568d9 100644 --- a/slsDetectorCalibration/interpolatingDetector.h +++ b/slsDetectorCalibration/interpolatingDetector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef INTERPOLATINGDETECTOR_H #define INTERPOLATINGDETECTOR_H diff --git a/slsDetectorCalibration/interpolations/eta2InterpolationBase.h b/slsDetectorCalibration/interpolations/eta2InterpolationBase.h index 26431ed92..bfc9685ec 100644 --- a/slsDetectorCalibration/interpolations/eta2InterpolationBase.h +++ b/slsDetectorCalibration/interpolations/eta2InterpolationBase.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA2_INTERPOLATION_BASE_H #define ETA2_INTERPOLATION_BASE_H diff --git a/slsDetectorCalibration/interpolations/eta3InterpolationBase.h b/slsDetectorCalibration/interpolations/eta3InterpolationBase.h index a00969bb2..233a11358 100644 --- a/slsDetectorCalibration/interpolations/eta3InterpolationBase.h +++ b/slsDetectorCalibration/interpolations/eta3InterpolationBase.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA3_INTERPOLATION_BASE_H #define ETA3_INTERPOLATION_BASE_H diff --git a/slsDetectorCalibration/interpolations/etaInterpolationAdaptiveBins.h b/slsDetectorCalibration/interpolations/etaInterpolationAdaptiveBins.h index feef0d3a9..e453d566d 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationAdaptiveBins.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationAdaptiveBins.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA_INTERPOLATION_ADAPTIVEBINS_H #define ETA_INTERPOLATION_ADAPTIVEBINS_H diff --git a/slsDetectorCalibration/interpolations/etaInterpolationBase.h b/slsDetectorCalibration/interpolations/etaInterpolationBase.h index 52273aab0..d04e125db 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationBase.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationBase.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA_INTERPOLATION_BASE_H #define ETA_INTERPOLATION_BASE_H diff --git a/slsDetectorCalibration/interpolations/etaInterpolationCleverAdaptiveBins.h b/slsDetectorCalibration/interpolations/etaInterpolationCleverAdaptiveBins.h index 624b89629..40eb9d836 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationCleverAdaptiveBins.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationCleverAdaptiveBins.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA_INTERPOLATION_CLEVER_ADAPTIVEBINS_H #define ETA_INTERPOLATION_CLEVER_ADAPTIVEBINS_H diff --git a/slsDetectorCalibration/interpolations/etaInterpolationGlobal.h b/slsDetectorCalibration/interpolations/etaInterpolationGlobal.h index 615b7c04b..73d7e2833 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationGlobal.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationGlobal.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA_INTERPOLATION_GLOBAL_H #define ETA_INTERPOLATION_GLOBAL_H diff --git a/slsDetectorCalibration/interpolations/etaInterpolationPosXY.h b/slsDetectorCalibration/interpolations/etaInterpolationPosXY.h index 0d29c1658..5d28bfffb 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationPosXY.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationPosXY.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA_INTERPOLATION_POSXY_H #define ETA_INTERPOLATION_POSXY_H diff --git a/slsDetectorCalibration/interpolations/etaInterpolationRandomBins.h b/slsDetectorCalibration/interpolations/etaInterpolationRandomBins.h index e3a3591a4..41939fe5c 100644 --- a/slsDetectorCalibration/interpolations/etaInterpolationRandomBins.h +++ b/slsDetectorCalibration/interpolations/etaInterpolationRandomBins.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef ETA_INTERPOLATION_RANDOMBINS_H #define ETA_INTERPOLATION_RANDOMBINS_H diff --git a/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.cpp b/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.cpp index 922c91d4f..42783a436 100644 --- a/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.cpp +++ b/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "EtaVEL.h" #include diff --git a/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.h b/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.h index 5c73d8a83..d2c31d803 100644 --- a/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.h +++ b/slsDetectorCalibration/interpolations/etaVEL/EtaVEL.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/slsDetectorCalibration/interpolations/etaVEL/EtaVELTr.py b/slsDetectorCalibration/interpolations/etaVEL/EtaVELTr.py index ebb152737..3c7d6c080 100644 --- a/slsDetectorCalibration/interpolations/etaVEL/EtaVELTr.py +++ b/slsDetectorCalibration/interpolations/etaVEL/EtaVELTr.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package import numpy as np import math diff --git a/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.cpp b/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.cpp index 1cdd3c718..43e6ebed0 100644 --- a/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.cpp +++ b/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "interpolation_EtaVEL.h" #include "TH2F.h" #include "TCanvas.h" diff --git a/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.h b/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.h index 8fbacf96d..e35624da8 100644 --- a/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.h +++ b/slsDetectorCalibration/interpolations/etaVEL/etaVELInterpolation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef INTERPOLATION_ETAVEL_H #define INTERPOLATION_ETAVEL_H diff --git a/slsDetectorCalibration/interpolations/linearInterpolation.h b/slsDetectorCalibration/interpolations/linearInterpolation.h index 605de4c93..9eafc2fbf 100644 --- a/slsDetectorCalibration/interpolations/linearInterpolation.h +++ b/slsDetectorCalibration/interpolations/linearInterpolation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef LINEAR_INTERPOLATION_H #define LINEAR_INTERPOLATION_H diff --git a/slsDetectorCalibration/interpolations/noInterpolation.h b/slsDetectorCalibration/interpolations/noInterpolation.h index be072f926..3f4b52b88 100644 --- a/slsDetectorCalibration/interpolations/noInterpolation.h +++ b/slsDetectorCalibration/interpolations/noInterpolation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef NO_INTERPOLATION_H #define NO_INTERPOLATION_H diff --git a/slsDetectorCalibration/interpolations/slsInterpolation.h b/slsDetectorCalibration/interpolations/slsInterpolation.h index ed99160c0..c061a2e36 100644 --- a/slsDetectorCalibration/interpolations/slsInterpolation.h +++ b/slsDetectorCalibration/interpolations/slsInterpolation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLS_INTERPOLATION_H #define SLS_INTERPOLATION_H diff --git a/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder b/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder index 19dfe56d6..574f48e35 100644 --- a/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder +++ b/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #module add CBFlib/0.9.5 INCDIR=-I. -I../ -I../interpolations -I../interpolations/etaVEL -I../dataStructures -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ diff --git a/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder~ b/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder~ index c5eeca444..f452a020f 100644 --- a/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder~ +++ b/slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder~ @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #module add CBFlib/0.9.5 INCDIR=-I. -I../ -I../interpolations -I../interpolations/etaVEL -I../dataStructures -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ diff --git a/slsDetectorCalibration/jungfrauExecutables/Makefile.zmq b/slsDetectorCalibration/jungfrauExecutables/Makefile.zmq index fdde1b8a1..af60de798 100644 --- a/slsDetectorCalibration/jungfrauExecutables/Makefile.zmq +++ b/slsDetectorCalibration/jungfrauExecutables/Makefile.zmq @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package INCDIR= -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../../libs/rapidjson/ LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -std=c++11 -Wall -L../../build/bin/ -lSlsSupport diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder.cpp index f7b2f916a..edf1a83b9 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#include "sls/ansi.h" #include diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauInterpolation.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauInterpolation.cpp index eeeed90c6..dc9953590 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauInterpolation.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauInterpolation.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ansi.h" #include diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp index 7b765bd5e..51b416e7a 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauPhotonCounter.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#include "sls/ansi.h" #include #define CORR diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauZmqProcess.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauZmqProcess.cpp index 47e424306..a92561821 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauZmqProcess.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauZmqProcess.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#define WRITE_QUAD #define DEVELOPER #undef CORR diff --git a/slsDetectorCalibration/moench03CommonMode.h b/slsDetectorCalibration/moench03CommonMode.h index 0d21c884f..876146630 100644 --- a/slsDetectorCalibration/moench03CommonMode.h +++ b/slsDetectorCalibration/moench03CommonMode.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03COMMONMODE_H #define MOENCH03COMMONMODE_H diff --git a/slsDetectorCalibration/moench03GhostSummation.h b/slsDetectorCalibration/moench03GhostSummation.h index 165e422d5..ce5574b8e 100644 --- a/slsDetectorCalibration/moench03GhostSummation.h +++ b/slsDetectorCalibration/moench03GhostSummation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCH03GHOSTSUMMATION_H #define MOENCH03GHOSTSUMMATION_H diff --git a/slsDetectorCalibration/moenchCommonMode.h b/slsDetectorCalibration/moenchCommonMode.h index cddadd1bb..df5959ca2 100644 --- a/slsDetectorCalibration/moenchCommonMode.h +++ b/slsDetectorCalibration/moenchCommonMode.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MOENCHCOMMONMODE_H #define MOENCHCOMMONMODE_H diff --git a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt index ba06c276a..cd7cb6182 100644 --- a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt +++ b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package find_package(TIFF REQUIRED) diff --git a/slsDetectorCalibration/moenchExecutables/Makefile.cluster_finder b/slsDetectorCalibration/moenchExecutables/Makefile.cluster_finder index c5eeca444..f452a020f 100644 --- a/slsDetectorCalibration/moenchExecutables/Makefile.cluster_finder +++ b/slsDetectorCalibration/moenchExecutables/Makefile.cluster_finder @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #module add CBFlib/0.9.5 INCDIR=-I. -I../ -I../interpolations -I../interpolations/etaVEL -I../dataStructures -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ diff --git a/slsDetectorCalibration/moenchExecutables/Makefile.zmq b/slsDetectorCalibration/moenchExecutables/Makefile.zmq index fdde1b8a1..af60de798 100644 --- a/slsDetectorCalibration/moenchExecutables/Makefile.zmq +++ b/slsDetectorCalibration/moenchExecutables/Makefile.zmq @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package INCDIR= -I. -I../dataStructures ../tiffIO.cpp -I../ -I../interpolations/ -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../../libs/rapidjson/ LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -O3 -std=c++11 -Wall -L../../build/bin/ -lSlsSupport diff --git a/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp b/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp index 36a6675af..4ed5d26e4 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03ClusterFinder.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#include "sls/ansi.h" #include diff --git a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp index eeeed90c6..dc9953590 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ansi.h" #include diff --git a/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp index b07985ec9..406c5ae33 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03NoInterpolation.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ansi.h" #include diff --git a/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp b/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp index 7b765bd5e..51b416e7a 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchPhotonCounter.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#include "sls/ansi.h" #include #define CORR diff --git a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp index b79c28f60..70237919b 100644 --- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp +++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package //#define WRITE_QUAD #define DEVELOPER #undef CORR diff --git a/slsDetectorCalibration/multiThreadedAnalogDetector.h b/slsDetectorCalibration/multiThreadedAnalogDetector.h index 3989b9020..d5a2ebdca 100644 --- a/slsDetectorCalibration/multiThreadedAnalogDetector.h +++ b/slsDetectorCalibration/multiThreadedAnalogDetector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MULTITHREADED_ANALOG_DETECTOR_H #define MULTITHREADED_ANALOG_DETECTOR_H diff --git a/slsDetectorCalibration/multiThreadedCountingDetector.h b/slsDetectorCalibration/multiThreadedCountingDetector.h index a4586b343..f1a7afb9c 100644 --- a/slsDetectorCalibration/multiThreadedCountingDetector.h +++ b/slsDetectorCalibration/multiThreadedCountingDetector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MULTITHREADED_COUNTING_DETECTOR_H #define MULTITHREADED_COUNTING_DETECTOR_H diff --git a/slsDetectorCalibration/multiThreadedInterpolatingDetector.h b/slsDetectorCalibration/multiThreadedInterpolatingDetector.h index fd3752e5b..1362cfdf2 100644 --- a/slsDetectorCalibration/multiThreadedInterpolatingDetector.h +++ b/slsDetectorCalibration/multiThreadedInterpolatingDetector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MULTITHREADED_INTERPOLATING_DETECTOR_H #define MULTITHREADED_INTERPOLATING_DETECTOR_H diff --git a/slsDetectorCalibration/pedestalSubtraction.h b/slsDetectorCalibration/pedestalSubtraction.h index 35c010d60..8283d6769 100644 --- a/slsDetectorCalibration/pedestalSubtraction.h +++ b/slsDetectorCalibration/pedestalSubtraction.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef PEDESTALSUBTRACTION_H #define PEDESTALSUBTRACTION_H diff --git a/slsDetectorCalibration/singlePhotonDetector.h b/slsDetectorCalibration/singlePhotonDetector.h index 09c2333db..720f3517d 100644 --- a/slsDetectorCalibration/singlePhotonDetector.h +++ b/slsDetectorCalibration/singlePhotonDetector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SINGLEPHOTONDETECTOR_H #define SINGLEPHOTONDETECTOR_H diff --git a/slsDetectorCalibration/single_photon_hit.h b/slsDetectorCalibration/single_photon_hit.h index 922527320..74da45dbe 100644 --- a/slsDetectorCalibration/single_photon_hit.h +++ b/slsDetectorCalibration/single_photon_hit.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SINGLE_PHOTON_HIT_H #define SINGLE_PHOTON_HIT_H #include diff --git a/slsDetectorCalibration/tiffIO.cpp b/slsDetectorCalibration/tiffIO.cpp index 5b3d7b737..c92ba87fc 100644 --- a/slsDetectorCalibration/tiffIO.cpp +++ b/slsDetectorCalibration/tiffIO.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MY_TIFF_IO_H #include "tiffIO.h" #endif diff --git a/slsDetectorCalibration/tiffIO.h b/slsDetectorCalibration/tiffIO.h index a248e367f..8b11b844e 100644 --- a/slsDetectorCalibration/tiffIO.h +++ b/slsDetectorCalibration/tiffIO.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MY_TIFF_IO_H #define MY_TIFF_IO_H diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt old mode 100755 new mode 100644 index 70e8a2e9b..75f4ed2f6 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package set(CMAKE_AUTOMOC ON) find_package(Qt4 REQUIRED) diff --git a/slsDetectorGui/include/qCloneWidget.h b/slsDetectorGui/include/qCloneWidget.h index d63d98fe5..ce4484cb6 100644 --- a/slsDetectorGui/include/qCloneWidget.h +++ b/slsDetectorGui/include/qCloneWidget.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "ui_form_cloneplot.h" #include diff --git a/slsDetectorGui/include/qDacWidget.h b/slsDetectorGui/include/qDacWidget.h index 8925e1c32..ef2b7f85d 100644 --- a/slsDetectorGui/include/qDacWidget.h +++ b/slsDetectorGui/include/qDacWidget.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index 4364e3b3b..8ee853bae 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/logger.h" diff --git a/slsDetectorGui/include/qDetectorMain.h b/slsDetectorGui/include/qDetectorMain.h index 92ae9b6cc..2d4b9ac38 100644 --- a/slsDetectorGui/include/qDetectorMain.h +++ b/slsDetectorGui/include/qDetectorMain.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "qDefs.h" #include "sls/Detector.h" diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index 03277ff49..df96214bf 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "qDefs.h" #include "sls/Detector.h" diff --git a/slsDetectorGui/include/qTabAdvanced.h b/slsDetectorGui/include/qTabAdvanced.h index 355beab05..074ab4131 100644 --- a/slsDetectorGui/include/qTabAdvanced.h +++ b/slsDetectorGui/include/qTabAdvanced.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "ui_form_tab_advanced.h" diff --git a/slsDetectorGui/include/qTabDataOutput.h b/slsDetectorGui/include/qTabDataOutput.h index 8f753a6db..bb1fbebe8 100644 --- a/slsDetectorGui/include/qTabDataOutput.h +++ b/slsDetectorGui/include/qTabDataOutput.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "ui_form_tab_dataoutput.h" diff --git a/slsDetectorGui/include/qTabDebugging.h b/slsDetectorGui/include/qTabDebugging.h index 412046914..48cd85aae 100644 --- a/slsDetectorGui/include/qTabDebugging.h +++ b/slsDetectorGui/include/qTabDebugging.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "ui_form_tab_debugging.h" diff --git a/slsDetectorGui/include/qTabDeveloper.h b/slsDetectorGui/include/qTabDeveloper.h index be3d25c4c..9dacf6442 100644 --- a/slsDetectorGui/include/qTabDeveloper.h +++ b/slsDetectorGui/include/qTabDeveloper.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorGui/include/qTabMeasurement.h b/slsDetectorGui/include/qTabMeasurement.h index b1b1270a5..7b1f7d1aa 100644 --- a/slsDetectorGui/include/qTabMeasurement.h +++ b/slsDetectorGui/include/qTabMeasurement.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "ui_form_tab_measurement.h" diff --git a/slsDetectorGui/include/qTabMessages.h b/slsDetectorGui/include/qTabMessages.h index 23f692478..98676fe24 100644 --- a/slsDetectorGui/include/qTabMessages.h +++ b/slsDetectorGui/include/qTabMessages.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "ui_form_tab_messages.h" diff --git a/slsDetectorGui/include/qTabPlot.h b/slsDetectorGui/include/qTabPlot.h index c146d07d9..073e3a7b3 100644 --- a/slsDetectorGui/include/qTabPlot.h +++ b/slsDetectorGui/include/qTabPlot.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "ui_form_tab_plot.h" diff --git a/slsDetectorGui/include/qTabSettings.h b/slsDetectorGui/include/qTabSettings.h index d4ec2f73a..28f61e09c 100644 --- a/slsDetectorGui/include/qTabSettings.h +++ b/slsDetectorGui/include/qTabSettings.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" #include "ui_form_tab_settings.h" diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h index da0dac1d1..4e86e32a0 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLSQT1DPLOT_H #define SLSQT1DPLOT_H diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h index 5e9b8e079..c87a37931 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DZoomer.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLSQT1DZOOMER_H #define SLSQT1DZOOMER_H diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h index eafb68eba..e19c1859b 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DHist.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLSQT2DHIST_H #define SLSQT2DHIST_H diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h index 25342f8a7..bc49f0dcf 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DPlot.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "SlsQt2DHist.h" #include "SlsQt2DZoomer.h" diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h index a9592c550..227ec0e52 100644 --- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h +++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt2DZoomer.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef SLSQT2DZOOMER_H #define SLSQT2DZOOMER_H #include "SlsQt2DHist.h" diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp index 6c04f0124..b7b2baf98 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DPlot.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* TODO! short description */ #include "SlsQt1DPlot.h" diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp index 3c0bfa09f..85813fc45 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt1DZoomer.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* TODO! short description */ #include "SlsQt1DZoomer.h" #include "SlsQt1DPlot.h" diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp index ade86d47c..a6dbf0548 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DHist.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* TODO! short description */ #include "SlsQt2DHist.h" #include "sls/ansi.h" diff --git a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp index e00c93743..55734dbc5 100644 --- a/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp +++ b/slsDetectorGui/slsDetectorPlotting/src/SlsQt2DPlot.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "SlsQt2DPlot.h" // #include "sls/ansi.h" diff --git a/slsDetectorGui/src/qCloneWidget.cpp b/slsDetectorGui/src/qCloneWidget.cpp index 42b80439e..4d8c4210f 100644 --- a/slsDetectorGui/src/qCloneWidget.cpp +++ b/slsDetectorGui/src/qCloneWidget.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qCloneWidget.h" #include "SlsQt1DPlot.h" #include "SlsQt2DPlot.h" diff --git a/slsDetectorGui/src/qDacWidget.cpp b/slsDetectorGui/src/qDacWidget.cpp index 5db875e4f..7fb53b46b 100644 --- a/slsDetectorGui/src/qDacWidget.cpp +++ b/slsDetectorGui/src/qDacWidget.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qDacWidget.h" #include "qDefs.h" diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 53be52af0..103d691bc 100644 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qDetectorMain.h" #include "qDefs.h" #include "qDrawPlot.h" @@ -471,10 +473,8 @@ void qDetectorMain::ExecuteHelp(QAction *action) { "
slsDetectorGui Copyright (C) 2021 Contributors to SLS Detector Package

" - "This program comes with ABSOLUTELY NO WARRANTY. " - "This is free software, and you are welcome to redistribute it " - "under certain conditions. Refer LICENSE and LICESNSE.lesser " - "in root folder for more details." + "See COPYING in root folder for Licensing details:
" + "LGPL-3.0-or-other" "<\\p>", diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index c10646a8b..40edc1538 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qDrawPlot.h" #include "SlsQt1DPlot.h" #include "SlsQt2DPlot.h" diff --git a/slsDetectorGui/src/qTabAdvanced.cpp b/slsDetectorGui/src/qTabAdvanced.cpp index afbe147e2..35792344b 100644 --- a/slsDetectorGui/src/qTabAdvanced.cpp +++ b/slsDetectorGui/src/qTabAdvanced.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabAdvanced.h" #include "qDefs.h" #include "qDrawPlot.h" diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp index 86256e6fd..eda5f9817 100644 --- a/slsDetectorGui/src/qTabDataOutput.cpp +++ b/slsDetectorGui/src/qTabDataOutput.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabDataOutput.h" #include "qDefs.h" diff --git a/slsDetectorGui/src/qTabDebugging.cpp b/slsDetectorGui/src/qTabDebugging.cpp index 3e6497710..b995ba65a 100644 --- a/slsDetectorGui/src/qTabDebugging.cpp +++ b/slsDetectorGui/src/qTabDebugging.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabDebugging.h" #include "qDefs.h" #include "sls/ToString.h" diff --git a/slsDetectorGui/src/qTabDeveloper.cpp b/slsDetectorGui/src/qTabDeveloper.cpp index 8d0084719..0c4a751e3 100644 --- a/slsDetectorGui/src/qTabDeveloper.cpp +++ b/slsDetectorGui/src/qTabDeveloper.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabDeveloper.h" #include "qDacWidget.h" #include "qDefs.h" diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index 19aa42bf7..93e4e4409 100644 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabMeasurement.h" #include "qDefs.h" #include "qDrawPlot.h" diff --git a/slsDetectorGui/src/qTabMessages.cpp b/slsDetectorGui/src/qTabMessages.cpp index 98a195989..8f87d02d7 100644 --- a/slsDetectorGui/src/qTabMessages.cpp +++ b/slsDetectorGui/src/qTabMessages.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabMessages.h" #include "qDefs.h" diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index 1f1e77a4e..c4954b234 100644 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabPlot.h" #include "qDefs.h" #include "qDrawPlot.h" diff --git a/slsDetectorGui/src/qTabSettings.cpp b/slsDetectorGui/src/qTabSettings.cpp index 158cd6de1..aff785855 100644 --- a/slsDetectorGui/src/qTabSettings.cpp +++ b/slsDetectorGui/src/qTabSettings.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "qTabSettings.h" #include "qDefs.h" #include "sls/ToString.h" diff --git a/slsDetectorServers/CMakeLists.txt b/slsDetectorServers/CMakeLists.txt index af46daa94..2bb9386b0 100644 --- a/slsDetectorServers/CMakeLists.txt +++ b/slsDetectorServers/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package diff --git a/slsDetectorServers/compileAllServers.sh b/slsDetectorServers/compileAllServers.sh index b72e980bd..3158da364 100644 --- a/slsDetectorServers/compileAllServers.sh +++ b/slsDetectorServers/compileAllServers.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package if [ $# -eq 0 ]; then declare -a det=("ctbDetectorServer" "gotthardDetectorServer" diff --git a/slsDetectorServers/compileEigerServer.sh b/slsDetectorServers/compileEigerServer.sh index aa3348cf5..94e3343ca 100644 --- a/slsDetectorServers/compileEigerServer.sh +++ b/slsDetectorServers/compileEigerServer.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package declare -a det=("eigerDetectorServer") declare -a deterror=("OK" "OK" "OK" "OK") diff --git a/slsDetectorServers/ctbDetectorServer/CMakeLists.txt b/slsDetectorServers/ctbDetectorServer/CMakeLists.txt index fab32df54..181600f44 100644 --- a/slsDetectorServers/ctbDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/ctbDetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(ctbDetectorServer_virtual slsDetectorFunctionList.c ../slsDetectorServer/src/slsDetectorServer.c diff --git a/slsDetectorServers/ctbDetectorServer/Makefile b/slsDetectorServers/ctbDetectorServer/Makefile old mode 100755 new mode 100644 index fea8d8db6..56b3b271b --- a/slsDetectorServers/ctbDetectorServer/Makefile +++ b/slsDetectorServers/ctbDetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/ctbDetectorServer/RegisterDefs.h b/slsDetectorServers/ctbDetectorServer/RegisterDefs.h index 30e9f0649..ce7fa1337 100644 --- a/slsDetectorServers/ctbDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/ctbDetectorServer/RegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /* Definitions for FPGA */ diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c index e7f57a896..b1f8f51bb 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "clogger.h" #include "sharedMemory.h" diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h index a878e5d22..7e173e9f8 100644 --- a/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "RegisterDefs.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c b/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c index 4a79ae522..d5651ec7b 100644 --- a/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c +++ b/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ansi.h" #include diff --git a/slsDetectorServers/eigerDetectorServer/Beb.c b/slsDetectorServers/eigerDetectorServer/Beb.c index 025aba2b1..88163dfd7 100644 --- a/slsDetectorServers/eigerDetectorServer/Beb.c +++ b/slsDetectorServers/eigerDetectorServer/Beb.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "Beb.h" #include "FebRegisterDefs.h" #include "clogger.h" diff --git a/slsDetectorServers/eigerDetectorServer/Beb.h b/slsDetectorServers/eigerDetectorServer/Beb.h index c4449b540..a238c1529 100644 --- a/slsDetectorServers/eigerDetectorServer/Beb.h +++ b/slsDetectorServers/eigerDetectorServer/Beb.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "LocalLinkInterface.h" diff --git a/slsDetectorServers/eigerDetectorServer/CMakeLists.txt b/slsDetectorServers/eigerDetectorServer/CMakeLists.txt index 64f1635e1..ae8b9b0ea 100644 --- a/slsDetectorServers/eigerDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/eigerDetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package set(src slsDetectorFunctionList.c ../slsDetectorServer/src/slsDetectorServer.c diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c index 6ca0b85ae..bfcc1838f 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.c +++ b/slsDetectorServers/eigerDetectorServer/FebControl.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "FebControl.h" #include "Beb.h" #include "FebRegisterDefs.h" diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.h b/slsDetectorServers/eigerDetectorServer/FebControl.h index d600a6ca8..7ede407ad 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.h +++ b/slsDetectorServers/eigerDetectorServer/FebControl.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "FebInterface.h" #include "slsDetectorServer_defs.h" diff --git a/slsDetectorServers/eigerDetectorServer/FebInterface.c b/slsDetectorServers/eigerDetectorServer/FebInterface.c index 69042ce41..c93aa6a44 100644 --- a/slsDetectorServers/eigerDetectorServer/FebInterface.c +++ b/slsDetectorServers/eigerDetectorServer/FebInterface.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "FebInterface.h" #include "LocalLinkInterface.h" #include "clogger.h" diff --git a/slsDetectorServers/eigerDetectorServer/FebInterface.h b/slsDetectorServers/eigerDetectorServer/FebInterface.h index e89ff498d..afff53a87 100644 --- a/slsDetectorServers/eigerDetectorServer/FebInterface.h +++ b/slsDetectorServers/eigerDetectorServer/FebInterface.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once int Feb_Interface_WriteTo(unsigned int ch); diff --git a/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h b/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h index 643463858..a9a8afe96 100644 --- a/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h +++ b/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package // daq register definitions #define DAQ_REG_CTRL 1 diff --git a/slsDetectorServers/eigerDetectorServer/HardwareIO.c b/slsDetectorServers/eigerDetectorServer/HardwareIO.c index e6487af4a..7e783d5d2 100644 --- a/slsDetectorServers/eigerDetectorServer/HardwareIO.c +++ b/slsDetectorServers/eigerDetectorServer/HardwareIO.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "HardwareIO.h" xfs_u8 HWIO_xfs_in8(xfs_u32 InAddress) { diff --git a/slsDetectorServers/eigerDetectorServer/HardwareIO.h b/slsDetectorServers/eigerDetectorServer/HardwareIO.h index dd2d0c73d..3e21ddc8b 100644 --- a/slsDetectorServers/eigerDetectorServer/HardwareIO.h +++ b/slsDetectorServers/eigerDetectorServer/HardwareIO.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package // Class initially from Gerd and was called mmap_test.c #pragma once diff --git a/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h b/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h index f2523f9a2..631f298d2 100644 --- a/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h +++ b/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package // from Gerd and was called mmap_test.h diff --git a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c index 1c7dace24..c9252cf55 100644 --- a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c +++ b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "LocalLinkInterface.h" #include "HardwareMMappingDefs.h" #include "clogger.h" diff --git a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h index 4dfcbfa6c..ec587297b 100644 --- a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h +++ b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "HardwareIO.h" diff --git a/slsDetectorServers/eigerDetectorServer/Makefile b/slsDetectorServers/eigerDetectorServer/Makefile old mode 100755 new mode 100644 index 5f1d61d2d..c242d3bb1 --- a/slsDetectorServers/eigerDetectorServer/Makefile +++ b/slsDetectorServers/eigerDetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c index 5dc0e62bd..292604a33 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h index 39cbe9294..807985d46 100644 --- a/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/eigerDetectorServer/xfs_types.h b/slsDetectorServers/eigerDetectorServer/xfs_types.h index 3c7d6216c..1c998bdc4 100644 --- a/slsDetectorServers/eigerDetectorServer/xfs_types.h +++ b/slsDetectorServers/eigerDetectorServer/xfs_types.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once //#include "types.h" diff --git a/slsDetectorServers/eigerDetectorServer/xparameters.h b/slsDetectorServers/eigerDetectorServer/xparameters.h index d293257d2..4b3bf1312 100644 --- a/slsDetectorServers/eigerDetectorServer/xparameters.h +++ b/slsDetectorServers/eigerDetectorServer/xparameters.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* ONLY THOSE ARE USED IN THIS SOFTWARE. If one of those is modified in xilinx compilation, this file should be replaced with updated values XPAR_PLB_LL_FIFO_AURORA_DUAL_CTRL_FEB_RIGHT_BASEADDR diff --git a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt index f1399bf9c..dbe403fd3 100644 --- a/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/gotthard2DetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(gotthard2DetectorServer_virtual slsDetectorFunctionList.c ../slsDetectorServer/src/slsDetectorServer.c diff --git a/slsDetectorServers/gotthard2DetectorServer/Makefile b/slsDetectorServers/gotthard2DetectorServer/Makefile old mode 100755 new mode 100644 index 481827eab..23ea50584 --- a/slsDetectorServers/gotthard2DetectorServer/Makefile +++ b/slsDetectorServers/gotthard2DetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h index cb1ac8428..a5a1fb87a 100644 --- a/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h +++ b/slsDetectorServers/gotthard2DetectorServer/RegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once // clang-format off #define REG_OFFSET (4) diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c index 6f84c6eab..f4901da8f 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "ALTERA_PLL_CYCLONE10.h" #include "ASIC_Driver.h" diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 4f1970532..0f5f4971c 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt b/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt index 8dc6bf58a..e2f7eac57 100644 --- a/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/gotthardDetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(gotthardDetectorServer_virtual slsDetectorFunctionList.c ../slsDetectorServer/src/slsDetectorServer.c diff --git a/slsDetectorServers/gotthardDetectorServer/Makefile b/slsDetectorServers/gotthardDetectorServer/Makefile old mode 100755 new mode 100644 index 9544d991c..75bed6bb9 --- a/slsDetectorServers/gotthardDetectorServer/Makefile +++ b/slsDetectorServers/gotthardDetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/gotthardDetectorServer/RegisterDefs.h b/slsDetectorServers/gotthardDetectorServer/RegisterDefs.h index c8ba9c463..d04e80346 100644 --- a/slsDetectorServers/gotthardDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/gotthardDetectorServer/RegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /* Definitions for FPGA*/ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index 895042dd6..1fd57beb4 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "RegisterDefs.h" #include "clogger.h" diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h index f88039230..fa91cc1ee 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" #include diff --git a/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt b/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt index d5d251e81..b1cd36a13 100644 --- a/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(jungfrauDetectorServer_virtual slsDetectorFunctionList.c ../slsDetectorServer/src/slsDetectorServer.c diff --git a/slsDetectorServers/jungfrauDetectorServer/Makefile b/slsDetectorServers/jungfrauDetectorServer/Makefile old mode 100755 new mode 100644 index 054f2c62a..0468da861 --- a/slsDetectorServers/jungfrauDetectorServer/Makefile +++ b/slsDetectorServers/jungfrauDetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h index 90db574f5..c632c3190 100644 --- a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once // clang-format off diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c index a4fed5076..450c84b72 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "clogger.h" #include "sharedMemory.h" diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index ca9f1fc85..4f98c0b2e 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "RegisterDefs.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/moenchDetectorServer/CMakeLists.txt b/slsDetectorServers/moenchDetectorServer/CMakeLists.txt index 8a2a02ed6..de0923b87 100644 --- a/slsDetectorServers/moenchDetectorServer/CMakeLists.txt +++ b/slsDetectorServers/moenchDetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(moenchDetectorServer_virtual slsDetectorFunctionList.c ../slsDetectorServer/src/slsDetectorServer.c diff --git a/slsDetectorServers/moenchDetectorServer/Makefile b/slsDetectorServers/moenchDetectorServer/Makefile old mode 100755 new mode 100644 index 3091c6564..f08d178e1 --- a/slsDetectorServers/moenchDetectorServer/Makefile +++ b/slsDetectorServers/moenchDetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/moenchDetectorServer/RegisterDefs.h b/slsDetectorServers/moenchDetectorServer/RegisterDefs.h index faf82eb9e..26718e885 100644 --- a/slsDetectorServers/moenchDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/moenchDetectorServer/RegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /* Definitions for FPGA */ diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c index bdda08571..1d48623a0 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "clogger.h" #include "sharedMemory.h" diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h index aa17e8047..ffcd29bd3 100644 --- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "RegisterDefs.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt b/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt index aee0a6b57..9033f5200 100644 --- a/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt +++ b/slsDetectorServers/mythen3DetectorServer/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package add_executable(mythen3DetectorServer_virtual slsDetectorFunctionList.c mythen3.c diff --git a/slsDetectorServers/mythen3DetectorServer/Makefile b/slsDetectorServers/mythen3DetectorServer/Makefile old mode 100755 new mode 100644 index f8fb7e3c4..29e39f6b2 --- a/slsDetectorServers/mythen3DetectorServer/Makefile +++ b/slsDetectorServers/mythen3DetectorServer/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) main_inc = ../slsDetectorServer/include/ main_src = ../slsDetectorServer/src/ diff --git a/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h b/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h index ffa134e38..a68efb19b 100644 --- a/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h +++ b/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once // clang-format off diff --git a/slsDetectorServers/mythen3DetectorServer/mythen3.c b/slsDetectorServers/mythen3DetectorServer/mythen3.c index 64f4bdb11..7d98a9734 100644 --- a/slsDetectorServers/mythen3DetectorServer/mythen3.c +++ b/slsDetectorServers/mythen3DetectorServer/mythen3.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "mythen3.h" #include "clogger.h" diff --git a/slsDetectorServers/mythen3DetectorServer/mythen3.h b/slsDetectorServers/mythen3DetectorServer/mythen3.h index c27e7189e..14ec2226e 100644 --- a/slsDetectorServers/mythen3DetectorServer/mythen3.h +++ b/slsDetectorServers/mythen3DetectorServer/mythen3.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef MYTHEN3_H #define MYTHEN3_H diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index b70da61c7..8c9288b7e 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorFunctionList.h" #include "ALTERA_PLL_CYCLONE10.h" #include "DAC6571.h" diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h index f39da11b8..74a021209 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/include/AD7689.h b/slsDetectorServers/slsDetectorServer/include/AD7689.h index e30a0e8ed..020f64a03 100644 --- a/slsDetectorServers/slsDetectorServer/include/AD7689.h +++ b/slsDetectorServers/slsDetectorServer/include/AD7689.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/AD9252.h b/slsDetectorServers/slsDetectorServer/include/AD9252.h index 2982a1962..b2787ef99 100644 --- a/slsDetectorServers/slsDetectorServer/include/AD9252.h +++ b/slsDetectorServers/slsDetectorServer/include/AD9252.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/AD9257.h b/slsDetectorServers/slsDetectorServer/include/AD9257.h index 333050106..2989e7010 100644 --- a/slsDetectorServers/slsDetectorServer/include/AD9257.h +++ b/slsDetectorServers/slsDetectorServer/include/AD9257.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h b/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h index b3187260b..57e6fac7d 100644 --- a/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h +++ b/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL_CYCLONE10.h b/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL_CYCLONE10.h index 8044323ee..67d2de757 100644 --- a/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL_CYCLONE10.h +++ b/slsDetectorServers/slsDetectorServer/include/ALTERA_PLL_CYCLONE10.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/ASIC_Driver.h b/slsDetectorServers/slsDetectorServer/include/ASIC_Driver.h index 597022a12..b6ba53632 100644 --- a/slsDetectorServers/slsDetectorServer/include/ASIC_Driver.h +++ b/slsDetectorServers/slsDetectorServer/include/ASIC_Driver.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/DAC6571.h b/slsDetectorServers/slsDetectorServer/include/DAC6571.h index 41bac9486..1a13d3c14 100644 --- a/slsDetectorServers/slsDetectorServer/include/DAC6571.h +++ b/slsDetectorServers/slsDetectorServer/include/DAC6571.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/I2C.h b/slsDetectorServers/slsDetectorServer/include/I2C.h index e8fd1a332..19d6debe1 100644 --- a/slsDetectorServers/slsDetectorServer/include/I2C.h +++ b/slsDetectorServers/slsDetectorServer/include/I2C.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/INA226.h b/slsDetectorServers/slsDetectorServer/include/INA226.h index 20ed47b4b..b7e39c2a8 100644 --- a/slsDetectorServers/slsDetectorServer/include/INA226.h +++ b/slsDetectorServers/slsDetectorServer/include/INA226.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/LTC2620.h b/slsDetectorServers/slsDetectorServer/include/LTC2620.h index 5d053af44..b9841f615 100644 --- a/slsDetectorServers/slsDetectorServer/include/LTC2620.h +++ b/slsDetectorServers/slsDetectorServer/include/LTC2620.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/LTC2620_Driver.h b/slsDetectorServers/slsDetectorServer/include/LTC2620_Driver.h index 78c05a199..6a05cde62 100644 --- a/slsDetectorServers/slsDetectorServer/include/LTC2620_Driver.h +++ b/slsDetectorServers/slsDetectorServer/include/LTC2620_Driver.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/MAX1932.h b/slsDetectorServers/slsDetectorServer/include/MAX1932.h index 4eccf05f4..e19e0c8da 100644 --- a/slsDetectorServers/slsDetectorServer/include/MAX1932.h +++ b/slsDetectorServers/slsDetectorServer/include/MAX1932.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h b/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h index 51c8ff246..2b401439d 100644 --- a/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h +++ b/slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/blackfin.h b/slsDetectorServers/slsDetectorServer/include/blackfin.h index a1995cfa9..e3a2d50f7 100644 --- a/slsDetectorServers/slsDetectorServer/include/blackfin.h +++ b/slsDetectorServers/slsDetectorServer/include/blackfin.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/clogger.h b/slsDetectorServers/slsDetectorServer/include/clogger.h index cfcb63f07..9f392535c 100644 --- a/slsDetectorServers/slsDetectorServer/include/clogger.h +++ b/slsDetectorServers/slsDetectorServer/include/clogger.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/ansi.h" diff --git a/slsDetectorServers/slsDetectorServer/include/common.h b/slsDetectorServers/slsDetectorServer/include/common.h index 5b6c98a41..6a0ab83c2 100644 --- a/slsDetectorServers/slsDetectorServer/include/common.h +++ b/slsDetectorServers/slsDetectorServer/include/common.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/md5.h" diff --git a/slsDetectorServers/slsDetectorServer/include/commonServerFunctions.h b/slsDetectorServers/slsDetectorServer/include/commonServerFunctions.h index 3f5cb9e7e..e93b485b9 100644 --- a/slsDetectorServers/slsDetectorServer/include/commonServerFunctions.h +++ b/slsDetectorServers/slsDetectorServer/include/commonServerFunctions.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/communication_funcs.h b/slsDetectorServers/slsDetectorServer/include/communication_funcs.h index 21e59476a..1618e857d 100644 --- a/slsDetectorServers/slsDetectorServer/include/communication_funcs.h +++ b/slsDetectorServers/slsDetectorServer/include/communication_funcs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef COMMUNICATION_FUNCS_H #define COMMUNICATION_FUNCS_H diff --git a/slsDetectorServers/slsDetectorServer/include/communication_funcs_UDP.h b/slsDetectorServers/slsDetectorServer/include/communication_funcs_UDP.h index 3ba9f251d..ecd9d5deb 100644 --- a/slsDetectorServers/slsDetectorServer/include/communication_funcs_UDP.h +++ b/slsDetectorServers/slsDetectorServer/include/communication_funcs_UDP.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once void setupUDPCommParameters(); diff --git a/slsDetectorServers/slsDetectorServer/include/loadPattern.h b/slsDetectorServers/slsDetectorServer/include/loadPattern.h index d2e2e43ff..84f73b8b4 100644 --- a/slsDetectorServers/slsDetectorServer/include/loadPattern.h +++ b/slsDetectorServers/slsDetectorServer/include/loadPattern.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef LOADPATTERN_H #define LOADPATTERN_H #include "Pattern.h" diff --git a/slsDetectorServers/slsDetectorServer/include/nios.h b/slsDetectorServers/slsDetectorServer/include/nios.h index 128f556cf..33b0d4252 100644 --- a/slsDetectorServers/slsDetectorServer/include/nios.h +++ b/slsDetectorServers/slsDetectorServer/include/nios.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/programFpgaBlackfin.h b/slsDetectorServers/slsDetectorServer/include/programFpgaBlackfin.h index 0fff822d2..23ce5e252 100644 --- a/slsDetectorServers/slsDetectorServer/include/programFpgaBlackfin.h +++ b/slsDetectorServers/slsDetectorServer/include/programFpgaBlackfin.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/programFpgaNios.h b/slsDetectorServers/slsDetectorServer/include/programFpgaNios.h index c999a8da1..e2929ce40 100644 --- a/slsDetectorServers/slsDetectorServer/include/programFpgaNios.h +++ b/slsDetectorServers/slsDetectorServer/include/programFpgaNios.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsDetectorServers/slsDetectorServer/include/sharedMemory.h b/slsDetectorServers/slsDetectorServer/include/sharedMemory.h index 8146dfbc1..297312df0 100644 --- a/slsDetectorServers/slsDetectorServer/include/sharedMemory.h +++ b/slsDetectorServers/slsDetectorServer/include/sharedMemory.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h index 42645c97f..92fc54307 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/sls_detector_defs.h" #include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h #ifdef GOTTHARDD diff --git a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h index 8c662c724..a8be872ab 100644 --- a/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h +++ b/slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/AD7689.c b/slsDetectorServers/slsDetectorServer/src/AD7689.c index b83e70a1f..066424816 100644 --- a/slsDetectorServers/slsDetectorServer/src/AD7689.c +++ b/slsDetectorServers/slsDetectorServer/src/AD7689.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "AD7689.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/AD9252.c b/slsDetectorServers/slsDetectorServer/src/AD9252.c index 9f0ed3bcf..164e2dc13 100644 --- a/slsDetectorServers/slsDetectorServer/src/AD9252.c +++ b/slsDetectorServers/slsDetectorServer/src/AD9252.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "AD9252.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/AD9257.c b/slsDetectorServers/slsDetectorServer/src/AD9257.c index 68cc42cee..20502922d 100644 --- a/slsDetectorServers/slsDetectorServer/src/AD9257.c +++ b/slsDetectorServers/slsDetectorServer/src/AD9257.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "AD9257.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL.c b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL.c index dab4a66cc..2d03c673c 100644 --- a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL.c +++ b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "ALTERA_PLL.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c index 12849f106..fcf60e68b 100644 --- a/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c +++ b/slsDetectorServers/slsDetectorServer/src/ALTERA_PLL_CYCLONE10.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "ALTERA_PLL_CYCLONE10.h" #include "clogger.h" #include "nios.h" diff --git a/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c b/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c index e084557f9..562396b16 100644 --- a/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c +++ b/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "ASIC_Driver.h" #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/DAC6571.c b/slsDetectorServers/slsDetectorServer/src/DAC6571.c index 26b3cac68..3ed121aae 100644 --- a/slsDetectorServers/slsDetectorServer/src/DAC6571.c +++ b/slsDetectorServers/slsDetectorServer/src/DAC6571.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "DAC6571.h" #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/I2C.c b/slsDetectorServers/slsDetectorServer/src/I2C.c index 3172fa2cb..31efc129a 100644 --- a/slsDetectorServers/slsDetectorServer/src/I2C.c +++ b/slsDetectorServers/slsDetectorServer/src/I2C.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "I2C.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/INA226.c b/slsDetectorServers/slsDetectorServer/src/INA226.c index cf2c792dd..2c7d2297e 100644 --- a/slsDetectorServers/slsDetectorServer/src/INA226.c +++ b/slsDetectorServers/slsDetectorServer/src/INA226.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "INA226.h" #include "I2C.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/LTC2620.c b/slsDetectorServers/slsDetectorServer/src/LTC2620.c index d3c80f03a..ab28d4c8a 100644 --- a/slsDetectorServers/slsDetectorServer/src/LTC2620.c +++ b/slsDetectorServers/slsDetectorServer/src/LTC2620.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "LTC2620.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c b/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c index be331225b..5add339b1 100644 --- a/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c +++ b/slsDetectorServers/slsDetectorServer/src/LTC2620_Driver.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "LTC2620_Driver.h" #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/MAX1932.c b/slsDetectorServers/slsDetectorServer/src/MAX1932.c index 833d18d50..2edf69f27 100644 --- a/slsDetectorServers/slsDetectorServer/src/MAX1932.c +++ b/slsDetectorServers/slsDetectorServer/src/MAX1932.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "MAX1932.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c b/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c index 89d760db2..df6cbd525 100644 --- a/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c +++ b/slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "UDPPacketHeaderGenerator.h" #include "clogger.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/src/blackfin.c b/slsDetectorServers/slsDetectorServer/src/blackfin.c index 6d8ad90f7..3976a5d89 100644 --- a/slsDetectorServers/slsDetectorServer/src/blackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/blackfin.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "blackfin.h" #include "RegisterDefs.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/common.c b/slsDetectorServers/slsDetectorServer/src/common.c index 618187215..a784d43c2 100644 --- a/slsDetectorServers/slsDetectorServer/src/common.c +++ b/slsDetectorServers/slsDetectorServer/src/common.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #define _GNU_SOURCE // needed for strptime to be at the top #include "common.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/commonServerFunctions.c b/slsDetectorServers/slsDetectorServer/src/commonServerFunctions.c index 5b90b51d9..7026ba407 100644 --- a/slsDetectorServers/slsDetectorServer/src/commonServerFunctions.c +++ b/slsDetectorServers/slsDetectorServer/src/commonServerFunctions.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "commonServerFunctions.h" #include "blackfin.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/communication_funcs.c b/slsDetectorServers/slsDetectorServer/src/communication_funcs.c index 29b7d2941..f176012a7 100644 --- a/slsDetectorServers/slsDetectorServer/src/communication_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/communication_funcs.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "communication_funcs.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c b/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c index 95a0fc641..3e62ab323 100644 --- a/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c +++ b/slsDetectorServers/slsDetectorServer/src/communication_funcs_UDP.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "communication_funcs_UDP.h" #include "clogger.h" #include "sls/sls_detector_defs.h" diff --git a/slsDetectorServers/slsDetectorServer/src/loadPattern.c b/slsDetectorServers/slsDetectorServer/src/loadPattern.c index 0a360a10d..6465ac73b 100644 --- a/slsDetectorServers/slsDetectorServer/src/loadPattern.c +++ b/slsDetectorServers/slsDetectorServer/src/loadPattern.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "loadPattern.h" #include "RegisterDefs.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/nios.c b/slsDetectorServers/slsDetectorServer/src/nios.c index 27de69d7b..03c9f364a 100644 --- a/slsDetectorServers/slsDetectorServer/src/nios.c +++ b/slsDetectorServers/slsDetectorServer/src/nios.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "nios.h" #include "RegisterDefs.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c index e1e6a4238..32395b859 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "programFpgaBlackfin.h" #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c b/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c index 08dbe4f13..61b49bb5d 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "programFpgaNios.h" #include "clogger.h" #include "common.h" diff --git a/slsDetectorServers/slsDetectorServer/src/sharedMemory.c b/slsDetectorServers/slsDetectorServer/src/sharedMemory.c index 42b49683c..ce4bee979 100644 --- a/slsDetectorServers/slsDetectorServer/src/sharedMemory.c +++ b/slsDetectorServers/slsDetectorServer/src/sharedMemory.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sharedMemory.h" #include "clogger.h" diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c index 87acd4693..7b633e4d1 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* A simple server in the internet domain using TCP The port number is passed as an argument */ diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 6873a9328..d41796caa 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "slsDetectorServer_funcs.h" #include "clogger.h" #include "communication_funcs.h" diff --git a/slsDetectorServers/stripDetectorDaemon/Makefile b/slsDetectorServers/stripDetectorDaemon/Makefile index 1935c390d..4b2c764e9 100644 --- a/slsDetectorServers/stripDetectorDaemon/Makefile +++ b/slsDetectorServers/stripDetectorDaemon/Makefile @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package current_dir = $(shell pwd) CROSS = nios2-buildroot-linux-gnu- diff --git a/slsDetectorServers/stripDetectorDaemon/stripd.c b/slsDetectorServers/stripDetectorDaemon/stripd.c index 873a2cb6e..6be9f0111 100644 --- a/slsDetectorServers/stripDetectorDaemon/stripd.c +++ b/slsDetectorServers/stripDetectorDaemon/stripd.c @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include #include #include diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt old mode 100755 new mode 100644 index 3dbf3fe00..1a6b922f0 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package set(SOURCES src/DetectorImpl.cpp src/Module.cpp diff --git a/slsDetectorSoftware/include/sls/Detector.h b/slsDetectorSoftware/include/sls/Detector.h index 145beca57..adbc14d4a 100644 --- a/slsDetectorSoftware/include/sls/Detector.h +++ b/slsDetectorSoftware/include/sls/Detector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Pattern.h" #include "sls/Result.h" diff --git a/slsDetectorSoftware/include/sls/Pattern.h b/slsDetectorSoftware/include/sls/Pattern.h index 7f435ba54..7319a3f94 100644 --- a/slsDetectorSoftware/include/sls/Pattern.h +++ b/slsDetectorSoftware/include/sls/Pattern.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsDetectorSoftware/include/sls/Result.h b/slsDetectorSoftware/include/sls/Result.h index c7f71e481..c8653b790 100644 --- a/slsDetectorSoftware/include/sls/Result.h +++ b/slsDetectorSoftware/include/sls/Result.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /** diff --git a/slsDetectorSoftware/include/sls/detectorData.h b/slsDetectorSoftware/include/sls/detectorData.h index b4fbaf089..3205dbdce 100644 --- a/slsDetectorSoftware/include/sls/detectorData.h +++ b/slsDetectorSoftware/include/sls/detectorData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include #include diff --git a/slsDetectorSoftware/src/CmdLineApp.cpp b/slsDetectorSoftware/src/CmdLineApp.cpp index fc7867ce3..cc86cfcfa 100644 --- a/slsDetectorSoftware/src/CmdLineApp.cpp +++ b/slsDetectorSoftware/src/CmdLineApp.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* This file is used to generate the command line binaries diff --git a/slsDetectorSoftware/src/CmdParser.cpp b/slsDetectorSoftware/src/CmdParser.cpp index ab7dc52ad..109a50b77 100644 --- a/slsDetectorSoftware/src/CmdParser.cpp +++ b/slsDetectorSoftware/src/CmdParser.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdParser.h" #include "sls/string_utils.h" diff --git a/slsDetectorSoftware/src/CmdParser.h b/slsDetectorSoftware/src/CmdParser.h index 7e1bd970e..47a1703ea 100644 --- a/slsDetectorSoftware/src/CmdParser.h +++ b/slsDetectorSoftware/src/CmdParser.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* This class parses command line input or string input to extract the diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index dedb7f813..56825c542 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "HelpDacs.h" #include "sls/TimeHelper.h" diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index bafd3ed13..b1f76e0dc 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/Detector.h" diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index fa442da69..2c2d6a86a 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/Detector.h" #include "sls/detectorData.h" diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index f5a455992..2c1c011de 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "DetectorImpl.h" #include "Module.h" #include "SharedMemory.h" diff --git a/slsDetectorSoftware/src/DetectorImpl.h b/slsDetectorSoftware/src/DetectorImpl.h index e312979fb..08f83e757 100644 --- a/slsDetectorSoftware/src/DetectorImpl.h +++ b/slsDetectorSoftware/src/DetectorImpl.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "SharedMemory.h" diff --git a/slsDetectorSoftware/src/HelpDacs.h b/slsDetectorSoftware/src/HelpDacs.h index 93d2af134..236167838 100644 --- a/slsDetectorSoftware/src/HelpDacs.h +++ b/slsDetectorSoftware/src/HelpDacs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/string_utils.h" std::string GetHelpDac(std::string dac) { diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index 7404e66be..10c1cf974 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "Module.h" #include "SharedMemory.h" #include "sls/ClientSocket.h" diff --git a/slsDetectorSoftware/src/Module.h b/slsDetectorSoftware/src/Module.h index bdc8c8f79..1ed360f03 100644 --- a/slsDetectorSoftware/src/Module.h +++ b/slsDetectorSoftware/src/Module.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "SharedMemory.h" #include "sls/ClientSocket.h" diff --git a/slsDetectorSoftware/src/Pattern.cpp b/slsDetectorSoftware/src/Pattern.cpp index aade2548c..a804f0d71 100644 --- a/slsDetectorSoftware/src/Pattern.cpp +++ b/slsDetectorSoftware/src/Pattern.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/Pattern.h" #include "sls/ToString.h" #include "sls/logger.h" diff --git a/slsDetectorSoftware/src/SharedMemory.h b/slsDetectorSoftware/src/SharedMemory.h index 74b9a1e3a..080aa6e8d 100644 --- a/slsDetectorSoftware/src/SharedMemory.h +++ b/slsDetectorSoftware/src/SharedMemory.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file SharedMemory.h diff --git a/slsDetectorSoftware/tests/CMakeLists.txt b/slsDetectorSoftware/tests/CMakeLists.txt old mode 100755 new mode 100644 index a17ec4a02..bc65a73e9 --- a/slsDetectorSoftware/tests/CMakeLists.txt +++ b/slsDetectorSoftware/tests/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package target_sources(tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test-SharedMemory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test-slsDetector.cpp diff --git a/slsDetectorSoftware/tests/test-CmdParser.cpp b/slsDetectorSoftware/tests/test-CmdParser.cpp index c7e2cb916..1e530d8c8 100644 --- a/slsDetectorSoftware/tests/test-CmdParser.cpp +++ b/slsDetectorSoftware/tests/test-CmdParser.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdParser.h" #include "catch.hpp" #include diff --git a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp index d77471a0c..e750bc6a4 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-chiptestboard.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp index 032901d3a..27b4b7129 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-eiger.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-global.cpp b/slsDetectorSoftware/tests/test-CmdProxy-global.cpp index 64289f722..b8a0ca624 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-global.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-global.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "test-CmdProxy-global.h" #include "CmdProxy.h" #include "catch.hpp" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-global.h b/slsDetectorSoftware/tests/test-CmdProxy-global.h index 0a1777b7a..899462ad5 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-global.h +++ b/slsDetectorSoftware/tests/test-CmdProxy-global.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp index 84c084766..cbb737a1f 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp index a69272d63..cdba5d406 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp index 798498a2c..bc798ecd0 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp index f8431f7a9..a3f8838e4 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-moench.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp b/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp index e6d0b63bc..a4f3e1d8a 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-mythen3.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp index 611cc9163..739ca10f9 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-pattern.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp index 2a964d123..ca7cecfe7 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy-rx.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp index 5f68c922c..6d96e55a3 100644 --- a/slsDetectorSoftware/tests/test-CmdProxy.cpp +++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "CmdProxy.h" #include "catch.hpp" #include "sls/Detector.h" diff --git a/slsDetectorSoftware/tests/test-Module.cpp b/slsDetectorSoftware/tests/test-Module.cpp index e80a1a449..667aea4e9 100644 --- a/slsDetectorSoftware/tests/test-Module.cpp +++ b/slsDetectorSoftware/tests/test-Module.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "Module.h" #include "SharedMemory.h" #include "catch.hpp" diff --git a/slsDetectorSoftware/tests/test-Pattern.cpp b/slsDetectorSoftware/tests/test-Pattern.cpp index 28fb21056..868af4b2e 100644 --- a/slsDetectorSoftware/tests/test-Pattern.cpp +++ b/slsDetectorSoftware/tests/test-Pattern.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/Pattern.h" diff --git a/slsDetectorSoftware/tests/test-Result.cpp b/slsDetectorSoftware/tests/test-Result.cpp index bb113c93e..72e1993f0 100644 --- a/slsDetectorSoftware/tests/test-Result.cpp +++ b/slsDetectorSoftware/tests/test-Result.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/Result.h" #include "sls/ToString.h" diff --git a/slsDetectorSoftware/tests/test-SharedMemory.cpp b/slsDetectorSoftware/tests/test-SharedMemory.cpp index 45d3ec7d7..337929116 100644 --- a/slsDetectorSoftware/tests/test-SharedMemory.cpp +++ b/slsDetectorSoftware/tests/test-SharedMemory.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "SharedMemory.h" #include "catch.hpp" diff --git a/slsDetectorSoftware/tests/test-slsDetector.cpp b/slsDetectorSoftware/tests/test-slsDetector.cpp index cd939fb0b..f68c68b9e 100644 --- a/slsDetectorSoftware/tests/test-slsDetector.cpp +++ b/slsDetectorSoftware/tests/test-slsDetector.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package // #include "catch.hpp" // #include "sls/container_utils.h" diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt old mode 100755 new mode 100644 index 81b293d7e..e138d8fa5 --- a/slsReceiverSoftware/CMakeLists.txt +++ b/slsReceiverSoftware/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package set(SOURCES src/Implementation.cpp src/ClientInterface.cpp diff --git a/slsReceiverSoftware/include/sls/CircularFifo.h b/slsReceiverSoftware/include/sls/CircularFifo.h index b3f81233d..03f867882 100644 --- a/slsReceiverSoftware/include/sls/CircularFifo.h +++ b/slsReceiverSoftware/include/sls/CircularFifo.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /* CircularFifo.h * Code & platform dependent issues with it was originally diff --git a/slsReceiverSoftware/include/sls/Receiver.h b/slsReceiverSoftware/include/sls/Receiver.h index dabc05a48..0cae1327c 100644 --- a/slsReceiverSoftware/include/sls/Receiver.h +++ b/slsReceiverSoftware/include/sls/Receiver.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" #include diff --git a/slsReceiverSoftware/src/BinaryDataFile.cpp b/slsReceiverSoftware/src/BinaryDataFile.cpp index 731adae3d..d93fbc46c 100644 --- a/slsReceiverSoftware/src/BinaryDataFile.cpp +++ b/slsReceiverSoftware/src/BinaryDataFile.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "BinaryDataFile.h" BinaryDataFile::BinaryDataFile(const int index) : File(BINARY), index_(index) {} diff --git a/slsReceiverSoftware/src/BinaryDataFile.h b/slsReceiverSoftware/src/BinaryDataFile.h index a76a5003b..f129050a6 100644 --- a/slsReceiverSoftware/src/BinaryDataFile.h +++ b/slsReceiverSoftware/src/BinaryDataFile.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "File.h" diff --git a/slsReceiverSoftware/src/BinaryMasterFile.cpp b/slsReceiverSoftware/src/BinaryMasterFile.cpp index 2c03309af..eedf88879 100644 --- a/slsReceiverSoftware/src/BinaryMasterFile.cpp +++ b/slsReceiverSoftware/src/BinaryMasterFile.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "BinaryMasterFile.h" #include "MasterAttributes.h" diff --git a/slsReceiverSoftware/src/BinaryMasterFile.h b/slsReceiverSoftware/src/BinaryMasterFile.h index a779328f1..909634c71 100644 --- a/slsReceiverSoftware/src/BinaryMasterFile.h +++ b/slsReceiverSoftware/src/BinaryMasterFile.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "File.h" diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index b6cb23af2..a3d489423 100644 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/slsReceiverSoftware/src/ClientInterface.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "ClientInterface.h" #include "sls/ServerSocket.h" #include "sls/StaticVector.h" diff --git a/slsReceiverSoftware/src/ClientInterface.h b/slsReceiverSoftware/src/ClientInterface.h index d362edabd..549243f3b 100644 --- a/slsReceiverSoftware/src/ClientInterface.h +++ b/slsReceiverSoftware/src/ClientInterface.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "Implementation.h" #include "receiver_defs.h" diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp index 2a420f924..cb0f84766 100644 --- a/slsReceiverSoftware/src/DataProcessor.cpp +++ b/slsReceiverSoftware/src/DataProcessor.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /************************************************ * @file DataProcessor.cpp * @short creates data processor thread that diff --git a/slsReceiverSoftware/src/DataProcessor.h b/slsReceiverSoftware/src/DataProcessor.h index 0d51e6a14..ff696abb1 100644 --- a/slsReceiverSoftware/src/DataProcessor.h +++ b/slsReceiverSoftware/src/DataProcessor.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file DataProcessor.h diff --git a/slsReceiverSoftware/src/DataStreamer.cpp b/slsReceiverSoftware/src/DataStreamer.cpp index d5ad9763e..10a682e67 100644 --- a/slsReceiverSoftware/src/DataStreamer.cpp +++ b/slsReceiverSoftware/src/DataStreamer.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /************************************************ * @file DataStreamer.cpp * @short streams data from receiver via ZMQ diff --git a/slsReceiverSoftware/src/DataStreamer.h b/slsReceiverSoftware/src/DataStreamer.h index da598ebd3..ea4505c99 100644 --- a/slsReceiverSoftware/src/DataStreamer.h +++ b/slsReceiverSoftware/src/DataStreamer.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file DataStreamer.h diff --git a/slsReceiverSoftware/src/Fifo.cpp b/slsReceiverSoftware/src/Fifo.cpp index f8b1460ef..8221831e5 100644 --- a/slsReceiverSoftware/src/Fifo.cpp +++ b/slsReceiverSoftware/src/Fifo.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /************************************************ * @file Fifo.cpp * @short constructs the fifo structure diff --git a/slsReceiverSoftware/src/Fifo.h b/slsReceiverSoftware/src/Fifo.h index b777c3628..c8a98ca0c 100644 --- a/slsReceiverSoftware/src/Fifo.h +++ b/slsReceiverSoftware/src/Fifo.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file Fifo.h diff --git a/slsReceiverSoftware/src/File.cpp b/slsReceiverSoftware/src/File.cpp index caa5ea93a..74b587515 100644 --- a/slsReceiverSoftware/src/File.cpp +++ b/slsReceiverSoftware/src/File.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "File.h" #include diff --git a/slsReceiverSoftware/src/File.h b/slsReceiverSoftware/src/File.h index 57bd31e93..da7af6ce9 100644 --- a/slsReceiverSoftware/src/File.h +++ b/slsReceiverSoftware/src/File.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/logger.h" diff --git a/slsReceiverSoftware/src/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h index 4e577b08d..1120918f4 100644 --- a/slsReceiverSoftware/src/GeneralData.h +++ b/slsReceiverSoftware/src/GeneralData.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file GeneralData.h diff --git a/slsReceiverSoftware/src/HDF5DataFile.cpp b/slsReceiverSoftware/src/HDF5DataFile.cpp index 270924fc1..758d70d7b 100644 --- a/slsReceiverSoftware/src/HDF5DataFile.cpp +++ b/slsReceiverSoftware/src/HDF5DataFile.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "HDF5DataFile.h" #include "receiver_defs.h" diff --git a/slsReceiverSoftware/src/HDF5DataFile.h b/slsReceiverSoftware/src/HDF5DataFile.h index fdc68e148..a2e2aa78a 100644 --- a/slsReceiverSoftware/src/HDF5DataFile.h +++ b/slsReceiverSoftware/src/HDF5DataFile.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "File.h" diff --git a/slsReceiverSoftware/src/HDF5MasterFile.cpp b/slsReceiverSoftware/src/HDF5MasterFile.cpp index eb9b69e73..2c3721501 100644 --- a/slsReceiverSoftware/src/HDF5MasterFile.cpp +++ b/slsReceiverSoftware/src/HDF5MasterFile.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "HDF5MasterFile.h" #include "MasterAttributes.h" diff --git a/slsReceiverSoftware/src/HDF5MasterFile.h b/slsReceiverSoftware/src/HDF5MasterFile.h index 01b5bfb45..5fb5dad26 100644 --- a/slsReceiverSoftware/src/HDF5MasterFile.h +++ b/slsReceiverSoftware/src/HDF5MasterFile.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "File.h" diff --git a/slsReceiverSoftware/src/HDF5VirtualFile.cpp b/slsReceiverSoftware/src/HDF5VirtualFile.cpp index 9a988e275..71ef51099 100644 --- a/slsReceiverSoftware/src/HDF5VirtualFile.cpp +++ b/slsReceiverSoftware/src/HDF5VirtualFile.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "HDF5VirtualFile.h" #include "receiver_defs.h" diff --git a/slsReceiverSoftware/src/HDF5VirtualFile.h b/slsReceiverSoftware/src/HDF5VirtualFile.h index 1ab64094e..a479bce2d 100644 --- a/slsReceiverSoftware/src/HDF5VirtualFile.h +++ b/slsReceiverSoftware/src/HDF5VirtualFile.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "File.h" diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 8e4976d54..80655a099 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "Implementation.h" #include "DataProcessor.h" #include "DataStreamer.h" diff --git a/slsReceiverSoftware/src/Implementation.h b/slsReceiverSoftware/src/Implementation.h index 99708fb86..f97f92c92 100644 --- a/slsReceiverSoftware/src/Implementation.h +++ b/slsReceiverSoftware/src/Implementation.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "receiver_defs.h" #include "sls/container_utils.h" diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index 0a907f786..675a91553 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /************************************************ * @file Listener.cpp * @short creates the listener thread that diff --git a/slsReceiverSoftware/src/Listener.h b/slsReceiverSoftware/src/Listener.h index a7e432aa6..d588fb747 100644 --- a/slsReceiverSoftware/src/Listener.h +++ b/slsReceiverSoftware/src/Listener.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file Listener.h diff --git a/slsReceiverSoftware/src/MasterAttributes.h b/slsReceiverSoftware/src/MasterAttributes.h index dff142f09..606112a48 100644 --- a/slsReceiverSoftware/src/MasterAttributes.h +++ b/slsReceiverSoftware/src/MasterAttributes.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "receiver_defs.h" diff --git a/slsReceiverSoftware/src/MultiReceiverApp.cpp b/slsReceiverSoftware/src/MultiReceiverApp.cpp index ff95b669c..991555ffc 100644 --- a/slsReceiverSoftware/src/MultiReceiverApp.cpp +++ b/slsReceiverSoftware/src/MultiReceiverApp.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* Creates the slsMultiReceiver for running multiple receivers form a single * binary */ #include "sls/Receiver.h" diff --git a/slsReceiverSoftware/src/Receiver.cpp b/slsReceiverSoftware/src/Receiver.cpp index 4c2c5f178..ea140981d 100644 --- a/slsReceiverSoftware/src/Receiver.cpp +++ b/slsReceiverSoftware/src/Receiver.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/Receiver.h" #include "ClientInterface.h" #include "sls/container_utils.h" diff --git a/slsReceiverSoftware/src/ReceiverApp.cpp b/slsReceiverSoftware/src/ReceiverApp.cpp index fd4aa6116..3980b01a1 100644 --- a/slsReceiverSoftware/src/ReceiverApp.cpp +++ b/slsReceiverSoftware/src/ReceiverApp.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /* slsReceiver */ #include "sls/Receiver.h" #include "sls/container_utils.h" diff --git a/slsReceiverSoftware/src/ThreadObject.cpp b/slsReceiverSoftware/src/ThreadObject.cpp index 18477e912..16d17eaf9 100644 --- a/slsReceiverSoftware/src/ThreadObject.cpp +++ b/slsReceiverSoftware/src/ThreadObject.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /************************************************ * @file ThreadObject.cpp * @short creates/destroys a thread diff --git a/slsReceiverSoftware/src/ThreadObject.h b/slsReceiverSoftware/src/ThreadObject.h index f057c5553..d57857548 100644 --- a/slsReceiverSoftware/src/ThreadObject.h +++ b/slsReceiverSoftware/src/ThreadObject.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file ThreadObject.h diff --git a/slsReceiverSoftware/src/receiver_defs.h b/slsReceiverSoftware/src/receiver_defs.h old mode 100755 new mode 100644 index 13e78f232..de9f4f1d7 --- a/slsReceiverSoftware/src/receiver_defs.h +++ b/slsReceiverSoftware/src/receiver_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsReceiverSoftware/tests/CMakeLists.txt b/slsReceiverSoftware/tests/CMakeLists.txt old mode 100755 new mode 100644 index 37de24395..e1541a724 --- a/slsReceiverSoftware/tests/CMakeLists.txt +++ b/slsReceiverSoftware/tests/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package target_sources(tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test-GeneralData.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test-CircularFifo.cpp diff --git a/slsReceiverSoftware/tests/test-CircularFifo.cpp b/slsReceiverSoftware/tests/test-CircularFifo.cpp index f1614f55a..5da9bf39f 100644 --- a/slsReceiverSoftware/tests/test-CircularFifo.cpp +++ b/slsReceiverSoftware/tests/test-CircularFifo.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/CircularFifo.h" #include diff --git a/slsReceiverSoftware/tests/test-GeneralData.cpp b/slsReceiverSoftware/tests/test-GeneralData.cpp index 131748072..7a3466eca 100644 --- a/slsReceiverSoftware/tests/test-GeneralData.cpp +++ b/slsReceiverSoftware/tests/test-GeneralData.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "GeneralData.h" #include "catch.hpp" diff --git a/slsSupportLib/CMakeLists.txt b/slsSupportLib/CMakeLists.txt old mode 100755 new mode 100644 index cdf4af737..efa8010fc --- a/slsSupportLib/CMakeLists.txt +++ b/slsSupportLib/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package set(SOURCES src/string_utils.cpp src/file_utils.cpp diff --git a/slsSupportLib/include/sls/ClientSocket.h b/slsSupportLib/include/sls/ClientSocket.h index 3a6db7957..dcfc02b25 100644 --- a/slsSupportLib/include/sls/ClientSocket.h +++ b/slsSupportLib/include/sls/ClientSocket.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/DataSocket.h" #include diff --git a/slsSupportLib/include/sls/DataSocket.h b/slsSupportLib/include/sls/DataSocket.h index 79022cb17..f7f0bfe04 100644 --- a/slsSupportLib/include/sls/DataSocket.h +++ b/slsSupportLib/include/sls/DataSocket.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/TypeTraits.h" diff --git a/slsSupportLib/include/sls/ServerInterface.h b/slsSupportLib/include/sls/ServerInterface.h index 864cd56c1..475201983 100644 --- a/slsSupportLib/include/sls/ServerInterface.h +++ b/slsSupportLib/include/sls/ServerInterface.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/DataSocket.h" diff --git a/slsSupportLib/include/sls/ServerSocket.h b/slsSupportLib/include/sls/ServerSocket.h index 57418a586..a394c0430 100644 --- a/slsSupportLib/include/sls/ServerSocket.h +++ b/slsSupportLib/include/sls/ServerSocket.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/DataSocket.h" diff --git a/slsSupportLib/include/sls/StaticVector.h b/slsSupportLib/include/sls/StaticVector.h index 06b552e2b..22329fe6e 100644 --- a/slsSupportLib/include/sls/StaticVector.h +++ b/slsSupportLib/include/sls/StaticVector.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/ToString.h" #include "sls/TypeTraits.h" diff --git a/slsSupportLib/include/sls/TimeHelper.h b/slsSupportLib/include/sls/TimeHelper.h index 820e91508..8ad6ce103 100644 --- a/slsSupportLib/include/sls/TimeHelper.h +++ b/slsSupportLib/include/sls/TimeHelper.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsSupportLib/include/sls/Timer.h b/slsSupportLib/include/sls/Timer.h index 9d4dc59f1..b22909b33 100644 --- a/slsSupportLib/include/sls/Timer.h +++ b/slsSupportLib/include/sls/Timer.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef TIMER_H #define TIMER_H #include diff --git a/slsSupportLib/include/sls/ToString.h b/slsSupportLib/include/sls/ToString.h index bbcd4a6c9..8f8553e44 100644 --- a/slsSupportLib/include/sls/ToString.h +++ b/slsSupportLib/include/sls/ToString.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /** diff --git a/slsSupportLib/include/sls/TypeTraits.h b/slsSupportLib/include/sls/TypeTraits.h index bd32049e1..cbbeb7bea 100644 --- a/slsSupportLib/include/sls/TypeTraits.h +++ b/slsSupportLib/include/sls/TypeTraits.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include #include diff --git a/slsSupportLib/include/sls/UdpRxSocket.h b/slsSupportLib/include/sls/UdpRxSocket.h index 55acf51e9..646309ef6 100644 --- a/slsSupportLib/include/sls/UdpRxSocket.h +++ b/slsSupportLib/include/sls/UdpRxSocket.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /* diff --git a/slsSupportLib/include/sls/ZmqSocket.h b/slsSupportLib/include/sls/ZmqSocket.h index e6914f5b5..65523c227 100644 --- a/slsSupportLib/include/sls/ZmqSocket.h +++ b/slsSupportLib/include/sls/ZmqSocket.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file zmqSocket.h diff --git a/slsSupportLib/include/sls/ansi.h b/slsSupportLib/include/sls/ansi.h index d129aa259..b038d598a 100644 --- a/slsSupportLib/include/sls/ansi.h +++ b/slsSupportLib/include/sls/ansi.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #define RED "\x1b[31m" #define GREEN "\x1b[32m" #define YELLOW "\x1b[33m" diff --git a/slsSupportLib/include/sls/bit_utils.h b/slsSupportLib/include/sls/bit_utils.h index c3530ae11..164d1e3b8 100644 --- a/slsSupportLib/include/sls/bit_utils.h +++ b/slsSupportLib/include/sls/bit_utils.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsSupportLib/include/sls/container_utils.h b/slsSupportLib/include/sls/container_utils.h index 8e7829e48..c9cab4ba2 100644 --- a/slsSupportLib/include/sls/container_utils.h +++ b/slsSupportLib/include/sls/container_utils.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #ifndef CONTAINER_UTILS_H #define CONTAINER_UTILS_H diff --git a/slsSupportLib/include/sls/file_utils.h b/slsSupportLib/include/sls/file_utils.h index 3f330c3b6..cc427a88f 100644 --- a/slsSupportLib/include/sls/file_utils.h +++ b/slsSupportLib/include/sls/file_utils.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" diff --git a/slsSupportLib/include/sls/logger.h b/slsSupportLib/include/sls/logger.h index d3b783295..3331fc94c 100644 --- a/slsSupportLib/include/sls/logger.h +++ b/slsSupportLib/include/sls/logger.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /*Utility to log to console*/ diff --git a/slsSupportLib/include/sls/md5.h b/slsSupportLib/include/sls/md5.h index 08057dcaf..0d79c0d55 100644 --- a/slsSupportLib/include/sls/md5.h +++ b/slsSupportLib/include/sls/md5.h @@ -1,206 +1,4 @@ -/* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ +// SPDX-License-Identifier: Apache-2.0 /* * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/slsSupportLib/include/sls/md5_helper.h b/slsSupportLib/include/sls/md5_helper.h index 07ef38d8b..54070e3d9 100644 --- a/slsSupportLib/include/sls/md5_helper.h +++ b/slsSupportLib/include/sls/md5_helper.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsSupportLib/include/sls/network_utils.h b/slsSupportLib/include/sls/network_utils.h index 68b090651..9725d95aa 100644 --- a/slsSupportLib/include/sls/network_utils.h +++ b/slsSupportLib/include/sls/network_utils.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include #include diff --git a/slsSupportLib/include/sls/sls_detector_defs.h b/slsSupportLib/include/sls/sls_detector_defs.h index 5f8eae3b9..a1aa8b803 100644 --- a/slsSupportLib/include/sls/sls_detector_defs.h +++ b/slsSupportLib/include/sls/sls_detector_defs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ * @file sls_detector_defs.h diff --git a/slsSupportLib/include/sls/sls_detector_exceptions.h b/slsSupportLib/include/sls/sls_detector_exceptions.h index 4f1407c13..927bb1e29 100644 --- a/slsSupportLib/include/sls/sls_detector_exceptions.h +++ b/slsSupportLib/include/sls/sls_detector_exceptions.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsSupportLib/include/sls/sls_detector_funcs.h b/slsSupportLib/include/sls/sls_detector_funcs.h old mode 100755 new mode 100644 index 4b1952ec8..300cfbfce --- a/slsSupportLib/include/sls/sls_detector_funcs.h +++ b/slsSupportLib/include/sls/sls_detector_funcs.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once /************************************************ diff --git a/slsSupportLib/include/sls/string_utils.h b/slsSupportLib/include/sls/string_utils.h index e9135ec05..4bba4a4c0 100644 --- a/slsSupportLib/include/sls/string_utils.h +++ b/slsSupportLib/include/sls/string_utils.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 1db7f5a86..de8660311 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package /** API versions */ #define GITBRANCH "6.0.0-rc1" diff --git a/slsSupportLib/src/ClientSocket.cpp b/slsSupportLib/src/ClientSocket.cpp index 827e0f840..fdf41140f 100644 --- a/slsSupportLib/src/ClientSocket.cpp +++ b/slsSupportLib/src/ClientSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ClientSocket.h" #include "sls/logger.h" #include "sls/sls_detector_defs.h" diff --git a/slsSupportLib/src/DataSocket.cpp b/slsSupportLib/src/DataSocket.cpp index 09c20ebda..0d1b79921 100644 --- a/slsSupportLib/src/DataSocket.cpp +++ b/slsSupportLib/src/DataSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/DataSocket.h" #include "sls/logger.h" #include "sls/sls_detector_funcs.h" diff --git a/slsSupportLib/src/ServerInterface.cpp b/slsSupportLib/src/ServerInterface.cpp index 7e912ab09..92e3d7a67 100644 --- a/slsSupportLib/src/ServerInterface.cpp +++ b/slsSupportLib/src/ServerInterface.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ServerInterface.h" #include "sls/logger.h" #include diff --git a/slsSupportLib/src/ServerSocket.cpp b/slsSupportLib/src/ServerSocket.cpp index a9fafa1da..5daf83dc3 100644 --- a/slsSupportLib/src/ServerSocket.cpp +++ b/slsSupportLib/src/ServerSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ServerSocket.h" #include "sls/ServerInterface.h" diff --git a/slsSupportLib/src/ToString.cpp b/slsSupportLib/src/ToString.cpp index 7d68f2fb9..de920cc05 100644 --- a/slsSupportLib/src/ToString.cpp +++ b/slsSupportLib/src/ToString.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ToString.h" #include "sls/network_utils.h" diff --git a/slsSupportLib/src/UdpRxSocket.cpp b/slsSupportLib/src/UdpRxSocket.cpp index 90ebf284d..18eaf9372 100644 --- a/slsSupportLib/src/UdpRxSocket.cpp +++ b/slsSupportLib/src/UdpRxSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/UdpRxSocket.h" #include "sls/logger.h" #include "sls/network_utils.h" diff --git a/slsSupportLib/src/ZmqSocket.cpp b/slsSupportLib/src/ZmqSocket.cpp index 752934088..5289a1391 100644 --- a/slsSupportLib/src/ZmqSocket.cpp +++ b/slsSupportLib/src/ZmqSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/ZmqSocket.h" #include "sls/logger.h" #include "sls/network_utils.h" //ip diff --git a/slsSupportLib/src/file_utils.cpp b/slsSupportLib/src/file_utils.cpp index a560e6fe0..9c58c5dcf 100644 --- a/slsSupportLib/src/file_utils.cpp +++ b/slsSupportLib/src/file_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/file_utils.h" #include "sls/logger.h" #include "sls/sls_detector_exceptions.h" diff --git a/slsSupportLib/src/md5.c b/slsSupportLib/src/md5.c index b8508620e..55260b339 100644 --- a/slsSupportLib/src/md5.c +++ b/slsSupportLib/src/md5.c @@ -1,206 +1,4 @@ -/* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ +// SPDX-License-Identifier: Apache-2.0 /* * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * diff --git a/slsSupportLib/src/md5_helper.cpp b/slsSupportLib/src/md5_helper.cpp index 9af895faa..800d7cedc 100644 --- a/slsSupportLib/src/md5_helper.cpp +++ b/slsSupportLib/src/md5_helper.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/md5_helper.h" #include "sls/md5.h" diff --git a/slsSupportLib/src/network_utils.cpp b/slsSupportLib/src/network_utils.cpp index 56507e8f1..3a44b6fef 100644 --- a/slsSupportLib/src/network_utils.cpp +++ b/slsSupportLib/src/network_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/sls_detector_exceptions.h" #include "sls/network_utils.h" diff --git a/slsSupportLib/src/sls_detector_exceptions.cpp b/slsSupportLib/src/sls_detector_exceptions.cpp index c8753e5db..d5a6ca645 100644 --- a/slsSupportLib/src/sls_detector_exceptions.cpp +++ b/slsSupportLib/src/sls_detector_exceptions.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/sls_detector_exceptions.h" #include "sls/logger.h" namespace sls { diff --git a/slsSupportLib/src/string_utils.cpp b/slsSupportLib/src/string_utils.cpp old mode 100755 new mode 100644 index 94b643363..ba672643e --- a/slsSupportLib/src/string_utils.cpp +++ b/slsSupportLib/src/string_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "sls/string_utils.h" #include "sls/container_utils.h" diff --git a/slsSupportLib/tests/CMakeLists.txt b/slsSupportLib/tests/CMakeLists.txt old mode 100755 new mode 100644 index 75d20250c..799847745 --- a/slsSupportLib/tests/CMakeLists.txt +++ b/slsSupportLib/tests/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package target_sources(tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test-bit_utils.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test-file_utils.cpp diff --git a/slsSupportLib/tests/test-Sockets.cpp b/slsSupportLib/tests/test-Sockets.cpp index 9b52ef50c..410bb2b69 100644 --- a/slsSupportLib/tests/test-Sockets.cpp +++ b/slsSupportLib/tests/test-Sockets.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/ClientSocket.h" #include "sls/ServerSocket.h" diff --git a/slsSupportLib/tests/test-StaticVector.cpp b/slsSupportLib/tests/test-StaticVector.cpp index 419ebd770..8b5fa7cca 100644 --- a/slsSupportLib/tests/test-StaticVector.cpp +++ b/slsSupportLib/tests/test-StaticVector.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/StaticVector.h" #include "sls/TypeTraits.h" diff --git a/slsSupportLib/tests/test-Timer.cpp b/slsSupportLib/tests/test-Timer.cpp index d3c80c692..f5733a2de 100644 --- a/slsSupportLib/tests/test-Timer.cpp +++ b/slsSupportLib/tests/test-Timer.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/Timer.h" diff --git a/slsSupportLib/tests/test-ToString.cpp b/slsSupportLib/tests/test-ToString.cpp index 306e5eada..6ccad119b 100644 --- a/slsSupportLib/tests/test-ToString.cpp +++ b/slsSupportLib/tests/test-ToString.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/Pattern.h" #include "sls/TimeHelper.h" diff --git a/slsSupportLib/tests/test-TypeTraits.cpp b/slsSupportLib/tests/test-TypeTraits.cpp index e6cb3104d..7e8190f28 100644 --- a/slsSupportLib/tests/test-TypeTraits.cpp +++ b/slsSupportLib/tests/test-TypeTraits.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/TypeTraits.h" #include diff --git a/slsSupportLib/tests/test-UdpRxSocket.cpp b/slsSupportLib/tests/test-UdpRxSocket.cpp index 05450d114..cca5373c7 100644 --- a/slsSupportLib/tests/test-UdpRxSocket.cpp +++ b/slsSupportLib/tests/test-UdpRxSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/UdpRxSocket.h" #include "sls/sls_detector_exceptions.h" diff --git a/slsSupportLib/tests/test-ZmqSocket.cpp b/slsSupportLib/tests/test-ZmqSocket.cpp index 92dc2c102..5dc51ddc0 100644 --- a/slsSupportLib/tests/test-ZmqSocket.cpp +++ b/slsSupportLib/tests/test-ZmqSocket.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/ZmqSocket.h" diff --git a/slsSupportLib/tests/test-bit_utils.cpp b/slsSupportLib/tests/test-bit_utils.cpp index 9039e2aef..2205c46df 100644 --- a/slsSupportLib/tests/test-bit_utils.cpp +++ b/slsSupportLib/tests/test-bit_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/bit_utils.h" #include diff --git a/slsSupportLib/tests/test-container_utils.cpp b/slsSupportLib/tests/test-container_utils.cpp index 25ad3c331..f791223c9 100644 --- a/slsSupportLib/tests/test-container_utils.cpp +++ b/slsSupportLib/tests/test-container_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/container_utils.h" #include diff --git a/slsSupportLib/tests/test-file_utils.cpp b/slsSupportLib/tests/test-file_utils.cpp index b4f71cfb9..49544c83c 100644 --- a/slsSupportLib/tests/test-file_utils.cpp +++ b/slsSupportLib/tests/test-file_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/file_utils.h" #include diff --git a/slsSupportLib/tests/test-logger.cpp b/slsSupportLib/tests/test-logger.cpp index aa6814d89..c1997c1f6 100644 --- a/slsSupportLib/tests/test-logger.cpp +++ b/slsSupportLib/tests/test-logger.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/logger.h" #include diff --git a/slsSupportLib/tests/test-network_utils.cpp b/slsSupportLib/tests/test-network_utils.cpp index a6464d2b4..7751ad96b 100644 --- a/slsSupportLib/tests/test-network_utils.cpp +++ b/slsSupportLib/tests/test-network_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/network_utils.h" diff --git a/slsSupportLib/tests/test-sls_detector_defs.cpp b/slsSupportLib/tests/test-sls_detector_defs.cpp index fd5001808..077c9ecfa 100644 --- a/slsSupportLib/tests/test-sls_detector_defs.cpp +++ b/slsSupportLib/tests/test-sls_detector_defs.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/sls_detector_defs.h" diff --git a/slsSupportLib/tests/test-string_utils.cpp b/slsSupportLib/tests/test-string_utils.cpp index 941167701..9e8221580 100644 --- a/slsSupportLib/tests/test-string_utils.cpp +++ b/slsSupportLib/tests/test-string_utils.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "catch.hpp" #include "sls/logger.h" #include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt old mode 100755 new mode 100644 index 28adb9855..9c4cc368a --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package include_directories( ${PROJECT_SOURCE_DIR}/libs/catch include diff --git a/tests/include/tests/config.h b/tests/include/tests/config.h index e7192bd52..f6b541cbf 100644 --- a/tests/include/tests/config.h +++ b/tests/include/tests/config.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" #include diff --git a/tests/include/tests/globals.h b/tests/include/tests/globals.h index 5eea9a84f..ff7b86a64 100644 --- a/tests/include/tests/globals.h +++ b/tests/include/tests/globals.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include "sls/sls_detector_defs.h" using dt = slsDetectorDefs::detectorType; diff --git a/tests/include/tests/testenum.h b/tests/include/tests/testenum.h index 94ae5c994..64405f12d 100644 --- a/tests/include/tests/testenum.h +++ b/tests/include/tests/testenum.h @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #pragma once #include enum class func_id { read_data, read_int, read_half_data, combined }; diff --git a/tests/src/testclient.cpp b/tests/src/testclient.cpp index c212bfb4a..6607b60d1 100644 --- a/tests/src/testclient.cpp +++ b/tests/src/testclient.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "clara.hpp" #include "sls/ClientSocket.h" #include "sls/sls_detector_exceptions.h" diff --git a/tests/src/testserver.cpp b/tests/src/testserver.cpp index 73262f335..81fcac66f 100644 --- a/tests/src/testserver.cpp +++ b/tests/src/testserver.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package #include "clara.hpp" #include "sls/ServerSocket.h" diff --git a/tests/test.cpp b/tests/test.cpp index 6ec78954e..076f489e7 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: LGPL-3.0-or-other +// Copyright (C) 2021 Contributors to the SLS Detector Package // tests-main.cpp // #define CATCH_CONFIG_MAIN // #include "catch.hpp" diff --git a/this_build_bin_path.sh b/this_build_bin_path.sh old mode 100755 new mode 100644 index 646f4175e..8d0528673 --- a/this_build_bin_path.sh +++ b/this_build_bin_path.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #echo $# #if [ $# = 0 ]; then # f=$0 diff --git a/updateAPIVersion.sh b/updateAPIVersion.sh old mode 100755 new mode 100644 index 39b162a8d..499f9c3ed --- a/updateAPIVersion.sh +++ b/updateAPIVersion.sh @@ -1,7 +1,9 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package #require 2 arguments, API_NAME API_DIR (relative to package) if [ $# -lt 2 ]; then echo "Wrong usage of updateVersion.sh. Requires atleast 2 arguments [API_NAME, API_DIR]" - exit -1 + return [-1] fi API_NAME=$1 diff --git a/updateClientAPI.sh b/updateClientAPI.sh old mode 100755 new mode 100644 index 055d4233a..c0458574d --- a/updateClientAPI.sh +++ b/updateClientAPI.sh @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package API_FILE=$PWD/slsSupportLib/include/sls/versionAPI.h arraylength=3 diff --git a/updateLicenseNotice.sh b/updateLicenseNotice.sh new file mode 100644 index 000000000..450a434c2 --- /dev/null +++ b/updateLicenseNotice.sh @@ -0,0 +1,34 @@ +# SPDX-License-Identifier: LGPL-3.0-or-other +# Copyright (C) 2021 Contributors to the SLS Detector Package +#!/bin/bash +WD=$PWD +LICENCE_NOTICE_FILE=$WD/notice_to_add_for_every_file + +if [ $# -lt 2 ]; then + echo "Wrong usage of updateLicenseNotice.sh. Requires atleast 1 argument [RELATIVE PATH] [.h/.cpp etc]" + return [-1] +fi + +CURRENT=$WD/$1 +FILE_TYPE=$2 + +if [ ! -d "$CURRENT" ]; then + echo "This directory ${CURRENT} does not exist" + return [-1] +fi + +cd $CURRENT + + +for file in $(find $CURRENT -name "$FILE_TYPE" -not -path "*./build/*" -not -path "*./libs/*"); do + prefix="/afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorPackage/" + p=${file#"$prefix"} + echo Processing $p + + cat $LICENCE_NOTICE_FILE $file > $file.modified + + mv $file.modified $file + +done + +cd $WD