detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-07 13:20:02 +02:00
Code Issues Actions Packages Releases Activity

ifstream and ofstream to std::

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-24 14:27:01 +02:00
parent 12832a3a96
commit b78b8425fd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -55,8 +55,8 @@
#include <string> #include <string>
// using std::string; // using std::string;
using std::ofstream; // using std::ofstream;
using std::ifstream; // using std::ifstream;
// using namespace std; // using namespace std;
/** /**

14
slsDetectorSoftware/slsDetectorAnalysis/fileIO.h
View File

@ -244,7 +244,7 @@ class fileIO : public fileIOStatic, public virtual slsDetectorBase {
\returns OK or FAIL if it could not write the file or data=NULL \returns OK or FAIL if it could not write the file or data=NULL
*/ */
virtual int writeDataFile(ofstream &outfile, double *data, double *err=NULL, double *ang=NULL, char dataformat='f', int nch=-1, int offset=0); virtual int writeDataFile(std::ofstream &outfile, double *data, double *err=NULL, double *ang=NULL, char dataformat='f', int nch=-1, int offset=0);
/** /**
@ -266,7 +266,7 @@ class fileIO : public fileIOStatic, public virtual slsDetectorBase {
\param offset start channel number \param offset start channel number
\returns OK or FAIL if it could not write the file or data=NULL \returns OK or FAIL if it could not write the file or data=NULL
*/ */
virtual int writeDataFile(ofstream &outfile, int *data, int offset=0); virtual int writeDataFile(std::ofstream &outfile, int *data, int offset=0);
@ -291,7 +291,7 @@ class fileIO : public fileIOStatic, public virtual slsDetectorBase {
\param offset start channel number \param offset start channel number
\returns OK or FAIL if it could not write the file or data=NULL \returns OK or FAIL if it could not write the file or data=NULL
*/ */
virtual int writeDataFile(ofstream &outfile, short int *data, int offset=0); virtual int writeDataFile(std::ofstream &outfile, short int *data, int offset=0);
/** /**
@ -316,7 +316,7 @@ class fileIO : public fileIOStatic, public virtual slsDetectorBase {
\param offset start channel number to be expected \param offset start channel number to be expected
\returns OK or FAIL if it could not read the file or data=NULL \returns OK or FAIL if it could not read the file or data=NULL
*/ */
int readDataFile(ifstream& infile, double *data, double *err=NULL, double *ang=NULL, char dataformat='f', int offset=0); int readDataFile(std::ifstream& infile, double *data, double *err=NULL, double *ang=NULL, char dataformat='f', int offset=0);
/** /**
reads a raw data file reads a raw data file
@ -333,7 +333,7 @@ yes */
\param offset first channel number to be expected \param offset first channel number to be expected
\returns OK or FAIL if it could not read the file or data=NULL \returns OK or FAIL if it could not read the file or data=NULL
*/ */
int readDataFile(ifstream &infile, int *data, int offset=0); int readDataFile(std::ifstream &infile, int *data, int offset=0);
/** /**
@ -350,7 +350,7 @@ yes */
\param offset first channel number to be expected \param offset first channel number to be expected
\returns OK or FAIL if it could not read the file or data=NULL \returns OK or FAIL if it could not read the file or data=NULL
*/ */
int readDataFile(ifstream &infile, short int *data, int offset=0); int readDataFile(std::ifstream &infile, short int *data, int offset=0);
virtual int getDataBytes ( )=0; virtual int getDataBytes ( )=0;
friend class slsDetector; friend class slsDetector;
@ -397,7 +397,7 @@ yes */
FILE *filefd; FILE *filefd;
ofstream fstream; std::ofstream fstream;
int nframes; int nframes;
// int fformat; // int fformat;