set settings for eiger, fixd big bug in slsusers for exposures, period etc

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@623 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-06-21 14:24:02 +00:00
parent 5a2018fc6f
commit 47377a02e9
3 changed files with 11 additions and 24 deletions

View File

@ -155,7 +155,7 @@ int slsDetectorUsers::setBeamEnergy(int e_eV){
double slsDetectorUsers::setExposureTime(double t, bool inseconds){
int64_t tms = t * (1E+9);
if (t < 0) tms = -1;
if(inseconds)
if(!inseconds)
return myDetector->setExposureTime(t);
else
return ((1E-9) * (double)myDetector->setExposureTime(tms));
@ -164,8 +164,8 @@ double slsDetectorUsers::setExposureTime(double t, bool inseconds){
double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
int64_t tms = t * (1E+9);
if (t < 0) tms = -1;
if(inseconds)
return myDetector->setExposureTime(t);
if(!inseconds)
return myDetector->setExposurePeriod(t);
else
return ((1E-9) * (double)myDetector->setExposurePeriod(tms));
}
@ -173,8 +173,8 @@ double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
double slsDetectorUsers::setDelayAfterTrigger(double t, bool inseconds){
int64_t tms = t * (1E+9);
if (t < 0) tms = -1;
if(inseconds)
return myDetector->setExposureTime(t);
if(!inseconds)
return myDetector->setDelayAfterTrigger(t);
else
return ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms));
}