9102 Commits

Author SHA1 Message Date
l_maliakal_d
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
maliakal_d
5d687a1dee gotthard: changed the fpga dummyreg read/write test
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@49 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-15 14:24:45 +00:00
bergamaschi
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
l_maliakal_d
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
bergamaschi
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
l_maliakal_d
55ab200dbd Added 100 read writes to test fpga
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@45 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-09 14:49:05 +00:00
bergamaschi
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
bergamaschi
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
bergamaschi
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
bergamaschi
93af09b71e minor changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@41 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 14:00:41 +00:00
bergamaschi
cb0677c3ea makefile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@40 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-03 14:00:13 +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
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
l_maliakal_d
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
l_maliakal_d
ef657a9218 gotthard-changes in trimming_funcs and shared_memory to just make it compile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@36 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-14 15:08:14 +00:00
l_maliakal_d
9cb8c0c378 gotthard-changed clock frequency
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@35 951219d9-93cf-4727-9268-0efd64621fa3
2011-10-14 14:24:15 +00:00
bergamaschi
09ef669f17 Gotthard software added to MAkefile and settings directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@2 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-10-13 11:41:48 +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
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
bergamaschi
be173eaee1 Got rid of C++ comments un usersFunctions.c
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@32 951219d9-93cf-4727-9268-0efd64621fa3
2011-03-10 14:24:40 +00:00
bergamaschi
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
bergamaschi
d4e73141dd mythenDetectorServer compiles in virtual mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@30 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 16:28:02 +00:00
bergamaschi
9c39073e20 mythenDetectorServer compiles in virtual mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@29 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 16:25:45 +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
fbe78acbfe compiles virtual server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@27 951219d9-93cf-4727-9268-0efd64621fa3
2011-02-15 15:49:57 +00:00
bergamaschi
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
bergamaschi
677523aa6b libs not copied to bin directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@25 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 14:47:12 +00:00
bergamaschi
51f399f3ed first real import
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorsPackage@1 08cae9ef-cb74-4d14-b03a-d7ea46f178d7
2011-01-28 14:39:07 +00:00
bergamaschi
62ea1663b9 Unuseful files deleted
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@24 951219d9-93cf-4727-9268-0efd64621fa3
2011-01-28 13:45:45 +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
9f64dd01d8 shorter timeout to socket connect
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@21 951219d9-93cf-4727-9268-0efd64621fa3
2010-07-02 14:16:47 +00:00
bergamaschi
8d006d5486 client version added to textclient
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@20 951219d9-93cf-4727-9268-0efd64621fa3
2010-07-02 14:16:16 +00:00
bergamaschi
a60ac8963c Offline flag implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@19 951219d9-93cf-4727-9268-0efd64621fa3
2010-06-10 15:16: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
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
bergamaschi
bbb9780647 server accepting connection modified in MySocketTCP.cxx
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@16 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-22 08:29:59 +00:00
bergamaschi
e12280c83a added virtual link MySocketTCP.ccp
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@15 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-20 09:35:17 +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
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
bergamaschi
2cfbc846b9 npoints added to the final data and status and timer left available on the stop socket
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@12 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:50:52 +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
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
bergamaschi
46b2919bb2 first version to the users
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@9 951219d9-93cf-4727-9268-0efd64621fa3
2010-04-19 10:39:50 +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
l_johnson_i
2336c330a8 edited comments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@7 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-02 10:13:12 +00:00
l_johnson_i
54b670f4f4 edited doxygen comments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@6 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-02 09:58:01 +00:00
l_johnson_i
71ef480327 doxygen comments were added to the class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@5 951219d9-93cf-4727-9268-0efd64621fa3
2009-12-02 09:56:14 +00:00
bergamaschi
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
bergamaschi
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