8f9c657fa0
esrf remove changes: VRS to interpolate, not copy
2018-04-23 14:41:01 +02:00
1069bf5979
esrf changes: slsDetector: fix setThresholdEnergy and slsDetectorAnalysis file read:
...
* slsDetector: Proper cleanup and return when no interpolation is possible
* slsDetectorAnalysis: treat CAL DAC as irrelevant when interpolating settings for two energies(do not abort if different), also including VRS in copying
2018-04-23 13:31:05 +02:00
Erik Frojdh
76bd2c69bc
added vrs to Eiger dacs to interpolate
2018-02-19 12:04:05 +01:00
Dhanya Maliakal
c2980b3c44
changes for setting threshold without trimbits for eiger
2017-06-28 10:24:07 +02:00
Dhanya Maliakal
445da80df8
resolved warnings, also from esrf: todo: include changes in zmq
2017-05-01 13:11:10 +02:00
Dhanya Maliakal
87ce1ed736
moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable
2017-02-03 12:29:44 +01:00
Dhanya Maliakal
6823e3065b
feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction
2016-07-05 12:01:41 +02:00
Dhanya Maliakal
7b7d42f253
fixed the 8 byte iodelay trimfile bug, now writes as 4 bytes
2016-03-14 14:39:40 +01:00
Dhanya Maliakal
5af05c24c1
added iodelay with setttings
2016-02-24 18:05:17 +01:00
Dhanya Maliakal
61f0506c2c
settings for jungfrau
2015-12-01 16:43:23 +01:00
Dhanya Maliakal
584b9e6036
added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger
2015-09-04 15:54:12 +02:00
681ed0f34f
added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software
2015-09-03 15:39:54 +02:00
Dhanya Maliakal
a8fc34c92b
included propix for client
2015-07-21 16:26:50 +02:00
Maliakal Dhanya
56da3f42cc
trimbits not working yet, nth frame works for eiger, scans work for eiger
2014-07-31 12:11:33 +02:00
Maliakal Dhanya
018b800117
eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working
2014-07-02 10:55:32 +02:00
l_maliakal_d
f5413637c4
changed the settings comments to include that it is loaded successfully
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@731 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-31 16:31:39 +00:00
l_maliakal_d
adcf1e2e8c
looks at dac names in settings file for moench and gotthard
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@633 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-11 10:28:32 +00:00
l_maliakal_d
19d3c1eb0c
fixed reading settings file for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@624 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-21 14:25:07 +00:00
l_maliakal_d
f390b7bba7
small errors in read settings file for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@615 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-19 09:33:52 +00:00
l_maliakal_d
89a8871e22
settings file shud read and write according ot dac names and can be in any order, included eiger definitions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@610 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:40:47 +00:00
l_maliakal_d
27c91c36ff
moench client and receiver works with gotthard module, without gui
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@511 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-12 12:54:36 +00:00
l_maliakal_d
f6a2d599a0
indenting to emacs format and including check and start receiver before doing acquire or status start
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@291 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-11 16:17:07 +00:00
l_maliakal_d
7b058c55cf
some more changes in savesettings for gotthard and loadsettings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@259 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 15:58:16 +00:00
l_maliakal_d
8ed87df48f
edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 15:12:08 +00:00
l_maliakal_d
3f5bda1674
added trimbit mask
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@254 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-13 08:58:45 +00:00
bergamaschi
26b4b8a2a7
Debugged loadCalibrationFile and loadSettingsFile concerning the extensions
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@238 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-04 10:18:16 +00:00
bergamaschi
43c51f5be5
added acquisition finished callback when the acquisition returns registerAcquisitionFinishedCallback
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@237 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-04 09:47:47 +00:00
l_maliakal_d
2b59857032
added loadCalibrationfile and saving it
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@236 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-03 09:21:25 +00:00
l_maliakal_d
5aebcd4888
Changed everywhere from float to double, even mythenDetectorServer and the standalone files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@206 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-02 12:58:08 +00:00
wang_x1
6298136a19
add missing header in gcc 4.4
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@198 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-22 09:31:51 +00:00
bergamaschi
ee36cdf9e4
functions splitted in many sub-files
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@167 951219d9-93cf-4727-9268-0efd64621fa3
2012-04-02 15:16:32 +00:00
