40 Commits

Author SHA1 Message Date
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
bergamaschi
97a0d06618 string length on the scansteps command corrected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@143 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 15:15:54 +00:00
bergamaschi
d58ccf9c1e compilation warnings (unused variables, no return value for non void functions etc.) removed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@142 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 13:47:50 +00:00
bergamaschi
4b296b6b7d Should now work also for multiple frames and positions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@140 951219d9-93cf-4727-9268-0efd64621fa3
2012-03-15 09:59:40 +00:00
x04sa
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
bergamaschi
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
bergamaschi
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
l_maliakal_d
c6f61d3663 added load image, changed key find, changed get temp to getADC
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@123 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 10:05:57 +00:00
bergamaschi
23aea6007b data file read/write now work with both file names and file streams
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@119 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 10:09:10 +00:00
bergamaschi
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