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

not much change

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@421 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-01-11 07:55:02 +00:00
parent af2d3d87b3
commit da2fd8369d
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -1293,7 +1293,7 @@ int* multiSlsDetector::startAndReadAll(){
/** Thread for each detector?!?!?! */
#ifdef VERBOSE
cout << "Start and read all " << endl;
#endif
#endif
int* retval;

2
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -3146,7 +3146,7 @@ int* slsDetector::getDataFromDetector(int *retval){
;
#ifdef VERBOSE
std::cout<< "Detector successfully returned: " << mess << " " << n << std::endl;
#endif
#endif
}
if (r==NULL) {
delete [] retval;

9
slsDetectorSoftware/slsDetector/slsDetectorUtils.cpp
View File

@ -310,9 +310,10 @@ void slsDetectorUtils::acquire(int delflag){
usleep(100000);
}
if (getDetectorsType()==GOTTHARD)
if (getDetectorsType()==GOTTHARD){
if((*correctionMask)&(1<<WRITE_FILE))
closeDataFile();
}
}else{
while(stopReceiver()!=OK);
@ -448,11 +449,9 @@ void slsDetectorUtils::acquire(int delflag){
if (eclog)
delete eclog;
if (acquisition_finished) {
cout << "Acquisition " << endl;
if (acquisition_finished)
acquisition_finished(getCurrentProgress(),getDetectorStatus(),acqFinished_p);
cout << "finished " << endl;
}
}

8
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -354,14 +354,14 @@ void* postProcessing::processData(int delflag) {
/* IF THERE ARE DATA PROCESS THEM*/
while((queuesize=dataQueueSize())>0) {
/** Pop data queue */
#ifdef VERBOSE
//#ifdef VERBOSE
cout << "data found"<< endl;
#endif
//#endif
myData=dataQueueFront(); // get the data from the queue
#ifdef VERBOSE
//#ifdef VERBOSE
cout << "got them"<< endl;
#endif
//#endif
if (myData) {
processFrame(myData,delflag);