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 |
|
l_maliakal_d
|
f1654363e0
|
interchanged both the temp_adc and temp_fpga values, since they were reading alternate values
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@63 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-25 10:55:22 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
05aaefb8f0
|
temp, confgain and hv works well, temp is alternate though
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@61 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-24 15:54:26 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
7de31bbe93
|
highvoltage again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@59 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-22 17:19:58 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
39d9ae8b7b
|
gotthard:highvoltage done
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@57 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-22 15:08:48 +00:00 |
|
l_maliakal_d
|
1ecde6beeb
|
gotthard: got rid of HV in settings file and changing the way macadd read from settings file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@56 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-22 11:01:27 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
19e2f2ef60
|
gotthard: temp readable
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@54 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-18 17:04:58 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
40e945889c
|
gotthard:incorporated the temperature read
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@52 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-18 16:56:14 +00:00 |
|
l_maliakal_d
|
fc07eee532
|
added some registers
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@51 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-18 12:54:59 +00:00 |
|
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 |
|