From a05631f2c361e883fa7a09dfb4475ff37fb489e4 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 18 Oct 2012 09:58:54 +0000 Subject: [PATCH] file name with frame index and detector index git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@302 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsDetectorAnalysis/fileIO.cpp | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp b/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp index 1ce963ad0..f469a7f53 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/fileIO.cpp @@ -3,29 +3,48 @@ - - /* I/O */ +/* I/O */ /* generates file name without extension*/ string fileIO::createFileName() { currentFileName=fileIOStatic::createFileName(filePath, \ - fileName, \ - getActionMask(), \ - getCurrentScanVariable(0), \ - getScanPrecision(0), \ - getCurrentScanVariable(1), \ - getScanPrecision(1), \ - getCurrentPositionIndex(), \ - getNumberOfPositions(), \ - *fileIndex \ - ); + fileName, \ + getActionMask(), \ + getCurrentScanVariable(0), \ + getScanPrecision(0), \ + getCurrentScanVariable(1), \ + getScanPrecision(1), \ + getCurrentPositionIndex(), \ + getNumberOfPositions(), \ + *fileIndex, \ + frameIndex, \ + detIndex \ + ); return currentFileName; } +/* generates file prefix for receivers */ + +string fileIO::createReceiverFilePrefix() { + currentReceiverFilePrefix=fileIOStatic::createReceiverFilePrefix(fileName, \ + getActionMask(), \ + getCurrentScanVariable(0), \ + getScanPrecision(0), \ + getCurrentScanVariable(1), \ + getScanPrecision(1), \ + getCurrentPositionIndex(), \ + getNumberOfPositions(), \ + detIndex \ + ); + return currentReceiverFilePrefix; + +} + + /*writes raw data file */