Skip to content

Commit f626449

Browse files
authored
Update README.md
1 parent cef7dea commit f626449

1 file changed

Lines changed: 25 additions & 15 deletions

File tree

README.md

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
![badge-OS](https://img.shields.io/badge/OS-tested%20under%20Windows%2010-brightgreen)
2+
![badge-OS](https://img.shields.io/badge/OS-tested%20under%20Windows%2011-brightgreen)
23

34
Support this project and keep always updated about recent software releases, bug fixes and major improvements by [following on github](https://github.com/dpscience?tab=followers).
45

@@ -12,10 +13,10 @@ Support this project and keep always updated about recent software releases, bug
1213
![badge-language](https://img.shields.io/badge/language-Python-blue)
1314
![badge-license](https://img.shields.io/badge/license-GPL-blue)
1415

15-
Copyright (c) 2020-2021 Danny Petschke (danny.petschke@uni-wuerzburg.de). All rights reserved.<br><br>
16+
Copyright (c) 2020-2022 Dr. Danny Petschke (danny.petschke@uni-wuerzburg.de). All rights reserved.<br><br>
1617
<b>pyDCONTINPALS</b> - A program in Python for running the historical FORTRAN code CONTIN-PALS initially provided by [Provencher (1982)](https://www.sciencedirect.com/science/article/abs/pii/0010465582901746) and [Gregory et al. (1990/](https://www.sciencedirect.com/science/article/abs/pii/016890029090358D)[1991)](https://www.sciencedirect.com/science/article/abs/pii/016890029190367Y). CONTIN-PALS program solves Fredholm integral equations with convoluted exponential decays as kernels of the type that occur in the analysis of Positron Annihilation Lifetime Spectra (PALS).<br>
1718

18-
![demo](/demo.png)
19+
![demo](https://github.com/dpscience/DCONTINPALS/blob/cef7dea07b87d1b878eec602a3c070a8d5555636/demo.png)
1920

2021
# Quickstart Guide
2122

@@ -30,10 +31,10 @@ Copyright (c) 2020-2021 Danny Petschke (danny.petschke@uni-wuerzburg.de). All ri
3031
```python
3132
__demoMode = True # disable if running from real data
3233

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

3536
__roi_start = 0
36-
__roi_end = 7400
37+
__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
3738

3839
# file path (and name) to the SPECTRUM data:
3940

@@ -43,34 +44,42 @@ __filePathSpec = 'testData/spectrum_10ps.dat'
4344
__specDataDelimiter = '\t'
4445

4546
# file path (and name) to the IRF data:
47+
4648
__filePathRefOrIRFSpec = 'testData/ref_10ps.dat'
4749
__refDataDelimiter = '\t'
4850

49-
# define the number of rows, which should be skipped during the import (e.g. for ignoring the header entries):
51+
# define the number of rows to be skipped during the import of the data (e.g. for ignoring the header entries):
52+
5053
__skipRows = 5;
5154

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

54-
# Note: set to something like 1E-6 if you provide numerical IRF data as input
55-
__tau_monoDecaySpec_in_ps = 182. #[ps]
57+
# Note: set to values below 1E-6 if you are providing numerical IRF data as input otherwise the decay rate in [ps]:
58+
59+
__tau_monoDecaySpec_in_ps = 182. # [ps]
60+
61+
# used to simulate the IRF in case of '__demoMode' == True:
5662

5763
__t_zero = 2000 # channel number
5864
__irf_fwhm = [270.04,498.63] # [ps]
5965
__irf_intensity = [0.9382,0.0618] # [ps]
6066
__irf_t0 = [0.,6.6] # [ps]
6167

62-
# grid of characteristic lifetimes with equally distributed grid points defining the resulting intensity spectrum
68+
# grid of characteristic lifetimes with equally distributed grid points defining the resulting intensity spectrum to be expected as output:
69+
6370
__gridTau_start = 10.0 # [ps]
6471
__gridTau_stop = 3000.0 # [ps]
65-
__gridPoints = 100 # 10 ... 100 Note: this value is internally limited to 100 by CONTIN
72+
__gridPoints = 100 # 10 ... 100 Note: this value is internally limited by CONTIN
73+
74+
# channel/bin resolution [ps]:
75+
76+
__channelResolutionInPs = 10. # >= 10 ... Note: this value is internally limited by CONTIN. If lower, increase '__binFactor' to fit into this range
77+
__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
6678

67-
# channel/bin resolution [ps]
68-
__channelResolutionInPs = 5. # >= 10 ... Note: this value is internally limited by CONTIN
69-
__binFactor = 1
79+
# background estimation/calculation region:
7080

71-
# background estimation:
7281
__bkgrd_startIndex = 6500;
73-
__bkgrd_count = 900; # number of channels with respect to the 'startIndex'
82+
__bkgrd_count = 900; # number of channels with respect to the 'startIndex''
7483
```
7584
* <b>execute</b> `pyDCONTINPALS.py`<br>
7685

@@ -91,12 +100,13 @@ You can cite all released software versions by using the <b>DOI 10.5281/zenodo.3
91100
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3665474.svg)](https://doi.org/10.5281/zenodo.3665475)
92101

93102
## ``v1.x``
103+
<b>pyDCONTINPALS v1.03</b><br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4630108.svg)](https://doi.org/10.5281/zenodo.4630108)<br>
94104
<b>pyDCONTINPALS v1.02</b><br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4630108.svg)](https://doi.org/10.5281/zenodo.4630108)<br>
95105
<b>pyDCONTINPALS v1.01</b><br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4452238.svg)](https://doi.org/10.5281/zenodo.4452238)<br>
96106
<b>pyDCONTINPALS v1.0</b><br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3665475.svg)](https://doi.org/10.5281/zenodo.3665475)<br>
97107

98108
# License of (py)DCONTINPALS (GNU General Public License)
99-
Copyright (c) 2020-2021 Danny Petschke (danny.petschke@uni-wuerzburg.de) All rights reserved.<br>
109+
Copyright (c) 2020-2022 Dr. Danny Petschke (danny.petschke@uni-wuerzburg.de) All rights reserved.<br>
100110

101111
<p align="justify">This program is free software: you can redistribute it and/or modify<br>
102112
it under the terms of the GNU General Public License as published by<br>

0 commit comments

Comments
 (0)