Skip to content

Commit

Permalink
Merge pull request #3 from dpscience/dpscience-local
Browse files Browse the repository at this point in the history 
prepare for release v1.04
  • Loading branch information
@dpscience
dpscience authored Jun 8, 2018
2 parents 61f1d27 + 72f7eb6 commit a288649
Show file tree
Hide file tree
Showing 12 changed files with 2,197 additions and 60 deletions.
259 changes: 259 additions & 0 deletions DDRS4PALS.pro.user
View file

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ You can cite all versions by using the <b>DOI 10.5281/zenodo.1219522</b>. This D
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1219522.svg)](https://doi.org/10.5281/zenodo.1219522)

## v1.x
DDRS4PALS v1.03:<br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1227278.svg)](https://doi.org/10.5281/zenodo.1227278)<br>
DDRS4PALS v1.02:<br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1219523.svg)](https://doi.org/10.5281/zenodo.1219523)<br>
DDRS4PALS <b>v1.04</b> (<b>DLTPulseGenerator v1.2</b>):<br><br>

DDRS4PALS <b>v1.03</b> (<b>DLTPulseGenerator v1.1</b>):<br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1227278.svg)](https://doi.org/10.5281/zenodo.1227278)<br>

DDRS4PALS <b>v1.02</b> (<b>DLTPulseGenerator v1.1</b>):<br>[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1219523.svg)](https://doi.org/10.5281/zenodo.1219523)<br>

# Third Party Libraries and Licenses

Expand Down
330 changes: 324 additions & 6 deletions drs4pulsegenerator.cpp
View file

Large diffs are not rendered by default.

1,302 changes: 1,293 additions & 9 deletions drs4simulationsettingsmanager.cpp
View file

Large diffs are not rendered by default.

226 changes: 222 additions & 4 deletions drs4simulationsettingsmanager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,134 @@ class DRS4SimulationSettingsManager
DSimpleXMLNode *m_parentNode;

DSimpleXMLNode *m_electronicsNode;

/* irf-A */
DSimpleXMLNode *m_irfPDSA_parentNode;
DSimpleXMLNode *m_irfPDSA_1_parentNode;

DSimpleXMLNode *m_irfPDSA_1_enabled;
DSimpleXMLNode *m_irfPDSA_1_functionType;
DSimpleXMLNode *m_irfPDSA_1_intensity;
DSimpleXMLNode *m_irfPDSA_1_uncertainty;
DSimpleXMLNode *m_irfPDSA_1_relativeShift;

DSimpleXMLNode *m_irfPDSA_2_parentNode;

DSimpleXMLNode *m_irfPDSA_2_enabled;
DSimpleXMLNode *m_irfPDSA_2_functionType;
DSimpleXMLNode *m_irfPDSA_2_intensity;
DSimpleXMLNode *m_irfPDSA_2_uncertainty;
DSimpleXMLNode *m_irfPDSA_2_relativeShift;

DSimpleXMLNode *m_irfPDSA_3_parentNode;

DSimpleXMLNode *m_irfPDSA_3_enabled;
DSimpleXMLNode *m_irfPDSA_3_functionType;
DSimpleXMLNode *m_irfPDSA_3_intensity;
DSimpleXMLNode *m_irfPDSA_3_uncertainty;
DSimpleXMLNode *m_irfPDSA_3_relativeShift;

DSimpleXMLNode *m_irfPDSA_4_parentNode;

DSimpleXMLNode *m_irfPDSA_4_enabled;
DSimpleXMLNode *m_irfPDSA_4_functionType;
DSimpleXMLNode *m_irfPDSA_4_intensity;
DSimpleXMLNode *m_irfPDSA_4_uncertainty;
DSimpleXMLNode *m_irfPDSA_4_relativeShift;

DSimpleXMLNode *m_irfPDSA_5_parentNode;

DSimpleXMLNode *m_irfPDSA_5_enabled;
DSimpleXMLNode *m_irfPDSA_5_functionType;
DSimpleXMLNode *m_irfPDSA_5_intensity;
DSimpleXMLNode *m_irfPDSA_5_uncertainty;
DSimpleXMLNode *m_irfPDSA_5_relativeShift;

/* irf-B */
DSimpleXMLNode *m_irfPDSB_parentNode;
DSimpleXMLNode *m_irfPDSB_1_parentNode;

DSimpleXMLNode *m_irfPDSB_1_enabled;
DSimpleXMLNode *m_irfPDSB_1_functionType;
DSimpleXMLNode *m_irfPDSB_1_intensity;
DSimpleXMLNode *m_irfPDSB_1_uncertainty;
DSimpleXMLNode *m_irfPDSB_1_relativeShift;

DSimpleXMLNode *m_irfPDSB_2_parentNode;

DSimpleXMLNode *m_irfPDSB_2_enabled;
DSimpleXMLNode *m_irfPDSB_2_functionType;
DSimpleXMLNode *m_irfPDSB_2_intensity;
DSimpleXMLNode *m_irfPDSB_2_uncertainty;
DSimpleXMLNode *m_irfPDSB_2_relativeShift;

DSimpleXMLNode *m_irfPDSB_3_parentNode;

DSimpleXMLNode *m_irfPDSB_3_enabled;
DSimpleXMLNode *m_irfPDSB_3_functionType;
DSimpleXMLNode *m_irfPDSB_3_intensity;
DSimpleXMLNode *m_irfPDSB_3_uncertainty;
DSimpleXMLNode *m_irfPDSB_3_relativeShift;

DSimpleXMLNode *m_irfPDSB_4_parentNode;

DSimpleXMLNode *m_irfPDSB_4_enabled;
DSimpleXMLNode *m_irfPDSB_4_functionType;
DSimpleXMLNode *m_irfPDSB_4_intensity;
DSimpleXMLNode *m_irfPDSB_4_uncertainty;
DSimpleXMLNode *m_irfPDSB_4_relativeShift;

DSimpleXMLNode *m_irfPDSB_5_parentNode;

DSimpleXMLNode *m_irfPDSB_5_enabled;
DSimpleXMLNode *m_irfPDSB_5_functionType;
DSimpleXMLNode *m_irfPDSB_5_intensity;
DSimpleXMLNode *m_irfPDSB_5_uncertainty;
DSimpleXMLNode *m_irfPDSB_5_relativeShift;

/* irf-MU */
DSimpleXMLNode *m_irfMU_parentNode;

DSimpleXMLNode *m_irfMU_1_parentNode;

DSimpleXMLNode *m_irfMU_1_enabled;
DSimpleXMLNode *m_irfMU_1_functionType;
DSimpleXMLNode *m_irfMU_1_intensity;
DSimpleXMLNode *m_irfMU_1_uncertainty;
DSimpleXMLNode *m_irfMU_1_relativeShift;

DSimpleXMLNode *m_irfMU_2_parentNode;

DSimpleXMLNode *m_irfMU_2_enabled;
DSimpleXMLNode *m_irfMU_2_functionType;
DSimpleXMLNode *m_irfMU_2_intensity;
DSimpleXMLNode *m_irfMU_2_uncertainty;
DSimpleXMLNode *m_irfMU_2_relativeShift;

DSimpleXMLNode *m_irfMU_3_parentNode;

DSimpleXMLNode *m_irfMU_3_enabled;
DSimpleXMLNode *m_irfMU_3_functionType;
DSimpleXMLNode *m_irfMU_3_intensity;
DSimpleXMLNode *m_irfMU_3_uncertainty;
DSimpleXMLNode *m_irfMU_3_relativeShift;

DSimpleXMLNode *m_irfMU_4_parentNode;

DSimpleXMLNode *m_irfMU_4_enabled;
DSimpleXMLNode *m_irfMU_4_functionType;
DSimpleXMLNode *m_irfMU_4_intensity;
DSimpleXMLNode *m_irfMU_4_uncertainty;
DSimpleXMLNode *m_irfMU_4_relativeShift;

DSimpleXMLNode *m_irfMU_5_parentNode;

DSimpleXMLNode *m_irfMU_5_enabled;
DSimpleXMLNode *m_irfMU_5_functionType;
DSimpleXMLNode *m_irfMU_5_intensity;
DSimpleXMLNode *m_irfMU_5_uncertainty;
DSimpleXMLNode *m_irfMU_5_relativeShift;

DSimpleXMLNode *m_phsParentNode;
DSimpleXMLNode *m_pulseShapeParentNode;

Expand All @@ -51,9 +179,9 @@ class DRS4SimulationSettingsManager
DSimpleXMLNode *m_ltDistr5ParentNode;

//electronics:
DSimpleXMLNode *m_tts_detectorAInNsNode;
/*DSimpleXMLNode *m_tts_detectorAInNsNode;
DSimpleXMLNode *m_tts_detectorBInNsNode;
DSimpleXMLNode *m_timingResolution_boardInNsNode;
DSimpleXMLNode *m_timingResolution_boardInNsNode;*/

//phs:
DSimpleXMLNode *m_sigmaPHS_A_511Node;
Expand Down Expand Up @@ -140,9 +268,99 @@ class DRS4SimulationSettingsManager
bool load(const QString& path);
bool save(const QString& path);

float ttsDetectorAInNs() const;
/*float ttsDetectorAInNs() const;
float ttsDetectorBInNs() const;
float timingResolutionMeasurementUnitInNs() const;
float timingResolutionMeasurementUnitInNs() const;*/

bool detectorA_irf_1_enabled() const;
QString detectorA_irf_1_functionType() const;
float detectorA_irf_1_intensity() const;
float detectorA_irf_1_uncertainty() const;
float detectorA_irf_1_shift() const;

bool detectorA_irf_2_enabled() const;
QString detectorA_irf_2_functionType() const;
float detectorA_irf_2_intensity() const;
float detectorA_irf_2_uncertainty() const;
float detectorA_irf_2_shift() const;

bool detectorA_irf_3_enabled() const;
QString detectorA_irf_3_functionType() const;
float detectorA_irf_3_intensity() const;
float detectorA_irf_3_uncertainty() const;
float detectorA_irf_3_shift() const;

bool detectorA_irf_4_enabled() const;
QString detectorA_irf_4_functionType() const;
float detectorA_irf_4_intensity() const;
float detectorA_irf_4_uncertainty() const;
float detectorA_irf_4_shift() const;

bool detectorA_irf_5_enabled() const;
QString detectorA_irf_5_functionType() const;
float detectorA_irf_5_intensity() const;
float detectorA_irf_5_uncertainty() const;
float detectorA_irf_5_shift() const;

bool detectorB_irf_1_enabled() const;
QString detectorB_irf_1_functionType() const;
float detectorB_irf_1_intensity() const;
float detectorB_irf_1_uncertainty() const;
float detectorB_irf_1_shift() const;

bool detectorB_irf_2_enabled() const;
QString detectorB_irf_2_functionType() const;
float detectorB_irf_2_intensity() const;
float detectorB_irf_2_uncertainty() const;
float detectorB_irf_2_shift() const;

bool detectorB_irf_3_enabled() const;
QString detectorB_irf_3_functionType() const;
float detectorB_irf_3_intensity() const;
float detectorB_irf_3_uncertainty() const;
float detectorB_irf_3_shift() const;

bool detectorB_irf_4_enabled() const;
QString detectorB_irf_4_functionType() const;
float detectorB_irf_4_intensity() const;
float detectorB_irf_4_uncertainty() const;
float detectorB_irf_4_shift() const;

bool detectorB_irf_5_enabled() const;
QString detectorB_irf_5_functionType() const;
float detectorB_irf_5_intensity() const;
float detectorB_irf_5_uncertainty() const;
float detectorB_irf_5_shift() const;

bool mu_irf_1_enabled() const;
QString mu_irf_1_functionType() const;
float mu_irf_1_intensity() const;
float mu_irf_1_uncertainty() const;
float mu_irf_1_shift() const;

bool mu_irf_2_enabled() const;
QString mu_irf_2_functionType() const;
float mu_irf_2_intensity() const;
float mu_irf_2_uncertainty() const;
float mu_irf_2_shift() const;

bool mu_irf_3_enabled() const;
QString mu_irf_3_functionType() const;
float mu_irf_3_intensity() const;
float mu_irf_3_uncertainty() const;
float mu_irf_3_shift() const;

bool mu_irf_4_enabled() const;
QString mu_irf_4_functionType() const;
float mu_irf_4_intensity() const;
float mu_irf_4_uncertainty() const;
float mu_irf_4_shift() const;

bool mu_irf_5_enabled() const;
QString mu_irf_5_functionType() const;
float mu_irf_5_intensity() const;
float mu_irf_5_uncertainty() const;
float mu_irf_5_shift() const;

float sigmaPHS511keV_A() const;
float meanPHS511keV_A() const;
Expand Down
2 changes: 1 addition & 1 deletion drs4worker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3904,7 +3904,7 @@ DRS4ConcurrentCopyOutputData runCalculation(const QVector<DRS4ConcurrentCopyInpu
const float valYA = (inputData.m_interpolationType == DRS4InterpolationType::type::spline)?(inputData.m_bUsingALGLIB?(alglib::spline1dcalc(interpolantA, inputData.m_tChannel0[cell_interpolRangeA_start] + (float)i*renderIncrementA)):(tkSplineA(inputData.m_tChannel0[cell_interpolRangeA_start] + (float)i*renderIncrementA))):(alglib::barycentriccalc(baryCentricInterpolantA, inputData.m_tChannel0[cell_interpolRangeA_start] + (float)i*renderIncrementA));
const float valYB = (inputData.m_interpolationType == DRS4InterpolationType::type::spline)?(inputData.m_bUsingALGLIB?(alglib::spline1dcalc(interpolantB, inputData.m_tChannel1[cell_interpolRangeB_start] + (float)i*renderIncrementB)):(tkSplineB(inputData.m_tChannel1[cell_interpolRangeB_start] + (float)i*renderIncrementB))):(alglib::barycentriccalc(baryCentricInterpolantB, inputData.m_tChannel1[cell_interpolRangeB_start] + (float)i*renderIncrementB));

/* modify min/max to calculate the CFD in high accuracy, subsequently */
/* modify min/max to calculate the CFD in high accuracy, subsequently */
yMaxA = qMax(yMaxA, valYA);
yMaxB = qMax(yMaxB, valYB);

Expand Down
4 changes: 2 additions & 2 deletions dversion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

#define NAME QString("DDRS4PALS")
#define MAJOR_VERSION QString("1")
#define MINOR_VERSION QString("03")
#define MINOR_VERSION QString("04")
#define VERSION_EXTENSION QString("(official)")
#define DATE_EXTENSION QString("23.04.2018")
#define DATE_EXTENSION QString("05.06.2018")

#define DATA_STREAM_VERSION 1

Expand Down
Binary file modified include/DLTPulseGenerator/DLTPulseGenerator.dll
View file
Binary file not shown.
Loading

0 comments on commit a288649

Please sign in to comment.