From 3d4748e918271064f4a811ddf40b684ac20a77fe Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 18 Jun 2013 12:52:29 +0000 Subject: [PATCH] users exp time problem fixed git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@611 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsDetector/slsDetectorUsers.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp index 4f2960da6..4c86b4900 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp @@ -153,27 +153,30 @@ int slsDetectorUsers::setBeamEnergy(int e_eV){ } double slsDetectorUsers::setExposureTime(double t, bool inseconds){ - int64_t tms = t * (1E+9); + int64_t tms = t * (1E+9); + if (t < 0) tms = -1; if(inseconds) - return myDetector->setExposureTime(t); + return myDetector->setExposureTime(t); else - return ((1E-9) * (double)myDetector->setExposureTime(tms)); + return ((1E-9) * (double)myDetector->setExposureTime(tms)); } double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){ - int64_t tms = t * (1E+9); + int64_t tms = t * (1E+9); + if (t < 0) tms = -1; if(inseconds) - return myDetector->setExposureTime(t); + return myDetector->setExposureTime(t); else - return ((1E-9) * (double)myDetector->setExposurePeriod(tms)); + return ((1E-9) * (double)myDetector->setExposurePeriod(tms)); } double slsDetectorUsers::setDelayAfterTrigger(double t, bool inseconds){ int64_t tms = t * (1E+9); + if (t < 0) tms = -1; if(inseconds) - return myDetector->setExposureTime(t); + return myDetector->setExposureTime(t); else - return ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms)); + return ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms)); } int64_t slsDetectorUsers::setNumberOfGates(int64_t t){