detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 08:39:21 +01:00
Code Issues Actions Packages Releases Activity

cretated the class slsDetectorDefs, more advanced funcs moved from slsDetectorBase to slsDetectorUtils, separated function index enum from other definitions (share with dectris?)

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@162 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-03-23 11:44:24 +00:00
parent 513e033a45
commit 13344152aa
13 changed files with 466 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -1091,8 +1091,8 @@ int* multiSlsDetector::readAll(){
#ifdef VERBOSE
std::cout<< "received "<< i<< " frames" << std::endl;
#else
std::cout << std::endl;
//#else
// std::cout << std::endl;
#endif
return dataQueue.front(); // check what we return!
@@ -1132,8 +1132,8 @@ int* multiSlsDetector::startAndReadAll(){
#ifdef VERBOSE
std::cout<< "MMMM recieved "<< i<< " frames" << std::endl;
#else
std::cout << std::endl;
//#else
// std::cout << std::endl;
#endif
return dataQueue.front(); // check what we return!

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -581,7 +581,7 @@ class multiSlsDetector : public slsDetectorUtils {
updates the size of the data expected from the detector
\sa sharedSlsDetector
*/
int setDynamicRange(int n=-1, int pos=-1);
int setDynamicRange(int n, int pos);
@@ -611,7 +611,7 @@ class multiSlsDetector : public slsDetectorUtils {
\param ecorr if !=NULL the flat field correction errors will be filled with ecorr (1 otherwise)
\returns 0 if ff correction disabled, >0 otherwise
*/
int setFlatFieldCorrection(float *corr=NULL, float *ecorr=NULL);
int setFlatFieldCorrection(float *corr, float *ecorr=NULL);
/**
get flat field corrections