l_maliakal_d
|
6b6fe986d4
|
works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@92 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 09:38:20 +00:00 |
|
l_maliakal_d
|
af1dab372e
|
works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@91 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 09:38:16 +00:00 |
|
l_maliakal_d
|
913d1c5310
|
works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@90 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 09:33:37 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
80bbea0b6f
|
done update
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@88 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 17:53:32 +00:00 |
|
l_maliakal_d
|
fceb4d63f8
|
before configuremac for errorfree
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@87 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 14:39:21 +00:00 |
|
l_maliakal_d
|
20bc38fe1a
|
reverting to before configuremac command for error-free
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@86 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 14:38:29 +00:00 |
|
l_maliakal_d
|
784c423b55
|
changed the Makefile to what it was before
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@85 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 14:36:06 +00:00 |
|
l_maliakal_d
|
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 |
|
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 |
|
l_maliakal_d
|
ef65cc8b54
|
added the setclientmac function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@82 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 13:41:53 +00:00 |
|
l_maliakal_d
|
1a85d9f691
|
changed the setClientIP function and included 2 header files for IP validation
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@81 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 09:31:52 +00:00 |
|
l_maliakal_d
|
0fd14ad113
|
a few more changes for phaseshiftonce
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@80 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 09:29:50 +00:00 |
|
l_maliakal_d
|
d5271ecb46
|
added the phase shift at power on part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@79 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 14:06:34 +00:00 |
|
l_maliakal_d
|
efb30128fd
|
changed RET to RETVAL for setDetectorType function to compile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@78 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 10:34:08 +00:00 |
|
l_maliakal_d
|
c7d0330f55
|
got rid of some parameters in read-write of config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@77 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 10:13:16 +00:00 |
|
l_maliakal_d
|
77d21d16f9
|
added the set & get functions for clientIP and clientMAC
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@76 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 10:11:56 +00:00 |
|
l_maliakal_d
|
1770045bce
|
Modified upto DAQ reg
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@75 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 10:02:55 +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 |
|
l_maliakal_d
|
a77a6bac21
|
gotthard: everything done except gigabyte and adcwrite upto now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@73 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-29 09:19:35 +00:00 |
|
l_maliakal_d
|
15a649c767
|
gotthard: everything done upto the gigabyte part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@72 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 17:08:03 +00:00 |
|
l_maliakal_d
|
05705a907a
|
gotthard settings name change again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@71 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 15:18:44 +00:00 |
|
l_maliakal_d
|
5c4dfacadb
|
changed name of settings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@70 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 15:07:01 +00:00 |
|
l_maliakal_d
|
5eab29ed13
|
settings:upto a highgain
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@69 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 15:05:53 +00:00 |
|
l_maliakal_d
|
0044bdf0fd
|
gotthard: moving confgain to configuration part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@68 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 15:02:39 +00:00 |
|
l_maliakal_d
|
145de52af3
|
gotthard: got rid of confgain as a parameter read from settings file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@67 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 15:01:02 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
57b892267a
|
gotthard a few changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@65 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 12:52:47 +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 |
|
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 |
|