detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 21:08:32 +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

591
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

File diff suppressed because it is too large Load Diff

30
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@@ -56,7 +56,7 @@ class detectorData {
\param fname file name to which the data are saved \param fname file name to which the data are saved
\param np number of points defaults to the number of detector channels \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 the destructor
deletes also the arrays pointing to data/errors/angles if not NULL deletes also the arrays pointing to data/errors/angles if not NULL
@@ -64,16 +64,16 @@ class detectorData {
~detectorData() {if (values) delete [] values; if (errors) delete [] errors; if (angles) delete [] angles;}; ~detectorData() {if (values) delete [] values; if (errors) delete [] errors; if (angles) delete [] angles;};
//private: //private:
float *values; /**< pointer to the data */ float *values; /**< pointer to the data */
float *errors; /**< pointer to the errors */ float *errors; /**< pointer to the errors */
float *angles;/**< pointer to the angles */ float *angles;/**< pointer to the angles */
int fileIndex;/**< file index */ int progressIndex;/**< file index */
char fileName[1000];/**< file name */ char fileName[1000];/**< file name */
int npoints;/**< number of points */ int npoints;/**< number of points */
}; };
using namespace std; //using namespace std;
/** /**
\mainpage Common C++ library for SLS detectors data acquisition \mainpage Common C++ library for SLS detectors data acquisition
* *
@@ -165,7 +165,9 @@ typedef struct sharedSlsDetector {
/** list of the energies at which the detector has been trimmed (unused) */ /** list of the energies at which the detector has been trimmed (unused) */
int trimEnergies[100]; 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 */ /** current index of the output file */
int fileIndex; int fileIndex;
/** path of the output files */ /** path of the output files */
@@ -810,7 +812,7 @@ typedef struct sharedSlsDetector {
\returns current register value \returns current register value
\sa ::sls_detector_module \sa ::sls_detector_module
*/ */
int setModule(int reg, int imod=-1); virtual int setModule(int reg, int imod=-1);
/** /**
configure chip configure chip
@@ -818,14 +820,14 @@ typedef struct sharedSlsDetector {
\returns current register value \returns current register value
\sa ::sls_detector_module \sa ::sls_detector_module
*/ */
int setModule(sls_detector_module module); virtual int setModule(sls_detector_module module);
/** /**
get module get module
\param imod module number \param imod module number
\returns pointer to module structure (which has bee created and must then be deleted) \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 // calibration functions
// int setCalibration(int imod, detectorSettings isettings, float gain, float offset); // 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 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 // Acquisition functions
@@ -1031,7 +1033,7 @@ s
\returns 0 if ff correction disabled, >0 otherwise \returns 0 if ff correction disabled, >0 otherwise
*/ */
int getFlatFieldCorrection(float *corr=NULL, float *ecorr=NULL); int getFlatFieldCorrection(float *corr=NULL, float *ecorr=NULL);
/** /**
get flat field corrections file name get flat field corrections file name
\returns flat field correction file name \returns flat field correction file name
@@ -1355,7 +1357,7 @@ s
/** /**
current position index of the detector current position index of the detector
*/ */
float currentPositionIndex; int currentPositionIndex;
/** /**
I0 measured I0 measured