added load image, changed key find, changed get temp to getADC

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@123 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-02-20 10:05:57 +00:00
parent 44eea027f3
commit c6f61d3663
5 changed files with 378 additions and 151 deletions

View File

@ -204,7 +204,18 @@ class slsDetectorUtils : public slsDetectorCommand {
int readDataFile(string fname, int *data);
int readDataFile(ifstream &infile, int *data);
/**
/**
reads a data file
\param name of the file to be read
\param data array of data values
\returns OK or FAIL if it could not read the file or data=NULL
\sa mythenDetector::readDataFile
*/
int readDataFile(string fname, short int *data);
int readDataFile(ifstream &infile, short int *data);
/**
writes a data file
\param name of the file to be written
@ -259,6 +270,18 @@ class slsDetectorUtils : public slsDetectorCommand {
*/
static int readDataFile(string fname, int *data, int nch);
static int readDataFile(ifstream &infile, int *data, int nch);
/**
reads a data file
\param name of the file to be read
\param data array of data values
\returns OK or FAIL if it could not read the file or data=NULL
\sa mythenDetector::readDataFile
*/
static int readDataFile(string fname, short int *data, int nch);
static int readDataFile(ifstream &infile, short int *data, int nch);
/**
reads an angular conversion file