|
|
733f5b1f3e
|
made sure that server knows whether to stop sending to receiver even if receiver is down, made sure error in configuremac is shown when doing start receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@292 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-12 10:20:19 +00:00 |
|
|
|
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 |
|
|
|
b75b09cc7b
|
dataReady called
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@288 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-10 08:12:42 +00:00 |
|
|
|
05181fa618
|
postprocessing based on external functions - can work with f90 interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@285 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-08 09:34:14 +00:00 |
|
|
|
e5c5b76236
|
included lock receiver and update clients for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@284 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 15:12:33 +00:00 |
|
|
|
8b3c4c21eb
|
update frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@282 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 12:43:17 +00:00 |
|
|
|
6f9e265949
|
receiver online flag sets back to offline if it tried to connect and didnt work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@280 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 08:58:01 +00:00 |
|
|
|
d6ff3e9227
|
outdir checks if path exists, bug fix receiver: now checks online flag before tryig to set it online for outdir, filename and file index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@279 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 08:31:35 +00:00 |
|
|
|
8fa7e97470
|
receiver works without index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@278 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 08:08:36 +00:00 |
|
|
|
11fe4522eb
|
added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@271 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:14:05 +00:00 |
|
|
|
2e5dc6515f
|
setup receiver first working draft
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@267 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-01 08:25:41 +00:00 |
|
|
|
ae9b39fba3
|
now updating max number of modules when reading the number of modules
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@265 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-20 15:28:54 +00:00 |
|
|
|
5f78b4534f
|
angular conversion data ready callback working also with 0 positions, and multislsdetector write data file fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@256 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-17 15:31:20 +00:00 |
|
|
|
4c8bc09143
|
edited getChanregs to include argument to get trimbits from sharedmemory or detector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@253 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-12 08:50:25 +00:00 |
|
|
|
008d930594
|
stop now works also on scans/ measurements etc.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@252 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-12 08:23:45 +00:00 |
|
|
|
3faeca0649
|
added getchanregs function to get the trimbits
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@251 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-11 15:15:32 +00:00 |
|
|
|
c6d383f770
|
Solved bug on number of measurements
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@250 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-11 09:13:52 +00:00 |
|
|
|
5cb68d870e
|
checkOnline works properly now and calls tcpsocket if controlsocket not defined
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@245 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 15:15:43 +00:00 |
|
|
|
ef8455ced6
|
added a new function checkOnline to check individually if det is connected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@243 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 09:31:32 +00:00 |
|
|
|
6902585e24
|
edited the getRateCorrectionTau for multislsdet to return -1 if different for any of the detectors
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@242 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 08:36:22 +00:00 |
|
|
|
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 |
|
|
|
7093e92c08
|
enCalLog and angCalLog added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@233 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-27 15:29:18 +00:00 |
|
|
|
3e8f1e22e9
|
changed all the dacs and adc types from double to dacs_int to an ifdef defined in sls det defs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@223 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-15 17:12:20 +00:00 |
|
|
|
afbf7c9166
|
changed everything back
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@211 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-03 09:13:48 +00:00 |
|
|
|
1982b25d89
|
File_IO added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@207 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 14:37:37 +00:00 |
|
|
|
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 |
|
|
|
f0dfedeba7
|
reverted a printout of write 0 position 0 offset 0 back to verbose mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@200 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-28 12:47:54 +00:00 |
|
|
|
67471563b0
|
void pointers added to callback functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@199 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-22 12:12:29 +00:00 |
|
|
|
98bf7a4c68
|
solved bug on retrieve detector setup?
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@195 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-19 13:33:00 +00:00 |
|
|
|
bc85c26bdd
|
solved problem on absolute channel number in raw files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@193 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-15 15:30:42 +00:00 |
|
|
|
042b71b403
|
solved problem reading config files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@191 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-15 12:29:40 +00:00 |
|
|
|
fe86145881
|
slsDetectorUsers inherited by all classes i.e. API ready for EPICS driver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@187 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-05 13:57:00 +00:00 |
|
|
|
0ef003646e
|
solved conflicts between detectors about config files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@184 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-31 07:46:53 +00:00 |
|
|
|
c14b98d938
|
impplemented the possibility of setting the bad channels on a module basis
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@183 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-25 15:23:32 +00:00 |
|
|
|
d30ad5faac
|
added callbacks (but should still implement them in the base classes)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@182 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-22 15:34:12 +00:00 |
|
|
|
0bab16cde7
|
Detectors types can (should) be configured in the multiSlsDetector structure
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@181 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-22 12:24:15 +00:00 |
|
|
|
83ee449e3c
|
solved bug with multidetector angular conversion
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@180 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-15 09:17:16 +00:00 |
|
|
|
b484ad7f20
|
changed the getdetectorstype function to return type and not string
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@178 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-11 07:22:40 +00:00 |
|
|
|
e0333e9f84
|
changed the multi getdetectortype to return unknown
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@177 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-04 13:47:32 +00:00 |
|
|
|
9c020fb67d
|
modified getDetectorType function name in slsDetector to be able to make a getDetectorType(pos) function for multiSlsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@176 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-03 16:29:29 +00:00 |
|
|
|
ab4e569b6c
|
After some speed optimization...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@171 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-13 13:03:53 +00:00 |
|
|
|
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 |
|
|
|
2463c9841c
|
really merged after the mess...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@163 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 15:58:03 +00:00 |
|
|
|
13344152aa
|
cretated the class slsDetectorDefs, more advanced funcs moved from slsDetectorBase to slsDetectorUtils, separated function index enum from other definitions (share with dectris?)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@162 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:44:24 +00:00 |
|
|
|
47312e625c
|
now the read/reset counter block and loadimage for gotthard works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@160 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:17:39 +00:00 |
|
|
|
e3ca421c3c
|
faster acquisition for multidetector and angualr data merging independent of angular direction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@156 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-22 13:25:19 +00:00 |
|
|
|
bc8b0860b4
|
moved testfunction to slsDetectorUtils
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@155 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-19 14:50:44 +00:00 |
|
|
|
c822b064ab
|
added the testfunction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@151 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:47:25 +00:00 |
|
|
|
7b3bc86678
|
a weird merge had a return ok in the end of retreievedetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@150 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:24:12 +00:00 |
|
|
|
af864279a5
|
added loadimage function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@147 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 13:06:28 +00:00 |
|
