Commit Graph

31 Commits

Author SHA1 Message Date
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
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
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
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
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
4a4e7540ca added digital_test_bit for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@128 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 14:00:08 +00:00
92a61d1441 added the dark/gain image functions and enum
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@124 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-20 10:06:30 +00:00
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
3e8f916561 implemented the read write reg for debugging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@106 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 17:00:26 +00:00
89c00ffda3 added adc_write to simply write to registers and read back, instead of making more functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@104 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 13:53:48 +00:00
bbedcbc329 included serverMAC function for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@102 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 12:13:07 +00:00
c50716f623 reverted the change: no struct for tse_conf etc in here anymore
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@95 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:39:56 +00:00
88d7f7ffd2 added the enet conf structs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@89 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-12 08:20:29 +00:00
16bfd722b3 changed a few parameters & nvar for writeConfigurationFile function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@84 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:31:37 +00:00
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
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
cd28aaa350 gotthard: changed settings names
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@66 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 12:56:37 +00:00
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
9f85175dce adding conf gain member to sls detector and change a bit in setSettings to read this back
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@60 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 17:55:17 +00:00
798ff206c1 gotthard:sls_detector_defs:changed a comment
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@58 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-22 15:09:20 +00:00
e4495f2bf4 gotthard:adding the temperature in the client part and getting rid of gettemperature,gotthardString functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@53 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-18 16:59:18 +00:00
6edf6fa614 gotthard and mythen detector merged
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@42 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 14:37:21 +00:00
5ec765e41e dhanya-got rid of temp, setgotthard, getgotthard functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@37 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-18 09:02:05 +00:00
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
3367bb3026 Header after/before bug solved in text client - implemented commands to change DACs other than threshold (also for chiptestboard)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@33 951219d9-93cf-4727-9268-0efd64621fa3
2011-04-18 14:00:54 +00:00
a271d7a9e9 Last workin version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@31 951219d9-93cf-4727-9268-0efd64621fa3
2011-03-10 13:39:38 +00:00
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
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
26765a30b7 runStatus enum added and get function indexes all starting from -1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@13 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 14:40:07 +00:00
bf976342b9 After meeting on 30.11.09 - Some functions became pure virtual in slsDetector and have been moved to mythenDetector - setSpeed function added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@3 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-01 09:58:10 +00:00
e2f9d69677 SlsDetector client library and servers. First import.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@1 951219d9-93cf-4727-9268-0efd64621fa3
2009-10-09 14:10:09 +00:00