From 2f16c43a11a628f31751460a8f7a39c037fe5db6 Mon Sep 17 00:00:00 2001 From: Abe Levitan Date: Thu, 10 Oct 2024 17:26:28 +0200 Subject: [PATCH 1/4] Add an MIT license to the repo to prep for open release --- LICENSE.txt | 8 ++++++++ README.md | 2 +- docs/source/intro.rst | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..f7efa09 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,8 @@ +Copyright (c) 2019-2023 Massachusetts Institute of Technology +Author: Abraham Levitan, abraham.levitan@psi.ch + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 829198f..326eb3a 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,6 @@ plt.show() Full installation instructions and documentation can be found [here](https://cdtools-developers.github.io/cdtools-docs/). -CDTools was developed in the [photon scattering lab](https://scattering.mit.edu/) at MIT, and further development took place within the [computational x-ray imaging group](https://www.psi.ch/en/cxi) at PSI. If you would like to publish any work that uses CDTools, please contact [Abe Levitan](mailto:abraham.levitan@psi.ch). +CDTools was developed in the [photon scattering lab](https://scattering.mit.edu/) at MIT, and further development took place within the [computational x-ray imaging group](https://www.psi.ch/en/cxi) at PSI. The code is distributed under an MIT (a.k.a. Expat) license. If you would like to publish any work that uses CDTools, please contact [Abe Levitan](mailto:abraham.levitan@psi.ch). Have a wonderful day! diff --git a/docs/source/intro.rst b/docs/source/intro.rst index 2c3d5a4..3a2e8d4 100644 --- a/docs/source/intro.rst +++ b/docs/source/intro.rst @@ -7,7 +7,7 @@ Introduction to CDTools Introduction to CDTools ----------------------- -CDTools is a python library for ptychography and CDI reconstructions, using an automatic differentiation based approach. +CDTools is an open source python library for ptychography and CDI reconstructions, using an automatic differentiation based approach. It is distributed under an MIT (a.k.a. Expat) license. .. code-block:: python From 2ed4802755ffc0ccb6d5c63c9f4a7f3ad87c60da Mon Sep 17 00:00:00 2001 From: Abe Levitan Date: Thu, 10 Oct 2024 17:41:36 +0200 Subject: [PATCH 2/4] Add a CC BY license to the included datasets --- examples/example_data/LICENSE.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 examples/example_data/LICENSE.txt diff --git a/examples/example_data/LICENSE.txt b/examples/example_data/LICENSE.txt new file mode 100644 index 0000000..ba51b66 --- /dev/null +++ b/examples/example_data/LICENSE.txt @@ -0,0 +1,13 @@ +The datasets contained in the following three files: + +- Optical_Data_ss.cxi +- Optical_ptycho_incoherent.pickle +- lab_ptycho_data.cxi + +Are made available under a CC BY 4.0 License, defined here: https://creativecommons.org/licenses/by/4.0/ + +The dataset contained in the file: + +- AuBalls_700ms_30nmStep_3_6SS_filter.cxi + +is sourced from https://cxidb.org/id-65.html, and was made available by the original authors under the CC0 Public Domain Dedication Waiver. This data was deposited into the CXIDB by Stefano Marchesini. From 059c2537569e5bbee52c0e0086d30727e2d2e108 Mon Sep 17 00:00:00 2001 From: allevitan Date: Sun, 13 Oct 2024 11:46:09 -0400 Subject: [PATCH 3/4] Added authorship and copyright info to license for data --- examples/example_data/LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/example_data/LICENSE.txt b/examples/example_data/LICENSE.txt index ba51b66..a3877bb 100644 --- a/examples/example_data/LICENSE.txt +++ b/examples/example_data/LICENSE.txt @@ -4,7 +4,7 @@ The datasets contained in the following three files: - Optical_ptycho_incoherent.pickle - lab_ptycho_data.cxi -Are made available under a CC BY 4.0 License, defined here: https://creativecommons.org/licenses/by/4.0/ +were collected by Abraham Levitan, abraham.levitan@psi.ch. Copyright (2023) is held by Massachusetts Institute of Technology. All three datasets are made available under a CC BY 4.0 License, defined at https://creativecommons.org/licenses/by/4.0/. The dataset contained in the file: From 0cbfb556f54c2a11eea9349ee03ec12d3ef74be6 Mon Sep 17 00:00:00 2001 From: Abe Levitan Date: Fri, 25 Oct 2024 00:37:55 +0200 Subject: [PATCH 4/4] Add all contributors to the license --- LICENSE.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LICENSE.txt b/LICENSE.txt index f7efa09..621f7b3 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,8 @@ Copyright (c) 2019-2023 Massachusetts Institute of Technology Author: Abraham Levitan, abraham.levitan@psi.ch +Additional Contributors: +Madelyn Cain +Anastasiia Kutakh Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: