changed detector size from module to channel number, added y dimension to detectorData

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@192 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-06-15 12:49:28 +00:00
parent 042b71b403
commit 69965fcb7e
2 changed files with 8 additions and 6 deletions

View File

@ -16,9 +16,10 @@ class detectorData {
\param ang pointer to the angles
\param f_ind file index
\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 in x coordinate defaults to the number of detector channels (1D detector)
\param ny dimension in y (1D detector)
*/
detectorData(float *val=NULL, float *err=NULL, float *ang=NULL, float p_ind=-1, const char *fname="", int np=-1) : values(val), errors(err), angles(ang), progressIndex(p_ind), npoints(np){strcpy(fileName,fname);};
detectorData(float *val=NULL, float *err=NULL, float *ang=NULL, float p_ind=-1, const char *fname="", int np=-1, int ny=1) : values(val), errors(err), angles(ang), progressIndex(p_ind), npoints(np), npy(ny){strcpy(fileName,fname);};
/**
the destructor
deletes also the arrays pointing to data/errors/angles if not NULL
@ -31,6 +32,7 @@ class detectorData {
float progressIndex;/**< file index */
char fileName[1000];/**< file name */
int npoints;/**< number of points */
int npy;/**< dimensions in y coordinate*/
};