detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-20 15:14:30 +01:00
Code Issues Actions Packages Releases Activity

frame index in file name, increments instead of file index for real time acquisitions

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-10-30 15:52:40 +00:00
parent 2f9dea8341
commit 96d08d61d0
14 changed files with 307 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp
View File

@@ -69,6 +69,9 @@ int fileIO::writeDataFile(string fname, int *data){
return fileIOStatic::writeDataFile(fname, getTotalNumberOfChannels(), data);
}
int fileIO::writeDataFile(ofstream &outfile, int *data, int offset){
return fileIOStatic::writeDataFile(outfile, getTotalNumberOfChannels(), data, offset);
@@ -76,6 +79,41 @@ int fileIO::writeDataFile(ofstream &outfile, int *data, int offset){
int fileIO::writeDataFile(void *data, int iframe) {
if (iframe>=0)
frameIndex=iframe;
if (*framesPerFile<2)
frameIndex=-1;
if ((frameIndex%(*framesPerFile))==0 || (frameIndex<0)) {
createFileName();
filefd = fopen(currentFileName.c_str(), "w");
}
if (filefd){
if (iframe%(*framesPerFile)) {
fileIOStatic::writeBinaryDataFile(filefd,getDataBytes() , data);
frameIndex++;
}
}
if ((frameIndex%(*framesPerFile)==0) || (frameIndex<0)) {
if (filefd)
fclose(filefd);
filefd=NULL;
}
}
int fileIO::closeDataFile() {
if (filefd)
fclose(filefd);
filefd=NULL;
}
int fileIO::writeDataFile(string fname, short int *data){
@@ -83,6 +121,14 @@ int fileIO::writeDataFile(string fname, short int *data){
return fileIOStatic::writeDataFile(fname, getTotalNumberOfChannels(), data);
}
int fileIO::writeDataFile(ofstream &outfile, short int *data, int offset){
return fileIOStatic::writeDataFile(outfile, getTotalNumberOfChannels(), data, offset);
@@ -91,6 +137,12 @@ int fileIO::writeDataFile(ofstream &outfile, short int *data, int offset){
int fileIO::readDataFile(string fname, double *data, double *err, double *ang, char dataformat) {
return fileIOStatic::readDataFile(getTotalNumberOfChannels(), fname, data, err, ang, dataformat);