 l_maliakal_d
|
7a55ed9a74
|
frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-05 11:23:46 +00:00 |
|
|
l_maliakal_d
|
4cc8566311
|
included a current frame index whch is different than file frame index for gotthard, even when readout through blackfin, for mythen both will alwys be incrememnted by one; gotthard server all of them should be consistent for 32 bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@425 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-11 17:20:57 +00:00 |
|
|
l_maliakal_d
|
da2fd8369d
|
not much change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@421 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-11 07:55:02 +00:00 |
|
|
l_maliakal_d
|
9341a2875a
|
now u can use receiver hostname instead of only ip, got rid of acqtest, separated udpip and port from setudpconnection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@372 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-07 15:51:03 +00:00 |
|
|
l_maliakal_d
|
e490f437a2
|
get progress when acquisition is over to show 100 percent
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@363 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-30 09:51:05 +00:00 |
|
|
l_maliakal_d
|
97ed3e8872
|
made udp socket in receiver use generic socket, included a incrememnt frame index in acquire before a break, got rid of infinite loop for unmatched index in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@350 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-19 16:29:17 +00:00 |
|
|
bergamaschi
|
e0a1e4ab36
|
warnings fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@343 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-14 11:37:06 +00:00 |
|
|
l_maliakal_d
|
dc94fc3c97
|
receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@339 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-13 10:21:22 +00:00 |
|
|
l_maliakal_d
|
bf7da5f493
|
closeDataFile is only for gotthard and included lock for socket while using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@338 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-13 08:38:18 +00:00 |
|
|
l_maliakal_d
|
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 |
|
|
bergamaschi
|
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 |
|
|
l_maliakal_d
|
2338de4054
|
added receiver in here
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 10:06:58 +00:00 |
|
|
l_maliakal_d
|
1f69778a6f
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@319 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:45:22 +00:00 |
|
|
l_maliakal_d
|
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 |
|
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
1d47eb16a1
|
few bugs fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@286 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-08 10:34:34 +00:00 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
25edfba592
|
added measurement_finished callback
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@249 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-11 08:23:33 +00:00 |
|
|
l_maliakal_d
|
d92a6649ee
|
updated number of measurements to reflect in acquire
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@248 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 17:55:26 +00:00 |
|
|
bergamaschi
|
2cfdc2b108
|
check online is ok
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@244 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 13:17:09 +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 |
|
|
bergamaschi
|
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 |
|
|
l_maliakal_d
|
268711f6a6
|
changed back to before
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@210 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 16:32:35 +00:00 |
|
|
l_maliakal_d
|
4f376dc499
|
changed slsDetectorUtils.cpp to before
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@209 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 15:57:58 +00:00 |
|
|
ramani_n
|
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 |
|
|
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 |
|
|
bergamaschi
|
cee632e3b5
|
modification to setDetectorSize
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@201 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-29 07:21:30 +00:00 |
|
|
ramani_n
|
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 |
|
|
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
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
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 |
|
|
x04sa
|
0a561c1c1f
|
solved bug concerning headers
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@185 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-01 07:25:02 +00:00 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
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 |
|
|
bergamaschi
|
1b6f8259c7
|
some more changes in the acquisition function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@172 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-13 15:26:36 +00:00 |
|
|
bergamaschi
|
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 |
|
|
l_maliakal_d
|
e72621959e
|
changed the test function a bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@169 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-03 09:44:06 +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 |
|
|
l_maliakal_d
|
b227ad1b0c
|
test function changed a bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@166 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-28 08:30:52 +00:00 |
|
|
bergamaschi
|
002444fd57
|
debugged
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@164 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-26 08:46:45 +00:00 |
|
|
bergamaschi
|
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 |
|
|
l_maliakal_d
|
c0a69ebc2d
|
now the loadimage, read/reset counterblock for gotthard works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@159 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:16:30 +00:00 |
|
|
x04sa
|
ca896b8b30
|
now processing all files of a sequence
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@157 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 08:30:24 +00:00 |
|
|
x04sa
|
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 |
|
|
l_maliakal_d
|
aae550b997
|
moved the test function to the slsDetectorUtils class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@154 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-19 14:50:01 +00:00 |
|
|
bergamaschi
|
d8d08d5a9b
|
solved segmentation fault on may frames, printing progress during acquisition
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@144 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 12:25:45 +00:00 |
|