detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-27 16:50:02 +02:00
Code Issues Actions Packages Releases Activity

fixed the problem with multiple frame scan, frame index and file index included in gui

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@344 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-11-14 13:43:42 +00:00
parent e0a1e4ab36
commit 89ddfa9b51
5 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -245,6 +245,8 @@ class slsDetectorBase : public virtual slsDetectorDefs {
virtual int getFileIndexFromFileName(string fname)=0;
virtual int getIndicesFromFileName(string fname,int &index)=0;
virtual double *convertAngles()=0;
/**
set rate correction

1
slsDetectorSoftware/slsDetectorAnalysis/fileIO.h
View File

@ -40,6 +40,7 @@ class fileIO : public fileIOStatic, public virtual slsDetectorBase {
using fileIOStatic::createFileName;
int getFileIndexFromFileName(string fname){return fileIOStatic::getFileIndexFromFileName(fname);};
int getIndicesFromFileName(string fname, int &index){return fileIOStatic::getIndicesFromFileName(fname,index);};
int getVariablesFromFileName(string fname, int &index, int &p_index, double &sv0, double &sv1){return fileIOStatic::getVariablesFromFileName(fname, index, p_index, sv0, sv1);};
int getVariablesFromFileName(string fname, int &index, int &f_index, int &p_index, double &sv0, double &sv1, int &detindex){return fileIOStatic::getVariablesFromFileName(fname, f_index, index, p_index, sv0, sv1, detindex);};
/**

25
slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h
View File

@ -113,7 +113,30 @@ class fileIOStatic {
return 0; \
};
/** static function that returns the frame index and file index from the file name
\param fname file name
\param index reference to index
\returns frame index
*/
static int getIndicesFromFileName(string fname,int &index){ \
int i; \
string s; \
size_t uscore=fname.rfind("_"); \
if (uscore==string::npos) return -1; \
s=fname; \
if (sscanf(s.substr(uscore+1,s.size()-uscore-1).c_str(),"%d",&i)){ \
index=i; \
s=fname.substr(0,uscore); \
} \
else cout << "******************************** cannot parse file index" << endl; \
uscore=s.rfind("_"); \
if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"f%d",&i)) \
if(i==-1)return 0; \
else return i; \
cout << "******************************** cannot parse frame index" << endl; \
return 0; \
};
/** static function that returns the variables from the file name
\param fname file name

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -114,10 +114,10 @@ void postProcessing::processFrame(int *myData, int delflag) {
cout << "writing raw data " << endl;
#endif
if (getDetectorsType()==MYTHEN){cout<<"gonna write datafile"<<endl;
if (getDetectorsType()==MYTHEN){
// if (fdata) {
//uses static function?!?!?!?
writeDataFile (fname+string(".raw"),fdata, NULL, NULL, 'i');cout<<"finished writing datafile"<<endl;
writeDataFile (fname+string(".raw"),fdata, NULL, NULL, 'i');
} else {
writeDataFile ((void*)myData, frameIndex);
}

2
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.c
View File

@ -392,7 +392,7 @@ int stopReceiver(){
char* readFrame(){
int i;
for(i=0;i<10;i++){
for(i=0;i<20;i++){
if ((((int)*((int*)buffer))%2)!=0)
break;
else