detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 23:10:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 2.3-rc

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-02-28 13:42:16 +01:00
commit 475f0692a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h
View File

@ -10,7 +10,7 @@
//#include "sls_receiver_defs.h"
#include "sls_detector_defs.h"
//#endif
#include <cmath>
#include <string>
using namespace std;
@ -75,7 +75,7 @@ class energyConversion
V linearInterpolation(const E x, const E x1, const E x2, const V y1, const V y2){
double k = static_cast<double>(y2-y1)/(x2-x1);
double m = y1-k*x1;
int y = round( k*x+m );
int y = std::round( k*x+m );
return static_cast<V>(y);
}