l_maliakal_d
|
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 |
|
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 |
|
l_maliakal_d
|
e257e2f796
|
editted measurement command
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@247 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 15:20:09 +00:00 |
|
l_maliakal_d
|
7638e6638c
|
added checkonline command
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@246 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 15:17:51 +00:00 |
|
l_maliakal_d
|
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 |
|
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 |
|
l_maliakal_d
|
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 |
|
bergamaschi
|
26b4b8a2a7
|
Debugged loadCalibrationFile and loadSettingsFile concerning the extensions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@238 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-04 10:18:16 +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 |
|
l_maliakal_d
|
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 |
|
bergamaschi
|
b0eea2a6e6
|
Splitted fileIO with fileIOStatic.h
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@235 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-29 09:50:07 +00:00 |
|
l_maliakal_d
|
852bd47bc9
|
changed enum positions to have scriptscan as the last value
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@234 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-29 09:03:26 +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
|
2981ac8700
|
added a change for the dacs from double to dacs_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@224 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-16 08:46:41 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
3229c849ab
|
vref_ds wasnt included
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@216 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-10 14:01:05 +00:00 |
|
ramani_n
|
d934111c2a
|
no change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@214 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-03 10:21:49 +00:00 |
|
l_maliakal_d
|
b154207535
|
changed sscanf for double from %f to %lf in slsdetcommand.cpp and fileio.cpp
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@213 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-03 10:05:37 +00:00 |
|
l_maliakal_d
|
71339022cf
|
added virtual to the slsDectector.h destructor
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@212 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-03 09:34:13 +00:00 |
|
ramani_n
|
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 |
|
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 |
|
l_maliakal_d
|
4fce2499b1
|
changed slsDetectorUtils.h back to before
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@208 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 15:47:16 +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 |
|
ramani_n
|
aa480795c6
|
enableWriteToFile added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@204 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-07-17 10:05:43 +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 |
|
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 |
|