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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -292,12 +292,12 @@ class slsDetectorBase : public virtual slsDetectorDefs, public slsDetectorUsers
*/ */
virtual int setNumberOfModules(int i=-1, dimension d=X)=0; virtual int setNumberOfModules(int i=-1, dimension d=X)=0;
int setDetectorSize(int x0=-1, int y0=-1, int nx=-1, int ny=-1){return setNumberOfModules(nx,X);}; int setDetectorSize(int x0=-1, int y0=-1, int nx=-1, int ny=-1){return setNumberOfModules(nx/getChansPerMod(0),X);};
int getDetectorSize(int &x0, int &y0, int &nx, int &ny){x0=0; nx=setNumberOfModules(-1,X); return nx;}; int getDetectorSize(int &x0, int &y0, int &nx, int &ny){x0=0; nx=setNumberOfModules(-1,X)*getChansPerMod(0); return nx;};
virtual int getMaxNumberOfModules(dimension d=X)=0; // virtual int getMaxNumberOfModules(dimension d=X)=0; //
int getMaximumDetectorSize(int &nx, int &ny){nx=getMaxNumberOfModules(X); ny=1; return nx;}; int getMaximumDetectorSize(int &nx, int &ny){nx=getMaxNumberOfModules(X)*getChansPerMod(0); ny=1; return nx;};
/** Locks/Unlocks the connection to the server /** Locks/Unlocks the connection to the server
@ -339,7 +339,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public slsDetectorUsers
*/ */
virtual int stopAcquisition()=0; virtual int stopAcquisition()=0;
int stopMeasurement(){return stopAcquisition();}; int stopMeasurement(){return stopAcquisition();};
virtual int getChansPerMod(int imod=0)=0;
/** /**
set/get timer value set/get timer value

6
slsDetectorSoftware/slsDetectorAnalysis/detectorData.h
View File

@ -16,9 +16,10 @@ class detectorData {
\param ang pointer to the angles \param ang pointer to the angles
\param f_ind file index \param f_ind file index
\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 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 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
@ -31,6 +32,7 @@ class detectorData {
float progressIndex;/**< file index */ float progressIndex;/**< file index */
char fileName[1000];/**< file name */ char fileName[1000];/**< file name */
int npoints;/**< number of points */ int npoints;/**< number of points */
int npy;/**< dimensions in y coordinate*/
}; };