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

fixed some probelems wuth scans for receiver and also scans for allframes/frameindex

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@654 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-08-16 12:59:42 +00:00
parent 97aa35a388
commit 3098664c8f
10 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x649 //#define SVNREV 0x652
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x649 #define SVNREV 0x652
#define SVNDATE 0x20130808 #define SVNDATE 0x20130813
// //

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x651 //#define SVNREV 0x653
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x651 #define SVNREV 0x653
#define SVNDATE 0x20130812 #define SVNDATE 0x20130815
// //

6
slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x649 //#define SVNREV 0x652
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x649 #define SVNREV 0x652
#define SVNDATE 0x20130808 #define SVNDATE 0x20130813
// //

6
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x649 //#define SVNREV 0x652
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x649 #define SVNREV 0x652
#define SVNDATE 0x20130808 #define SVNDATE 0x20130813
// //

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2719,7 +2719,7 @@ int slsDetector::setThresholdEnergy(int e_eV, int imod, detectorSettings isetti
int ret=FAIL; int ret=FAIL;
char mess[100]; char mess[100];
#ifdef VERBOSE #ifdef VERBOSE
std::cout<< "Getting threshold energy "<< std::endl; std::cout<< "Setting threshold energy "<< std::endl;
#endif #endif
if (thisDetector->onlineFlag==ONLINE_FLAG) { if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (connectControl() == OK){ if (connectControl() == OK){

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x651 //#define SVNREV 0x653
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x651 #define SVNREVLIB 0x653
#define SVNDATELIB 0x20130812 #define SVNDATELIB 0x20130815
// //

12
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -421,7 +421,7 @@ void* postProcessing::processData(int delflag) {
*/ */
int prevCaught=0; int prevCaught=-1;
int caught=0; int caught=0;
bool newData=false; bool newData=false;
char currentfName[MAX_STR_LENGTH]=""; char currentfName[MAX_STR_LENGTH]="";
@ -483,7 +483,7 @@ void* postProcessing::processData(int delflag) {
//get data //get data
strcpy(currentfName,""); strcpy(currentfName,"");
pthread_mutex_lock(&mg); pthread_mutex_lock(&mg);
int* receiverData = readFrameFromReceiver(currentfName,currentfIndex); int* receiverData = readFrameFromReceiver(currentfName,currentfIndex);//if(currentfIndex!=-1)cout<<"--currentfIndex:"<<currentfIndex<<endl;
pthread_mutex_unlock(&mg); pthread_mutex_unlock(&mg);
if(setReceiverOnline()==OFFLINE_FLAG) if(setReceiverOnline()==OFFLINE_FLAG)
receiverData = NULL; receiverData = NULL;
@ -494,14 +494,14 @@ void* postProcessing::processData(int delflag) {
// determine if new Data for nth frame read // determine if new Data for nth frame read
if (read_freq){ if (read_freq){
//delete if not new data
if (caught <= prevCaught)
currentfIndex = -1;
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "caught:" << caught << " prevcaught:" << prevCaught << std::endl; std::cout << "caught:" << caught << " prevcaught:" << prevCaught << std::endl;
#endif #endif
//delete if not new data
if((caught == prevCaught) || (caught == -1))
currentfIndex = -1;
else if (currentfIndex!=-1)
prevCaught=caught; prevCaught=caught;
} }
//not garbage frame //not garbage frame

7
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -459,7 +459,7 @@ int slsReceiverFunctionList::startListening(){
else else
startFrameIndex = ((((uint32_t)(*((uint32_t*)buffer))) & (frameIndexMask)) >> frameIndexOffset); startFrameIndex = ((((uint32_t)(*((uint32_t*)buffer))) & (frameIndexMask)) >> frameIndexOffset);
//cout<<"startFrameIndex:"<<startFrameIndex<<endl; cout<<"startFrameIndex:"<<startFrameIndex<<endl;
prevframenum=startFrameIndex; prevframenum=startFrameIndex;
measurementStarted = true; measurementStarted = true;
} }
@ -600,9 +600,9 @@ int slsReceiverFunctionList::startWriting(){
cout << savefilename << endl; cout << savefilename << endl;
else{ else{
if(!frameIndexOffset) if(!frameIndexOffset)
packetloss = ((currframenum-prevframenum-(packetsPerFrame*framesInFile))/(double)(packetsPerFrame*framesInFile))*100.000; packetloss = (int)(((currframenum-prevframenum-(packetsPerFrame*framesInFile))/(double)(packetsPerFrame*framesInFile))*100.000);
else else
packetloss = ((currframenum-prevframenum-(framesInFile))/(double)(framesInFile))*100.000; packetloss = (int)(((currframenum-prevframenum-(framesInFile))/(double)(framesInFile))*100.000);
cout << savefilename cout << savefilename
<< "\tpacket loss " << setw(4)<<fixed << setprecision(4) << packetloss << "\tpacket loss " << setw(4)<<fixed << setprecision(4) << packetloss
<< "%\tframenum " << "%\tframenum "
@ -714,6 +714,7 @@ int slsReceiverFunctionList::startWriting(){
break; break;
} }
} }
cout << "RealTime Frames Caught:" << framesCaught << endl;
cout << "Total Frames Caught:"<< totalFramesCaught << endl; cout << "Total Frames Caught:"<< totalFramesCaught << endl;

12
slsDetectorSoftware/slsReceiver/slsReceiver_funcs.cpp
View File

@ -1179,6 +1179,9 @@ int slsReceiverFuncs::gotthard_read_frame(){
#endif #endif
}else{ }else{
index=(uint32_t)(*(uint32_t*)raw); index=(uint32_t)(*(uint32_t*)raw);
#ifdef VERBOSE
cout<<"index:"<<index<<endl;
#endif
if(shortFrame==-1) if(shortFrame==-1)
index2= (uint32_t)(*((uint32_t*)((char*)(raw+onebuffersize)))); index2= (uint32_t)(*((uint32_t*)((char*)(raw+onebuffersize))));
memcpy(origVal,raw,bufferSize); memcpy(origVal,raw,bufferSize);
@ -1213,9 +1216,10 @@ int slsReceiverFuncs::gotthard_read_frame(){
} }
#ifdef VERBOSE #ifdef VERBOSE
cout << "\nstartIndex:" << startIndex << endl; if(arg!=-1){
cout << "fName:" << fName << endl; cout << "fName:" << fName << endl;
cout << "index:" << arg << endl; cout << "findex:" << arg << endl;
}
#endif #endif
@ -1268,11 +1272,11 @@ int slsReceiverFuncs::set_read_frequency(){
if (lockStatus==1 && socket->differentClients==1){//necessary??? if (lockStatus==1 && socket->differentClients==1){//necessary???
sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP); sprintf(mess,"Receiver locked by %s\n", socket->lastClientIP);
ret=FAIL; ret=FAIL;
} }/*
else if((slsReceiverList->getStatus()==RUNNING) && (index >= 0)){ else if((slsReceiverList->getStatus()==RUNNING) && (index >= 0)){
ret = FAIL; ret = FAIL;
strcpy(mess,"cannot set up receiver mode when receiver is running\n"); strcpy(mess,"cannot set up receiver mode when receiver is running\n");
} }*/
else else
retval=slsReceiverList->setNFrameToGui(index); retval=slsReceiverList->setNFrameToGui(index);
} }

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x649 //#define SVNREV 0x652
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x649 #define SVNREV 0x652
#define SVNDATE 0x20130808 #define SVNDATE 0x20130813
// //