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

frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-02-05 11:23:46 +00:00
parent ed4aaa83ce
commit 7a55ed9a74
14 changed files with 196 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -31,7 +31,7 @@ slsReceiverFunctionList::slsReceiverFunctionList(bool shortfname):
shortFileName(shortfname),
shortFileNameIndex(0),
fileIndex(0),
frameIndexNeeded(true),
frameIndexNeeded(0),
framesCaught(0),
startFrameIndex(-1),
frameIndex(0),
@ -152,12 +152,10 @@ int slsReceiverFunctionList::setFileIndex(int i){
}
bool slsReceiverFunctionList::resetTotalFramesCaught(bool i){
frameIndexNeeded = i;
void slsReceiverFunctionList::resetTotalFramesCaught(){
startAcquisitionIndex = -1;
totalFramesCaught = 0;
return frameIndexNeeded;
}
@ -170,7 +168,9 @@ int slsReceiverFunctionList::startReceiver(){
int err = 0;
if(!listening_thread_running){
#ifdef VERBOSE
cout << "Starting new acquisition threadddd ...." << endl;
#endif
listening_thread_running=1;
@ -183,8 +183,9 @@ int slsReceiverFunctionList::startReceiver(){
cout << "Cant create writing thread. Status:" << status << endl << endl;
return FAIL;
}
#ifdef VERBOSE
cout << "Writing thread created successfully." << endl;
#endif
//error creating listenign thread
err = 0;
@ -200,9 +201,14 @@ int slsReceiverFunctionList::startReceiver(){
}
while(status!=RUNNING);
#ifdef VERBOSE
cout << "Listening thread created successfully." << endl;
#endif
cout << "Threads created successfully." << endl;
}
return OK;
}
@ -211,12 +217,14 @@ int slsReceiverFunctionList::startReceiver(){
int slsReceiverFunctionList::stopReceiver(){
//#ifdef VERBOSE
#ifdef VERBOSE
cout << "Stopping Receiver" << endl;
//#endif
#endif
if(listening_thread_running){
#ifdef VERBOSE
cout << "Stopping new acquisition threadddd ...." << endl;
#endif
//stop listening thread
listening_thread_running=0;
udpSocket->ShutDownSocket();
@ -228,7 +236,7 @@ int slsReceiverFunctionList::stopReceiver(){
// if(fifo) delete fifo;
//if(latestData) delete latestData;/**new*/
}
cout << "Status:" << status << endl;
cout << "Receiver Stoppped.\nStatus:" << status << endl;
return OK;
@ -374,18 +382,17 @@ int slsReceiverFunctionList::startWriting(){
framesInFile=0;
framesCaught=0;
frameIndex=0;
if(sfilefd) sfilefd=0;
strcpy(savefilename,"");
strcpy(actualfilename,"");
cout << "Max Frames Per File:" << maxFramesPerFile << endl;
cout << "Ready!" << endl;
if(enableFileWrite){
//create file name
if(!frameIndexNeeded) sprintf(savefilename, "%s/%s_%d.raw", filePath,fileName,fileIndex);
if(frameIndexNeeded==-1) sprintf(savefilename, "%s/%s_%d.raw", filePath,fileName,fileIndex);
else sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,framesCaught,fileIndex);
//for sebastian
@ -398,6 +405,7 @@ int slsReceiverFunctionList::startWriting(){
}
while(listening_thread_running){
//when it reaches maxFramesPerFile,start writing new file
@ -406,7 +414,7 @@ int slsReceiverFunctionList::startWriting(){
if(enableFileWrite){
fclose(sfilefd);
//create file name
if(!frameIndexNeeded) sprintf(savefilename, "%s/%s_%d.raw", filePath,fileName,fileIndex);
if(frameIndexNeeded==-1) sprintf(savefilename, "%s/%s_%d.raw", filePath,fileName,fileIndex);
else sprintf(savefilename, "%s/%s_f%012d_%d.raw", filePath,fileName,framesCaught,fileIndex);
//for sebastian
if(!shortFileName) strcpy(actualfilename,savefilename);
@ -426,6 +434,8 @@ int slsReceiverFunctionList::startWriting(){
framesInFile = 0;
}
//actual writing from fifo
if(!fifo->isEmpty()){
// dataWriteFrame = new dataStruct;
@ -487,14 +497,14 @@ char* slsReceiverFunctionList::readFrame(char* c){
guiRequiresData=0;
//if no more data //if(guiRequiresData) // retun NULL;
//cout<<"latestdata:"<<(int)(*(int*)latestData)<<endl;
strcpy(c,savefilename);
return latestData;
}
int slsReceiverFunctionList::setShortFrame(int i){
shortFrame=i;