detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 09:08:00 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

Browse Source
This commit is contained in:
bergamaschi
2015-09-24 10:54:48 +02:00
parent 33cf26648b cf787c9e7d
commit 11de59d87c
22 changed files with 539 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h
View File

@ -54,7 +54,7 @@ class energyConversion
\param gain reference to the gain variable
\offset reference to the offset variable
*/
static int readCalibrationFile(string fname, double *gain, double *offset, detectorType myDetectorType);
static int readCalibrationFile(string fname, int *gain, int *offset, detectorType myDetectorType);
/**
writes a calibration file
@ -62,7 +62,7 @@ class energyConversion
\param gain
\param offset
*/
static int writeCalibrationFile(string fname, double *gain, double *offset, detectorType myDetectorType);
static int writeCalibrationFile(string fname, int *gain, int *offset, detectorType myDetectorType);