l_maliakal_d
|
c04ed80b83
|
changed setDynamicRange to work if not set, set initial settings for num of frames, triggers,period,exptime etc to be 1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@203 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-07-13 11:21:51 +00:00 |
|
l_maliakal_d
|
13fa3520a6
|
Added ifbadchannelmask, else error while compiling in verbose
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@202 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-07-03 12:47:35 +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 |
|
l_maliakal_d
|
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 |
|
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 |
|
l_maliakal_d
|
ab3a5bd2c2
|
Modified the externalcommunication mode variables to include trigger frame and trigger window
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@196 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-20 13:35:58 +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 |
|
root
|
dfcd8f749e
|
makefile adjusted
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@190 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-15 08:01:02 +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 |
|
bergamaschi
|
ed84d21da0
|
solved bug in angular conversion
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@186 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-06-01 13:57:31 +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
|
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 |
|
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
|
7824719d98
|
some smaller modification to slsDetectorServer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@175 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-30 13:19:31 +00:00 |
|
bergamaschi
|
b32265caf9
|
Added common socket interface for the server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@174 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-30 12:58:32 +00:00 |
|
l_maliakal_d
|
4a9dfa12b2
|
the final working gotthard:with no errors in state
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@173 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-16 14:28:18 +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 |
|
l_maliakal_d
|
d8e03f80e4
|
added reset for control reg and changed teh read and write register functions in server_funcs.c
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@168 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-03 09:35:23 +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 |
|
l_maliakal_d
|
af4262aa42
|
added comments to the last functions and added a comma at the end
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@165 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-26 16:50:19 +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
|
513e033a45
|
now the read/reset counter block and loadimage for gotthard works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@161 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:18:07 +00:00 |
|
l_maliakal_d
|
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 |
|
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 |
|
l_maliakal_d
|
410725784c
|
got rid of many warnings and load darkimage and reset/read counter works now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@158 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:13:42 +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
|
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 |
|
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 |
|