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

minor changes needed for receiver nthr frame

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@568 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-05-21 14:50:50 +00:00
parent 0e73372cf8
commit d8a1e20d80
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -638,7 +638,6 @@ void slsDetectorUtils::incrementProgress() {
void slsDetectorUtils::setCurrentProgress(int i){ void slsDetectorUtils::setCurrentProgress(int i){
pthread_mutex_lock(&mp); pthread_mutex_lock(&mp);
progressIndex++;
progressIndex=i; progressIndex=i;
cout << fixed << setprecision(2) << setw (6) << 100.*((double)progressIndex)/((double)totalProgress) << " \%"; cout << fixed << setprecision(2) << setw (6) << 100.*((double)progressIndex)/((double)totalProgress) << " \%";
pthread_mutex_unlock(&mp); pthread_mutex_unlock(&mp);

8
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -432,9 +432,15 @@ void* postProcessing::processData(int delflag) {
#endif #endif
//always read nth data //always read nth data
if (read_freq != 0) if (read_freq != 0){
newData = true; newData = true;
if (!dataReady){
std::cout << "Error: receiver read freq should be > 0 only when using gui." << std::endl;
std::cout << "Current receiver read frequency: " << read_freq << std::endl;
}
}
while(1){ while(1){
cout.flush(); cout.flush();

2
slsDetectorSoftware/slsReceiver/slsReceiverFunctionList.cpp
View File

@ -446,7 +446,7 @@ int slsReceiverFunctionList::startWriting(){
if (writeReceiverData) if (writeReceiverData)
cout << "Note: Data Write has been defined exernally" << endl; cout << "Note: Data Write has been defined exernally" << endl;
if(nFrameToGui) if(nFrameToGui)
cout << " Not implemented yet: Sending every " << nFrameToGui << "th frame to gui" << endl; cout << "Sending every " << nFrameToGui << "th frame to gui" << endl;
//by default, we read/write everything //by default, we read/write everything