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 |
|
wang_x1
|
289318aff6
|
clear warnings using gcc 4.4
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@197 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-22 09:26:31 +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 |
|
wang_x1
|
7582cf9781
|
dataCallback has an argument provided by user
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@194 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-19 10:04:15 +00:00 |
|
bergamaschi
|
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 |
|
bergamaschi
|
69965fcb7e
|
changed detector size from module to channel number, added y dimension to detectorData
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@192 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-15 12:49:28 +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
|
84e113d447
|
small changes in makefile and replaced long long with int64_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@189 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-15 07:12:24 +00:00 |
|
bergamaschi
|
c1c646db15
|
Added slsDetectorUsers
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@188 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-11 14:54:32 +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
|
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 |
|
bergamaschi
|
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 |
|
bergamaschi
|
b5e966bb58
|
reshuffling by Anna
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@179 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-05-14 13:39:18 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
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
|
3ddafe3baf
|
added the usingnamespace std for slsDetectorActions.cpp
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@170 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-04 09:33:32 +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
|
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 |
|
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 |
|
l_maliakal_d
|
3a24dd2396
|
moved the test function from protected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@152 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:48:09 +00:00 |
|
l_maliakal_d
|
6a49d8a6df
|
updated the updatedetector function for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@149 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:23:34 +00:00 |
|
l_maliakal_d
|
2076fb75f5
|
ll
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@146 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 13:05:38 +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 |
|
l_maliakal_d
|
584e99b1b7
|
weird change added to master while merging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@141 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 10:02:22 +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 |
|
l_maliakal_d
|
14bc483310
|
couldnt commit changes, tried to merge, probably messy
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@139 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 09:57:20 +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
|
b070938f57
|
versions at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@136 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-08 08:23:33 +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
|
5e086b9ee6
|
timing command added, several bugs concerning the synchronization of multiple detectors fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@134 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-28 13:59:28 +00:00 |
|
bergamaschi
|
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 |
|
bergamaschi
|
1064bd21ff
|
slsDetectorCommand does not inherit slsDetectorBase but rather uses its methods
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@132 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-24 15:32:39 +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
|
e0368c69ee
|
added a testfunction to test start and stop acquisition of gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@130 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-21 16:01:13 +00:00 |
|