53 Commits

Author SHA1 Message Date
l_maliakal_d
c5b3f10669 changed gotthard server type to be defined in makefile and not in mcb
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@508 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:32:26 +00:00
l_maliakal_d
e4c61a230a added moenchdetector server skeleton, copy of gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@507 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:23:13 +00:00
bergamaschi
8088e6231e virtual servers can be compiled from top directory; include directory with users headers added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@504 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-08 12:40:28 +00:00
bergamaschi
34a2f92cb4 slsReceiver now uses the slsReceiverUsers class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@501 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-04 09:46:16 +00:00
l_maliakal_d
922bc929c8 fixed connect receiver problem from previous version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@495 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 11:02:57 +00:00
l_maliakal_d
96d9e5d078 some revision variable problem resolved in slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@484 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 15:26:29 +00:00
l_maliakal_d
bf429705bf svn rev changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@482 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 09:18:16 +00:00
l_maliakal_d
1ef4ace390 updated bug-crashing when file write disabled and included file pointer in call back function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@474 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 16:08:03 +00:00
l_maliakal_d
0e9b32fb33 made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@472 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:35:12 +00:00
l_maliakal_d
3075b8ae11 made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:34:41 +00:00
l_maliakal_d
aae7c68f65 concatenated filenames for the gui when using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@469 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-22 11:26:43 +00:00
l_maliakal_d
2c38aedcf8 with all the svn revisions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@431 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 13:59:30 +00:00
l_maliakal_d
16f74ebdf2 receiver +4 and +10 to get only data out of the whole data with frame index etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@418 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-08 14:04:50 +00:00
l_maliakal_d
6f793abca8 added receiver mac to be compatible with aldos receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-20 11:11:53 +00:00
l_maliakal_d
b62f3dc1dd get version number for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@414 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-18 14:34:29 +00:00
l_maliakal_d
8cad188c59 got rid of svnInfo class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@412 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 16:43:46 +00:00
bergamaschi
5f74a469eb svn version from svn works for text client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@411 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 15:47:36 +00:00
bergamaschi
739cd7e1d0 revision added to mythen Server works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@380 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:01:50 +00:00
bergamaschi
68e06a5203 revision added to mythen Server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@379 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:57:40 +00:00
bergamaschi
05181fa618 postprocessing based on external functions - can work with f90 interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@285 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-08 09:34:14 +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
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
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
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
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
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
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
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
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
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
bergamaschi
a556b2a7da major changes with inheritances
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@118 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-17 09:43:46 +00:00
bergamaschi
9a93a5f019 all detectors merged into slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@83 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:14:52 +00:00
bergamaschi
c9a314d829 forces update
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@74 951219d9-93cf-4727-9268-0efd64621fa3
2011-12-09 15:48:26 +00:00
bergamaschi
4cbd9b2265 server locking flag (not real lock), last client vs this client, change port implemented, most funcs of the multidetector implemented again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@64 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-25 15:33:25 +00:00
bergamaschi
e4543697c7 Internal timer added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@39 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 13:59:28 +00:00
bergamaschi
ab27ab1c5d Gotthard class implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@34 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-13 11:26:28 +00:00
bergamaschi
ea62caee31 mythenDetectorServer compiles in visrtual mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@28 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 16:20:06 +00:00
bergamaschi
e2d9824bc7 Picasso server makefile and defs added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@23 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 13:44:35 +00:00
bergamaschi
f882a61802 flatfield directory field added to shared memory - Server works with newest firmware versions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@22 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 13:24:03 +00:00
bergamaschi
8a5bc0750d Works with firmware version 100527
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@18 951219d9-93cf-4727-9268-0efd64621fa3
2010-05-26 09:04:14 +00:00
bergamaschi
2dd7b2c67b getRunStatus becomes purely virtual in slsDetector and returns already the runStatus type variable
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@14 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 14:46:34 +00:00
bergamaschi
aeade907d0 Forst version to the users - still trimming problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@11 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:40:38 +00:00
bergamaschi
2ceb966c73 some more changes - mianly configuration file, and dump and retrieve detector settings added + set speed function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@8 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-10 16:25:29 +00:00