some more changes in the acquisition function

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@172 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-04-13 15:26:36 +00:00
parent ab4e569b6c
commit 1b6f8259c7
10 changed files with 249 additions and 305 deletions

View File

@ -52,7 +52,7 @@ string fileIO::createFileName(char *filepath, char *filename, int aMask, float
/* generates file name without extension*/
string fileIO::createFileName() {
return createFileName(filePath, \
currentFileName=createFileName(filePath, \
fileName, \
getActionMask(), \
getCurrentScanVariable(0), \
@ -63,6 +63,7 @@ string fileIO::createFileName() {
getNumberOfPositions(), \
*fileIndex \
);
return currentFileName;
}