detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 03:20:14 +01:00
Code Issues Actions Packages Releases Activity

first version to MYTHEN users

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@10 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2010-04-19 10:40:10 +00:00
parent 46b2919bb2
commit 057d518ddc
2 changed files with 346 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

535
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

18
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -56,7 +56,7 @@ class detectorData {
\param fname file name to which the data are saved
\param np number of points defaults to the number of detector channels
*/
detectorData(float *val=NULL, float *err=NULL, float *ang=NULL, int f_ind=-1, const char *fname="", int np=-1) : values(val), errors(err), angles(ang), fileIndex(f_ind), npoints(np){strcpy(fileName,fname);};
detectorData(float *val=NULL, float *err=NULL, float *ang=NULL, int p_ind=-1, const char *fname="", int np=-1) : values(val), errors(err), angles(ang), progressIndex(p_ind), npoints(np){strcpy(fileName,fname);};
/**
the destructor
deletes also the arrays pointing to data/errors/angles if not NULL
@@ -66,14 +66,14 @@ class detectorData {
float *values; /**< pointer to the data */
float *errors; /**< pointer to the errors */
float *angles;/**< pointer to the angles */
int fileIndex;/**< file index */
int progressIndex;/**< file index */
char fileName[1000];/**< file name */
int npoints;/**< number of points */
};
using namespace std;
//using namespace std;
/**
\mainpage Common C++ library for SLS detectors data acquisition
*
@@ -166,6 +166,8 @@ typedef struct sharedSlsDetector {
int trimEnergies[100];
/** indicator for the acquisition progress - set to 0 at the beginning of the acquisition and incremented every time that the data are written to file */
int progressIndex;
/** current index of the output file */
int fileIndex;
/** path of the output files */
@@ -810,7 +812,7 @@ typedef struct sharedSlsDetector {
\returns current register value
\sa ::sls_detector_module
*/
int setModule(int reg, int imod=-1);
virtual int setModule(int reg, int imod=-1);
/**
configure chip
@@ -818,14 +820,14 @@ typedef struct sharedSlsDetector {
\returns current register value
\sa ::sls_detector_module
*/
int setModule(sls_detector_module module);
virtual int setModule(sls_detector_module module);
/**
get module
\param imod module number
\returns pointer to module structure (which has bee created and must then be deleted)
*/
sls_detector_module *getModule(int imod);
virtual sls_detector_module *getModule(int imod);
// calibration functions
// int setCalibration(int imod, detectorSettings isettings, float gain, float offset);
@@ -866,7 +868,7 @@ typedef struct sharedSlsDetector {
in this function trimbits and calibration files are searched in the trimDir and calDir directories and the detector is initialized
*/
detectorSettings setSettings(detectorSettings isettings, int imod=-1);
virtual detectorSettings setSettings(detectorSettings isettings, int imod=-1);
// Acquisition functions
@@ -1355,7 +1357,7 @@ s
/**
current position index of the detector
*/
float currentPositionIndex;
int currentPositionIndex;
/**
I0 measured