Skip to content

Commit 985cecf

Browse files
author
dpscience
committed
license changed to GNU
license changed to GNU
1 parent 4576126 commit 985cecf

8 files changed

Lines changed: 104 additions & 137 deletions

File tree

DCONTINPALS/bin/x64/LICENCE.txt renamed to DCONTINPALS/bin/x64/LICENSE.txt

File renamed without changes.

DCONTINPALS/src/LICENCE.txt renamed to DCONTINPALS/src/LICENSE.txt

File renamed without changes.

‎LICENSE.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/****************************************************************************
2+
**
3+
** Copyright (C) 2020 Danny Petschke
4+
**
5+
** This program is free software: you can redistribute it and/or modify
6+
** it under the terms of the GNU General Public License as published by
7+
** the Free Software Foundation, either version 3 of the License, or
8+
** (at your option) any later version.
9+
**
10+
** This program is distributed in the hope that it will be useful,
11+
** but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
** GNU General Public License for more details.
14+
**
15+
** You should have received a copy of the GNU General Public License
16+
** along with this program. If not, see http://www.gnu.org/licenses/.
17+
**
18+
*****************************************************************************
19+
**
20+
** @author: Danny Petschke
21+
** @contact: danny.petschke@uni-wuerzburg.de
22+
**
23+
*****************************************************************************/

‎pyDCONTINPALS/LICENCE.txt‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎pyDCONTINPALS/LICENSE.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/****************************************************************************
2+
**
3+
** Copyright (C) 2020 Danny Petschke
4+
**
5+
** This program is free software: you can redistribute it and/or modify
6+
** it under the terms of the GNU General Public License as published by
7+
** the Free Software Foundation, either version 3 of the License, or
8+
** (at your option) any later version.
9+
**
10+
** This program is distributed in the hope that it will be useful,
11+
** but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
** GNU General Public License for more details.
14+
**
15+
** You should have received a copy of the GNU General Public License
16+
** along with this program. If not, see http://www.gnu.org/licenses/.
17+
**
18+
*****************************************************************************
19+
**
20+
** @author: Danny Petschke
21+
** @contact: danny.petschke@uni-wuerzburg.de
22+
**
23+
*****************************************************************************/

‎pyDCONTINPALS/pyDCONTINPALS.py‎

Lines changed: 28 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,23 @@
11
# -*- coding: utf-8 -*-
22

3-
VERSION_HANDSHAKE = 1 # v1.0
3+
VERSION_HANDSHAKE = 1 # v1.0x
44

55
#*************************************************************************************************
6+
#**")
7+
#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.
8+
#**")
9+
#** This program is free software: you can redistribute it and/or modify
10+
#** it under the terms of the GNU General Public License as published by
11+
#** the Free Software Foundation, either version 3 of the License, or
12+
#** (at your option) any later version.
613
#**
7-
#** Copyright (c) 2020 Danny Petschke. All rights reserved.
8-
#**
9-
#** Redistribution and use in source and binary forms, with or without modification,
10-
#** are permitted provided that the following conditions are met:
11-
#**
12-
#** 1. Redistributions of source code must retain the above copyright notice,
13-
#** this list of conditions and the following disclaimer.
14-
#**
15-
#** 2. Redistributions in binary form must reproduce the above copyright notice,
16-
#** this list of conditions and the following disclaimer in the documentation
17-
#** and/or other materials provided with the distribution.
18-
#**
19-
#** 3. Neither the name of the copyright holder "Danny Petschke" nor the names of its
20-
#** contributors may be used to endorse or promote products derived from this software
21-
#** without specific prior written permission.
22-
#**
23-
#**
24-
#** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
25-
#** OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
26-
#** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
27-
#** COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
28-
#** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
29-
#** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30-
#** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
31-
#** TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
32-
#** EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14+
#** This program is distributed in the hope that it will be useful,
15+
#** but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
#** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
#** GNU General Public License for more details.
18+
#**")
19+
#** You should have received a copy of the GNU General Public License
20+
#** along with this program. If not, see http://www.gnu.org/licenses/.
3321
#**
3422
#** Contact: danny.petschke@uni-wuerzburg.de
3523
#**
@@ -45,9 +33,9 @@
4533
import pyDCONTINPALSInput as userInput
4634

4735
def __information__():
48-
print("#****************** pyDCONTINPALS 1.0 (11.02.2020) *******************")
36+
print("#********************* pyDCONTINPALS 1.01 (20.01.2021) *********************")
4937
print("#**")
50-
print("#** Copyright (C) 2020 Danny Petschke")
38+
print("#** Copyright (C) 2020-2021 Danny Petschke")
5139
print("#**")
5240
print("#** Contact: danny.petschke@uni-wuerzburg.de")
5341
print("#**")
@@ -56,32 +44,20 @@ def __information__():
5644
def __licence__():
5745
print("#*************************************************************************************************")
5846
print("#**")
59-
print("#** Copyright (c) 2020 Danny Petschke. All rights reserved.")
60-
print("#**")
61-
print("#** Redistribution and use in source and binary forms, with or without modification,")
62-
print("#** are permitted provided that the following conditions are met:")
63-
print("#**")
64-
print("#** 1. Redistributions of source code must retain the above copyright notice,")
65-
print("#** this list of conditions and the following disclaimer.")
66-
print("#**")
67-
print("#** 2. Redistributions in binary form must reproduce the above copyright notice,")
68-
print("#** this list of conditions and the following disclaimer in the documentation")
69-
print("#** and/or other materials provided with the distribution.")
47+
print("#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.")
7048
print("#**")
71-
print("#** 3. Neither the name of the copyright holder ""Danny Petschke"" nor the names of its")
72-
print("#** contributors may be used to endorse or promote products derived from this software")
73-
print("#** without specific prior written permission.")
49+
print("#** This program is free software: you can redistribute it and/or modify")
50+
print("#** it under the terms of the GNU General Public License as published by")
51+
print("#** the Free Software Foundation, either version 3 of the License, or")
52+
print("#** (at your option) any later version.")
7453
print("#**")
54+
print("#** This program is distributed in the hope that it will be useful,")
55+
print("#** but WITHOUT ANY WARRANTY; without even the implied warranty of")
56+
print("#** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the")
57+
print("#** GNU General Public License for more details.")
7558
print("#**")
76-
print("#** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ""AS IS"" AND ANY EXPRESS")
77-
print("#** OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF")
78-
print("#** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE")
79-
print("#** COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,")
80-
print("#** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF")
81-
print("#** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)")
82-
print("#** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR")
83-
print("#** TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,")
84-
print("#** EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
59+
print("#** You should have received a copy of the GNU General Public License")
60+
print("#** along with this program. If not, see http://www.gnu.org/licenses/.")
8561
print("#**")
8662
print("#** Contact: danny.petschke@uni-wuerzburg.de")
8763
print("#**")

‎pyDCONTINPALS/pyDCONTINPALSInput.py‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,26 @@
11
# -*- coding: utf-8 -*-
22

33
#*************************************************************************************************
4-
#**
5-
#** Copyright (c) 2020 Danny Petschke. All rights reserved.
6-
#**
7-
#** Redistribution and use in source and binary forms, with or without modification,
8-
#** are permitted provided that the following conditions are met:
9-
#**
10-
#** 1. Redistributions of source code must retain the above copyright notice,
11-
#** this list of conditions and the following disclaimer.
12-
#**
13-
#** 2. Redistributions in binary form must reproduce the above copyright notice,
14-
#** this list of conditions and the following disclaimer in the documentation
15-
#** and/or other materials provided with the distribution.
16-
#**
17-
#** 3. Neither the name of the copyright holder "Danny Petschke" nor the names of its
18-
#** contributors may be used to endorse or promote products derived from this software
19-
#** without specific prior written permission.
20-
#**
21-
#**
22-
#** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
23-
#** OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
24-
#** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25-
#** COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
26-
#** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27-
#** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28-
#** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
29-
#** TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
30-
#** EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4+
#**")
5+
#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.
6+
#**")
7+
#** This program is free software: you can redistribute it and/or modify
8+
#** it under the terms of the GNU General Public License as published by
9+
#** the Free Software Foundation, either version 3 of the License, or
10+
#** (at your option) any later version.
11+
#**
12+
#** This program is distributed in the hope that it will be useful,
13+
#** but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
#** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
#** GNU General Public License for more details.
16+
#**")
17+
#** You should have received a copy of the GNU General Public License
18+
#** along with this program. If not, see http://www.gnu.org/licenses/.
3119
#**
3220
#** Contact: danny.petschke@uni-wuerzburg.de
3321
#**
3422
#*************************************************************************************************
23+
3524
__demoMode = True # disable if running from real data
3625

3726
# NOTE: spectrum and IRF (or mono-exponential decay spectrum) data vectors require equal length!

‎pyDCONTINPALS/pyDCONTINPALSSpecSimulator.py‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
11
# -*- coding: utf-8 -*-
22

33
#*************************************************************************************************
4+
#**")
5+
#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.
6+
#**")
7+
#** This program is free software: you can redistribute it and/or modify
8+
#** it under the terms of the GNU General Public License as published by
9+
#** the Free Software Foundation, either version 3 of the License, or
10+
#** (at your option) any later version.
411
#**
5-
#** Copyright (c) 2020 Danny Petschke. All rights reserved.
6-
#**
7-
#** Redistribution and use in source and binary forms, with or without modification,
8-
#** are permitted provided that the following conditions are met:
9-
#**
10-
#** 1. Redistributions of source code must retain the above copyright notice,
11-
#** this list of conditions and the following disclaimer.
12-
#**
13-
#** 2. Redistributions in binary form must reproduce the above copyright notice,
14-
#** this list of conditions and the following disclaimer in the documentation
15-
#** and/or other materials provided with the distribution.
16-
#**
17-
#** 3. Neither the name of the copyright holder "Danny Petschke" nor the names of its
18-
#** contributors may be used to endorse or promote products derived from this software
19-
#** without specific prior written permission.
20-
#**
21-
#**
22-
#** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
23-
#** OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
24-
#** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
25-
#** COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
26-
#** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27-
#** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28-
#** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
29-
#** TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
30-
#** EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12+
#** This program is distributed in the hope that it will be useful,
13+
#** but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
#** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
#** GNU General Public License for more details.
16+
#**")
17+
#** You should have received a copy of the GNU General Public License
18+
#** along with this program. If not, see http://www.gnu.org/licenses/.
3119
#**
3220
#** Contact: danny.petschke@uni-wuerzburg.de
3321
#**

0 commit comments

Comments
 (0)