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

data file read/write now work with both file names and file streams

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@119 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-02-17 10:09:10 +00:00
parent a556b2a7da
commit 23aea6007b
2 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@@ -162,7 +162,6 @@ class slsDetectorUtils : public slsDetectorCommand {
*/
int writeDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1);
int writeDataFile(ofstream &outfile, float *data, float *err=NULL, float *ang=NULL, char dataformat='f', int nch=-1);
@@ -175,6 +174,7 @@ class slsDetectorUtils : public slsDetectorCommand {
\sa mythenDetector::writeDataFile
*/
int writeDataFile(string fname, int *data);
int writeDataFile(ofstream &outfile, int *data);
/**
@@ -191,6 +191,7 @@ class slsDetectorUtils : public slsDetectorCommand {
\sa mythenDetector::readDataFile
*/
int readDataFile(string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f');
int readDataFile(ifstream& infile, float *data, float *err=NULL, float *ang=NULL, char dataformat='f');
/**
@@ -201,6 +202,7 @@ class slsDetectorUtils : public slsDetectorCommand {
\sa mythenDetector::readDataFile
*/
int readDataFile(string fname, int *data);
int readDataFile(ifstream &infile, int *data);
/**
@@ -218,7 +220,7 @@ class slsDetectorUtils : public slsDetectorCommand {
*/
static int writeDataFile(string fname, int nch, float *data, float *err=NULL, float *ang=NULL, char dataformat='f');
static int writeDataFile(ofstream &outfile, int nch, float *data, float *err=NULL, float *ang=NULL, char dataformat='f');
/**
writes a data file
@@ -228,6 +230,7 @@ class slsDetectorUtils : public slsDetectorCommand {
\sa mythenDetector::writeDataFile
*/
static int writeDataFile(string fname,int nch, int *data);
static int writeDataFile(ofstream &outfile,int nch, int *data);
/**
@@ -244,6 +247,7 @@ class slsDetectorUtils : public slsDetectorCommand {
\sa mythenDetector::readDataFile
*/
static int readDataFile(int nch, string fname, float *data, float *err=NULL, float *ang=NULL, char dataformat='f');
static int readDataFile(int nch, ifstream &infile, float *data, float *err=NULL, float *ang=NULL, char dataformat='f');
/**
@@ -254,6 +258,7 @@ class slsDetectorUtils : public slsDetectorCommand {
\sa mythenDetector::readDataFile
*/
static int readDataFile(string fname, int *data, int nch);
static int readDataFile(ifstream &infile, int *data, int nch);
/**
reads an angular conversion file