|
|
6b935f3bd2
|
included exitReceiver, using different threads to listen and write packets in receiver, edited circularfifo to use pointer references, and acquire returns frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@362 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-30 09:28:52 +00:00 |
|
|
|
e4e46920cd
|
fixed frames from receiver to flip accordingly, also display frame index as not visible from filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-15 11:19:50 +00:00 |
|
|
|
8f7872d056
|
gotthard receiver works so far without cpu file write and tcp generic socket lock
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-12 15:48:28 +00:00 |
|
|
|
96d08d61d0
|
frame index in file name, increments instead of file index for real time acquisitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 15:52:40 +00:00 |
|
|
|
69d08ac546
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@321 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:46:22 +00:00 |
|
|
|
8387f70071
|
doxygen for slsReceiver and slsReceiverInterface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@315 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 09:38:54 +00:00 |
|
|
|
b52f9a8569
|
filepath, filename and index set from slsdet or multislsdet, moving all receiver coding from slsdetectorcommand to slsdetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@312 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-24 11:59:04 +00:00 |
|
|
|
6cf4fc5e43
|
editing configuremac to include adc number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@298 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-16 15:31:46 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7c07ae5a5a
|
after some debugging at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@137 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-09 14:40:10 +00:00 |
|
|
|
461fd8824f
|
Raw data file write/read now uses absolute channel values in multidetector systems. Flat field and bad channel corrections and angular conversion debugged
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@135 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-02 11:01:53 +00:00 |
|
|
|
b755c533f0
|
timing functions changed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@133 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-27 16:29:40 +00:00 |
|
|
|
c2a24e2c73
|
changes in the software structure debugged
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@131 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-24 13:14:58 +00:00 |
|
|
|
e24a4b79a3
|
modified configuremac function to have zero arguments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@127 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 13:59:31 +00:00 |
|
|
|
a556b2a7da
|
major changes with inheritances
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@118 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-17 09:43:46 +00:00 |
|
|
|
9a93a5f019
|
all detectors merged into slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@83 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 14:14:52 +00:00 |
|
|
|
4cbd9b2265
|
server locking flag (not real lock), last client vs this client, change port implemented, most funcs of the multidetector implemented again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@64 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-25 15:33:25 +00:00 |
|
|
|
025c6ae10f
|
File name functions made (also) static
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@48 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-11 15:51:34 +00:00 |
|
|
|
93af09b71e
|
minor changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@41 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-03 14:00:41 +00:00 |
|
|
|
ab27ab1c5d
|
Gotthard class implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@34 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-10-13 11:26:28 +00:00 |
|
