9080 Commits

Author SHA1 Message Date
l_maliakal_d
8fa7e97470 receiver works without index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@278 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-03 08:08:36 +00:00
l_maliakal_d
7e374abc27 should not update filename, dir or index when receiver cannot update
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@277 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:38:09 +00:00
l_maliakal_d
d5a092c2e8 added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@276 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:21:19 +00:00
bergamaschi
d77f4a679a slsDetectorUsers reloaded
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@275 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:20:56 +00:00
l_maliakal_d
2a31378b73 added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@274 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:18:18 +00:00
l_maliakal_d
a59d47289c added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@273 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:16:29 +00:00
l_maliakal_d
e1b0da53cc added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@272 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:15:34 +00:00
l_maliakal_d
11fe4522eb added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@271 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:14:05 +00:00
l_maliakal_d
3232ce8dac added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@270 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 15:12:58 +00:00
bergamaschi
924f583be9 Added f90Interface used at SLS X04SA
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@269 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 08:52:01 +00:00
bergamaschi
fe73d4cb92 slsDetectorUsers is composed of multiSlsDetector instead of being its base class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@268 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-02 07:23:24 +00:00
l_maliakal_d
2e5dc6515f setup receiver first working draft
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@267 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-01 08:25:41 +00:00
l_maliakal_d
aefdcaa82e added stop server, the implementation part of the class, and edited slsDetectorServer to include the correct slsDetectorFunctionList.h
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@266 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-21 16:03:13 +00:00
bergamaschi
ae9b39fba3 now updating max number of modules when reading the number of modules
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@265 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-20 15:28:54 +00:00
bergamaschi
dc9d295860 problem in verbose mode if no angular conversion
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@264 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-20 14:15:46 +00:00
bergamaschi
d7bafd8072 almost no changes - checking in for alba
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@263 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-20 08:57:44 +00:00
l_maliakal_d
e0ad54dd46 updated getting detector mac address for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@262 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 13:58:03 +00:00
l_maliakal_d
32621b1916 included command to get detector firmware svn version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@261 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 12:09:00 +00:00
bergamaschi
8cc957f109 dacs_int makefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@260 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 10:59:45 +00:00
l_maliakal_d
7b058c55cf some more changes in savesettings for gotthard and loadsettings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@259 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 15:58:16 +00:00
l_maliakal_d
8ed87df48f edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 15:12:08 +00:00
l_maliakal_d
658589d15e getmodulenumber gives back fff instead of screwing up reading random stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@257 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-18 14:59:35 +00:00
bergamaschi
5f78b4534f angular conversion data ready callback working also with 0 positions, and multislsdetector write data file fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@256 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-17 15:31:20 +00:00
l_maliakal_d
4b3fecbaf0 copy call back data verbose
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@255 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-17 15:19:45 +00:00
l_maliakal_d
3f5bda1674 added trimbit mask
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@254 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-13 08:58:45 +00:00
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