l_maliakal_d
|
4c8bc09143
|
edited getChanregs to include argument to get trimbits from sharedmemory or detector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@253 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-12 08:50:25 +00:00 |
|
bergamaschi
|
008d930594
|
stop now works also on scans/ measurements etc.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@252 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-12 08:23:45 +00:00 |
|
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 |
|
l_maliakal_d
|
6902585e24
|
edited the getRateCorrectionTau for multislsdet to return -1 if different for any of the detectors
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@242 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 08:36:22 +00:00 |
|
bergamaschi
|
6e4be40f37
|
Bad channels correction separated from postProcessing
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@241 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-06 12:03:22 +00:00 |
|
bergamaschi
|
6b34cb8e71
|
AngularConversion splitted in a static file and in one file dependent on slsDetectorBase
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@240 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-05 10:12:49 +00:00 |
|
bergamaschi
|
ca75754b83
|
Default angle function separated from usersFunctions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@239 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-04 11:47:26 +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 |
|
ramani_n
|
d50ac0fe30
|
try again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@232 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-23 09:23:00 +00:00 |
|
ramani_n
|
7c0f93d4d1
|
dummy ci
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@231 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-23 09:19:32 +00:00 |
|
bergamaschi
|
148d37281a
|
branch for interfacing to f90 software for data analysis from MS beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@230 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-22 10:44:41 +00:00 |
|
bergamaschi
|
bb8349b756
|
branch for interfacing to f90 software for data analysis from MS beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@229 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-22 10:43:40 +00:00 |
|
bergamaschi
|
aed6fe9c2e
|
make the branches directory to hold all the branches
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@228 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-22 10:42:46 +00:00 |
|
bergamaschi
|
e888689036
|
makefile with dacs_t flag
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@227 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-22 10:02:43 +00:00 |
|
bergamaschi
|
362ba2af11
|
mythenDetectorServer now works with dacs_t and the commands vpreamp and vcalibration respond correctly
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@226 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-22 09:44:08 +00:00 |
|
l_maliakal_d
|
cd7cfadac8
|
changes in gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@225 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-21 13:38:01 +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
|
5407fdcf6e
|
changed dacs and adcs values to be an int between sockets
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@222 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-15 17:07:55 +00:00 |
|
l_maliakal_d
|
73424d0376
|
somehow it works with the receive adc in receieveModule blocked. added DDACS_DOUBLE to makefile to make it work with client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@221 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-15 15:33:04 +00:00 |
|
l_maliakal_d
|
398b1aa844
|
Undoing all float to double changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@220 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-13 13:31:18 +00:00 |
|
l_maliakal_d
|
c880f883e3
|
Undoing all float to double changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@219 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-13 13:26:53 +00:00 |
|
l_maliakal_d
|
1c7f70e14e
|
Undoing all float to double changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@218 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-13 13:23:51 +00:00 |
|
l_maliakal_d
|
dbfc814768
|
Undoing all float to double changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@217 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-13 13:21:07 +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 |
|
l_maliakal_d
|
f686a575b6
|
gotthard dacs only save 10 bits but firmware is more than 14-16 bits..so changed setdacreg to save only msb and accordingly ignore a difference of 3 while setting. Problem not detected earlier, communicationfuncs.c.Solution: commented out a part from receiveModule
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@215 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-08 16:18:46 +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 |
|
bergamaschi
|
3795dcedfe
|
standalone version of angularConversion and postProcessing added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@205 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-07-17 15:18:31 +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 |
|