-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #28 from AI-multimodal/relicense
Relicense.
- Loading branch information
Showing
2 changed files
with
43 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,29 @@ | ||
| Copyright (c) 2022, Brookhaven Science Associates, LLC, Brookhaven National Laboratory | ||
|
|
||
| Software contained in the “AI-multimodal” (“AIMM”) GitHub organization, | ||
| including “aimmdb”, and other codes are distributed subject to the following | ||
| license conditions: | ||
|
|
||
| SOFTWARE LICENSE AGREEMENT | ||
| Software: AIMM | ||
|
|
||
| 1. The "Software", below, refers to the aforementioned AIMM (in either source | ||
| code, or binary form and accompanying documentation) | ||
|
|
||
| Each licensee is addressed as "you" or "Licensee." | ||
|
|
||
| 2. The copyright holder shown above hereby grants Licensee a royalty-free | ||
| nonexclusive license, subject to the limitations stated herein and U.S. | ||
| Government license rights. | ||
|
|
||
| 3. You may make a copy or copies of the Software for use within your | ||
| organization, if you meet the following conditions: | ||
|
|
||
| a. Copies in source code must include the copyright notice and this Software | ||
| License Agreement. | ||
| b. Copies in binary form must include the copyright notice and this Software | ||
| License Agreement in the documentation and/or other materials provided | ||
| with the copy. | ||
|
|
||
| 4. You may modify a copy or copies of the Software or any portion of it, thus | ||
| forming a work based on the Software, and distribute copies of such work | ||
| outside your organization, if you meet all of the following conditions: | ||
|
|
||
| a. Copies in source code must include the copyright notice and this Software | ||
| License Agreement; | ||
| b. Copies in binary form must include the copyright notice and this Software | ||
| License Agreement in the documentation and/or other materials provided | ||
| with the copy; | ||
| c. Modified copies and works based on the Software must carry prominent | ||
| notices stating that you changed specified portions of the Software. | ||
| d. Neither the name of Brookhaven Science Associates, LLC or Brookhaven | ||
| National Laboratory nor the names of its contributors may be used to | ||
| endorse or promote products derived from this software without specific | ||
| written permission. | ||
|
|
||
| 5. The Software resulted from work developed under a U.S. Government Contract | ||
| No. DE-SC0012704 and are subject to the following license: the U.S. | ||
| Government is granted for itself and others acting on its behalf a paid-up, | ||
| nonexclusive, irrevocable worldwide license in this computer software and | ||
| data to reproduce, prepare derivative works, and perform publicly and | ||
| display publicly. | ||
|
|
||
| 6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED BY THE COPYRIGHT HOLDERS | ||
| "AS IS" WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE UNITED | ||
| STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR EMPLOYEES: | ||
| (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED | ||
| TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR | ||
| PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY OR | ||
| RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF THE | ||
| SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT INFRINGE | ||
| PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION | ||
| UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED. | ||
|
|
||
| 7. LIMITATION OF LIABILITY. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED | ||
| STATES, THE UNITED STATES DEPARTMENT OF ENERGY, OR THEIR EMPLOYEES BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE | ||
| DAMAGES OF ANY KIND OR NATURE RESULTING FROM EXERCISE OF THIS LICENSE | ||
| AGREEMENT OR THE USE OF THE SOFTWARE. | ||
|
|
||
| END OF LICENSE | ||
|
|
||
| BSD 3-Clause License | ||
|
|
||
| Copyright (c) 2022, Brookhaven Science Associates, LLC, Brookhaven National Laboratory | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright notice, this | ||
| list of conditions and the following disclaimer. | ||
|
|
||
| 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
|
|
||
| 3. Neither the name of the copyright holder nor the names of its contributors | ||
| may be used to endorse or promote products derived from this software | ||
| without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,17 @@ | ||
| # AIMMDB | ||
|
|
||
| aimmdb is a data access and search tool for multimodal scientific data built on top of [tiled](https://github.com/bluesky/tiled). | ||
| AIMMDB is a data access and search tool for multimodal scientific data built on top of [tiled](https://github.com/bluesky/tiled). | ||
| Currently aimmdb is focused on xray absorption spectroscopy (XAS) data. | ||
|
|
||
| ## Funding acknowledgement | ||
|
|
||
| This research is based upon work supported by the U.S. Department of Energy, Office of Science, Office Basic Energy Sciences, under Award Number FWP PS-030. This research used resources of the Center for Functional Nanomaterials (CFN), which is a U.S. Department of Energy Office of Science User Facility, at Brookhaven National Laboratory under Contract No. DE-SC0012704. | ||
|
|
||
| ### Disclaimer | ||
|
|
||
| The Software resulted from work developed under a U.S. Government Contract No. DE-SC0012704 and are subject to the following terms: the U.S. Government is granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable worldwide license in this computer software and data to reproduce, prepare derivative works, and perform publicly and display publicly. | ||
|
|
||
| THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF ANY KIND. THE UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED. | ||
|
|
||
| IN NO EVENT SHALL THE UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, OR THEIR EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE RESULTING FROM EXERCISE OF THIS LICENSE AGREEMENT OR THE USE OF THE SOFTWARE. | ||
|
|