Commit Graph

526 Commits

Author SHA1 Message Date
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
fdeba63bff added the confgain parameter of gotthard and changed the MYTHEN part of setsettings that I had commented out earlier
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@62 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-25 10:10:02 +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
b2723feb47 changed a few things in gotthardDetector.cpp and added 2 members to sls_detector_module in slsdetector.cpp to incorporate gotthards need of client ip address and client mac address to send data
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@55 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-21 16:11:28 +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
9812021ef0 gotthard:changed port
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@50 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-15 14:41:04 +00:00
025c6ae10f File name functions made (also) static
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@48 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-11 15:51:34 +00:00
a8943b0746 added gates for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@47 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-11 13:51:54 +00:00
fa4fe558a5 Static methods to check detector type; removed purely virtual functions to avoid error during compilation of multiSlsDetector.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@46 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-10 15:16:29 +00:00
dfcb43b330 Bad channel correction fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@44 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-04 13:26:01 +00:00
9b89333dae Fixed problem with filename after angular conversion
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@43 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 15:58:31 +00:00
848305f9ac most methods moved to slsDetector (instead of mythen and gotthard) and connect/disconnect method added to users functions (to possibly comply with epics) - mutex added to the acquisition and data processing threads to avoid wrong indexes.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@38 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 13:51:26 +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
67cd4f9c14 scripting stuff added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@26 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-07 16:24:03 +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
aeab347db6 slsDetector adapted also too PICASSO
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@17 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-26 08:30:56 +00:00
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
057d518ddc first version to MYTHEN users
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@10 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:40:10 +00:00
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
3f148c52a1 some more details fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@4 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-01 14:32:14 +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
7e6a0fbd1e private variables became protected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@2 951219d9-93cf-4727-9268-0efd64621fa3
2009-10-09 14:56:39 +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