Skip to content

Commit 35ffacd

Browse files
dpsciencedpscience
committed
updates for release v1.16
resolved: pulse-shape data loading has been skipped
1 parent 502d41e commit 35ffacd

File tree

6 files changed

+120
-8
lines changed

6 files changed

+120
-8
lines changed

‎DDRS4PALS.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ QT += core gui concurrent script printsupport network
5757

5858
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
5959

60-
TARGET = DDRS4PALS_1_0_15
60+
TARGET = DDRS4PALS_1_0_16
6161
TEMPLATE = app
6262

6363
RC_FILE = softwareIcon.rc

‎GUI/drs4blinkinglight.cpp‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
/****************************************************************************
2+
**
3+
** DDRS4PALS, a software for the acquisition of lifetime spectra using the
4+
** DRS4 evaluation board of PSI: https://www.psi.ch/drs/evaluation-board
5+
**
6+
** Copyright (C) 2016-2021 Danny Petschke
7+
**
8+
** This program is free software: you can redistribute it and/or modify
9+
** it under the terms of the GNU General Public License as published by
10+
** the Free Software Foundation, either version 3 of the License, or
11+
** (at your option) any later version.
12+
**
13+
** This program is distributed in the hope that it will be useful,
14+
** but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
** GNU General Public License for more details.
17+
**
18+
** You should have received a copy of the GNU General Public License
19+
** along with this program. If not, see http://www.gnu.org/licenses/.
20+
**
21+
*****************************************************************************
22+
**
23+
** @author: Danny Petschke
24+
** @contact: [email protected]
25+
**
26+
*****************************************************************************
27+
**
28+
** related publications:
29+
**
30+
** when using DDRS4PALS for your research purposes please cite:
31+
**
32+
** DDRS4PALS: A software for the acquisition and simulation of lifetime spectra using the DRS4 evaluation board:
33+
** https://www.sciencedirect.com/science/article/pii/S2352711019300676
34+
**
35+
** and
36+
**
37+
** Data on pure tin by Positron Annihilation Lifetime Spectroscopy (PALS) acquired with a semi-analog/digital setup using DDRS4PALS
38+
** https://www.sciencedirect.com/science/article/pii/S2352340918315142?via%3Dihub
39+
**
40+
** when using the integrated simulation tool /DLTPulseGenerator/ of DDRS4PALS for your research purposes please cite:
41+
**
42+
** DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
43+
** https://www.sciencedirect.com/science/article/pii/S2352711018300530
44+
**
45+
** Update (v1.1) to DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
46+
** https://www.sciencedirect.com/science/article/pii/S2352711018300694
47+
**
48+
** Update (v1.2) to DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
49+
** https://www.sciencedirect.com/science/article/pii/S2352711018301092
50+
**
51+
** Update (v1.3) to DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
52+
** https://www.sciencedirect.com/science/article/pii/S235271101930038X
53+
**/
54+
155
#include "drs4blinkinglight.h"
256
#include "ui_drs4blinkinglight.h"
357

‎GUI/drs4blinkinglight.h‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
/****************************************************************************
2+
**
3+
** DDRS4PALS, a software for the acquisition of lifetime spectra using the
4+
** DRS4 evaluation board of PSI: https://www.psi.ch/drs/evaluation-board
5+
**
6+
** Copyright (C) 2016-2021 Danny Petschke
7+
**
8+
** This program is free software: you can redistribute it and/or modify
9+
** it under the terms of the GNU General Public License as published by
10+
** the Free Software Foundation, either version 3 of the License, or
11+
** (at your option) any later version.
12+
**
13+
** This program is distributed in the hope that it will be useful,
14+
** but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
** GNU General Public License for more details.
17+
**
18+
** You should have received a copy of the GNU General Public License
19+
** along with this program. If not, see http://www.gnu.org/licenses/.
20+
**
21+
*****************************************************************************
22+
**
23+
** @author: Danny Petschke
24+
** @contact: [email protected]
25+
**
26+
*****************************************************************************
27+
**
28+
** related publications:
29+
**
30+
** when using DDRS4PALS for your research purposes please cite:
31+
**
32+
** DDRS4PALS: A software for the acquisition and simulation of lifetime spectra using the DRS4 evaluation board:
33+
** https://www.sciencedirect.com/science/article/pii/S2352711019300676
34+
**
35+
** and
36+
**
37+
** Data on pure tin by Positron Annihilation Lifetime Spectroscopy (PALS) acquired with a semi-analog/digital setup using DDRS4PALS
38+
** https://www.sciencedirect.com/science/article/pii/S2352340918315142?via%3Dihub
39+
**
40+
** when using the integrated simulation tool /DLTPulseGenerator/ of DDRS4PALS for your research purposes please cite:
41+
**
42+
** DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
43+
** https://www.sciencedirect.com/science/article/pii/S2352711018300530
44+
**
45+
** Update (v1.1) to DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
46+
** https://www.sciencedirect.com/science/article/pii/S2352711018300694
47+
**
48+
** Update (v1.2) to DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
49+
** https://www.sciencedirect.com/science/article/pii/S2352711018301092
50+
**
51+
** Update (v1.3) to DLTPulseGenerator: A library for the simulation of lifetime spectra based on detector-output pulses
52+
** https://www.sciencedirect.com/science/article/pii/S235271101930038X
53+
**/
54+
155
#ifndef DRS4BLINKINGLIGHT_H
256
#define DRS4BLINKINGLIGHT_H
357

‎drs4settingsmanager.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ DRS4PulseShapeFilterData& DRS4PulseShapeFilterData::operator=(const DRS4PulseSha
110110
if (copy.m_stdDevTraceDataYArray)
111111
memcpy(m_stdDevTraceDataYArray, copy.m_stdDevTraceDataYArray, __PULSESHAPEFILTER_SPLINE_TRACE_NUMBER*sizeof(float));
112112

113-
114113
return *this;
115114
}
116115

@@ -1089,7 +1088,8 @@ bool DRS4SettingsManager::load(const QString &path)
10891088
parsePulseShapeData(m_pulseShapeFilter_meanDataA_Node, &meanData);
10901089
parsePulseShapeData(m_pulseShapeFilter_stddevDataA_Node, &stdDevData);
10911090

1092-
if (meanData.isEmpty() || stdDevData.isEmpty()) {
1091+
if (meanData.isEmpty()
1092+
|| stdDevData.isEmpty()) {
10931093
setPulseShapeFilterDataA(DRS4PulseShapeFilterData(), false);
10941094

10951095
m_pulseShapeFilterEnabledA_Node->setValue(false);
@@ -1102,6 +1102,8 @@ bool DRS4SettingsManager::load(const QString &path)
11021102

11031103
m_pulseShapeFilterEnabledA_Node->setValue(pPulseShapeFilterSettingsTag.getValueAt(m_pulseShapeFilterEnabledA_Node, &ok));
11041104
if (!ok) m_pulseShapeFilterEnabledA_Node->setValue(m_pulseShapeFilterEnabledA);
1105+
1106+
11051107
}
11061108
}
11071109
}
@@ -2591,10 +2593,11 @@ void DRS4SettingsManager::setPulseShapeFilterStdDevLowerFractionB(double value)
25912593

25922594
void DRS4SettingsManager::setPulseShapeFilterDataA(const DRS4PulseShapeFilterData &data, bool lockMutex)
25932595
{
2594-
if (lockMutex)
2596+
if (lockMutex) {
25952597
#ifndef __DISABLE_MUTEX_LOCKER
25962598
QMutexLocker locker(&m_mutex);
25972599
#endif
2600+
}
25982601

25992602
m_pulseShapeFilterDataA = data;
26002603

@@ -2612,10 +2615,11 @@ void DRS4SettingsManager::setPulseShapeFilterDataA(const DRS4PulseShapeFilterDat
26122615

26132616
void DRS4SettingsManager::setPulseShapeFilterDataB(const DRS4PulseShapeFilterData &data, bool lockMutex)
26142617
{
2615-
if (lockMutex)
2618+
if (lockMutex) {
26162619
#ifndef __DISABLE_MUTEX_LOCKER
26172620
QMutexLocker locker(&m_mutex);
26182621
#endif
2622+
}
26192623

26202624
m_pulseShapeFilterDataB = data;
26212625

‎drs4settingsmanager.h‎

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

7474
#define __PULSESHAPEFILTER_SPLINE_TRACE_NUMBER 4381
7575

76-
#define __DISABLE_MUTEX_LOCKER
76+
// #define __DISABLE_MUTEX_LOCKER
7777

7878
struct DRS4PulseShapeFilterRecordScheme {
7979
enum Scheme : int {

‎dversion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
/* change here before releasing a new version **/
6161
#define NAME QString("DDRS4PALS")
6262
#define MAJOR_VERSION QString("1")
63-
#define MINOR_VERSION QString("15")
63+
#define MINOR_VERSION QString("16")
6464
#define VERSION_EXTENSION QString("- official -")
65-
#define DATE_EXTENSION QString("2021-04-30")
65+
#define DATE_EXTENSION QString("2021-05-04")
6666

6767
/* streaming on external storage device */
6868
#define DATA_STREAM_VERSION 1

0 commit comments

Comments
 (0)