Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software

This commit is contained in:
2015-08-28 10:55:22 +02:00
37 changed files with 858 additions and 449 deletions

View File

@ -1118,7 +1118,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
\param flag readout flag to be set
\returns current flag
*/
int setReadOutFlags(readOutFlags flag=GET_READOUT_FLAGS);
int setReadOutFlags(readOutFlags flag=GET_READOUT_FLAGS);
/**
execute trimming