Skip to content

Commit cef7dea

Browse files
author
dpscience
committed
demo bug fixed
demo bug fixed
1 parent c2aafbc commit cef7dea

8 files changed

Lines changed: 34 additions & 25 deletions

File tree

‎DCONTINPALS/bin/x64/LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2020-2021 Danny Petschke
3+
** Copyright (C) 2020-2022 Dr. Danny Petschke
44
**
55
** This program is free software: you can redistribute it and/or modify
66
** it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
1717
**
1818
*****************************************************************************
1919
**
20-
** @author: Danny Petschke
20+
** @author: Dr. Danny Petschke
2121
** @contact: danny.petschke@uni-wuerzburg.de
2222
**
2323
*****************************************************************************/

‎DCONTINPALS/src/LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2020-2021 Danny Petschke
3+
** Copyright (C) 2020-2022 Dr. Danny Petschke
44
**
55
** This program is free software: you can redistribute it and/or modify
66
** it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
1717
**
1818
*****************************************************************************
1919
**
20-
** @author: Danny Petschke
20+
** @author: Dr. Danny Petschke
2121
** @contact: danny.petschke@uni-wuerzburg.de
2222
**
2323
*****************************************************************************/

‎LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2020-2021 Danny Petschke
3+
** Copyright (C) 2020-2022 Dr. Danny Petschke
44
**
55
** This program is free software: you can redistribute it and/or modify
66
** it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
1717
**
1818
*****************************************************************************
1919
**
20-
** @author: Danny Petschke
20+
** @author: Dr. Danny Petschke
2121
** @contact: danny.petschke@uni-wuerzburg.de
2222
**
2323
*****************************************************************************/

‎demo.png‎

11.1 KB
Loading

‎pyDCONTINPALS/LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/****************************************************************************
22
**
3-
** Copyright (C) 2020 Danny Petschke
3+
** Copyright (C) 2020-2022 Dr. Danny Petschke
44
**
55
** This program is free software: you can redistribute it and/or modify
66
** it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
1717
**
1818
*****************************************************************************
1919
**
20-
** @author: Danny Petschke
20+
** @author: Dr. Danny Petschke
2121
** @contact: danny.petschke@uni-wuerzburg.de
2222
**
2323
*****************************************************************************/

‎pyDCONTINPALS/pyDCONTINPALS.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import pyDCONTINPALSInput as userInput
3636

3737
def __information__():
38-
print("#********************* pyDCONTINPALS 1.02 (16.03.2021) *********************")
38+
print("#********************* pyDCONTINPALS 1.03 (25.08.2022) *********************")
3939
print("#**")
40-
print("#** Copyright (C) 2020-2021 Danny Petschke")
40+
print("#** Copyright (C) 2020-2022 Dr. Danny Petschke")
4141
print("#**")
4242
print("#** Contact: danny.petschke@uni-wuerzburg.de")
4343
print("#**")
@@ -46,7 +46,7 @@ def __information__():
4646
def __licence__():
4747
print("#*************************************************************************************************")
4848
print("#**")
49-
print("#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.")
49+
print("#** Copyright (c) 2020-2022 Dr. Danny Petschke. All rights reserved.")
5050
print("#**")
5151
print("#** This program is free software: you can redistribute it and/or modify")
5252
print("#** it under the terms of the GNU General Public License as published by")
@@ -147,7 +147,7 @@ def multiPeakFit(x=[],y=[]):
147147
noise=True,
148148
noiseLevel=1.0)
149149

150-
specdata_ref = specSimulator.generateCompleteLTSpectrum(numberOfComponents=3,
150+
specdata_ref = specSimulator.generateCompleteLTSpectrum(numberOfComponents=1,
151151
binWidth_in_ps=binWidth_in_ps,
152152
integralCounts=5000000,
153153
constBkgrdCounts=5,
@@ -221,6 +221,7 @@ def multiPeakFit(x=[],y=[]):
221221
numberOfBins = len(spec_data_roi)
222222

223223
# catch general limitations given by CONTIN-PALS
224+
224225
assert numberOfBins <= 4000 and numberOfBins >= 10
225226
assert gridPoints >= 10 and gridPoints <= 100
226227
assert binWidth_in_ps >= 10.0

‎pyDCONTINPALS/pyDCONTINPALSInput.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#*************************************************************************************************
44
#**")
5-
#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.
5+
#** Copyright (c) 2020-2022 Dr. Danny Petschke. All rights reserved.
66
#**")
77
#** This program is free software: you can redistribute it and/or modify
88
#** it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
2323

2424
__demoMode = True # disable if running from real data
2525

26-
# NOTE: spectrum and IRF (or mono-exponential decay spectrum) data vectors require equal length!
26+
# NOTE: SPECTRUM and IRF (or mono-exponential decay spectrum) data vectors require equal length!
2727

2828
__roi_start = 0
29-
__roi_end = 7400
29+
__roi_end = 7400 # Note: number of channels is internally limited by CONTIN to <= 4000, so adjust the '__binFactor' in order to fit the given number of channels into this range
3030

3131
# file path (and name) to the SPECTRUM data:
3232

@@ -36,31 +36,39 @@
3636
__specDataDelimiter = '\t'
3737

3838
# file path (and name) to the IRF data:
39+
3940
__filePathRefOrIRFSpec = 'testData/ref_10ps.dat'
4041
__refDataDelimiter = '\t'
4142

42-
# define the number of rows, which should be skipped during the import (e.g. for ignoring the header entries):
43+
# define the number of rows to be skipped during the import of the data (e.g. for ignoring the header entries):
44+
4345
__skipRows = 5;
4446

4547
# fixed mono-decay component in units of picoseconds [ps] (1/lambda = tau):
4648

47-
# Note: set to something like 1E-6 if you provide numerical IRF data as input
48-
__tau_monoDecaySpec_in_ps = 182. #[ps]
49+
# Note: set to values below 1E-6 if you are providing numerical IRF data as input otherwise the decay rate in [ps]:
50+
51+
__tau_monoDecaySpec_in_ps = 182. # [ps]
52+
53+
# used to simulate the IRF in case of '__demoMode' == True:
4954

5055
__t_zero = 2000 # channel number
5156
__irf_fwhm = [270.04,498.63] # [ps]
5257
__irf_intensity = [0.9382,0.0618] # [ps]
5358
__irf_t0 = [0.,6.6] # [ps]
5459

55-
# grid of characteristic lifetimes with equally distributed grid points defining the resulting intensity spectrum
60+
# grid of characteristic lifetimes with equally distributed grid points defining the resulting intensity spectrum to be expected as output:
61+
5662
__gridTau_start = 10.0 # [ps]
5763
__gridTau_stop = 3000.0 # [ps]
58-
__gridPoints = 100 # 10 ... 100 Note: this value is internally limited to 100 by CONTIN
64+
__gridPoints = 100 # 10 ... 100 Note: this value is internally limited by CONTIN
65+
66+
# channel/bin resolution [ps]:
67+
68+
__channelResolutionInPs = 10. # >= 10 ... Note: this value is internally limited by CONTIN. If lower, increase '__binFactor' to fit into this range
69+
__binFactor = 2 # Note: number of channels is internally limited by CONTIN to <= 4000, so adjust the '__binFactor' in order to fit the given number of channels into this range
5970

60-
# channel/bin resolution [ps]
61-
__channelResolutionInPs = 5. # >= 10 ... Note: this value is internally limited by CONTIN
62-
__binFactor = 1
71+
# background estimation/calculation region:
6372

64-
# background estimation:
6573
__bkgrd_startIndex = 6500;
6674
__bkgrd_count = 900; # number of channels with respect to the 'startIndex'

‎pyDCONTINPALS/pyDCONTINPALSSpecSimulator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#*************************************************************************************************
44
#**")
5-
#** Copyright (c) 2020-2021 Danny Petschke. All rights reserved.
5+
#** Copyright (c) 2020-2022 Dr. Danny Petschke. All rights reserved.
66
#**")
77
#** This program is free software: you can redistribute it and/or modify
88
#** it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)