bergamaschi
|
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 |
|
l_maliakal_d
|
c0a69ebc2d
|
now the loadimage, read/reset counterblock for gotthard works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@159 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:16:30 +00:00 |
|
x04sa
|
ca896b8b30
|
now processing all files of a sequence
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@157 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 08:30:24 +00:00 |
|
x04sa
|
e3ca421c3c
|
faster acquisition for multidetector and angualr data merging independent of angular direction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@156 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-22 13:25:19 +00:00 |
|
l_maliakal_d
|
aae550b997
|
moved the test function to the slsDetectorUtils class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@154 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-19 14:50:01 +00:00 |
|
l_maliakal_d
|
3a24dd2396
|
moved the test function from protected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@152 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:48:09 +00:00 |
|
l_maliakal_d
|
6a49d8a6df
|
updated the updatedetector function for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@149 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:23:34 +00:00 |
|
l_maliakal_d
|
2076fb75f5
|
ll
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@146 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 13:05:38 +00:00 |
|
bergamaschi
|
d8d08d5a9b
|
solved segmentation fault on may frames, printing progress during acquisition
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@144 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 12:25:45 +00:00 |
|
bergamaschi
|
97a0d06618
|
string length on the scansteps command corrected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@143 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 15:15:54 +00:00 |
|
bergamaschi
|
d58ccf9c1e
|
compilation warnings (unused variables, no return value for non void functions etc.) removed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@142 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 13:47:50 +00:00 |
|
l_maliakal_d
|
584e99b1b7
|
weird change added to master while merging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@141 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 10:02:22 +00:00 |
|
bergamaschi
|
4b296b6b7d
|
Should now work also for multiple frames and positions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@140 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 09:59:40 +00:00 |
|
l_maliakal_d
|
14bc483310
|
couldnt commit changes, tried to merge, probably messy
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@139 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 09:57:20 +00:00 |
|
x04sa
|
7c07ae5a5a
|
after some debugging at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@137 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-09 14:40:10 +00:00 |
|
bergamaschi
|
b070938f57
|
versions at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@136 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-08 08:23:33 +00:00 |
|
bergamaschi
|
461fd8824f
|
Raw data file write/read now uses absolute channel values in multidetector systems. Flat field and bad channel corrections and angular conversion debugged
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@135 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-02 11:01:53 +00:00 |
|
bergamaschi
|
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 |
|
bergamaschi
|
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 |
|
bergamaschi
|
1064bd21ff
|
slsDetectorCommand does not inherit slsDetectorBase but rather uses its methods
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@132 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-24 15:32:39 +00:00 |
|
bergamaschi
|
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 |
|
l_maliakal_d
|
e0368c69ee
|
added a testfunction to test start and stop acquisition of gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@130 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-21 16:01:13 +00:00 |
|
l_maliakal_d
|
8e79e5077f
|
modified configuremac function, moved digital test bit to digital test function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@126 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 13:57:52 +00:00 |
|
l_maliakal_d
|
c6f61d3663
|
added load image, changed key find, changed get temp to getADC
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@123 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 10:05:57 +00:00 |
|
l_maliakal_d
|
47f18d3cbf
|
adding hostname+ changing that
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@121 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-17 11:09:51 +00:00 |
|
bergamaschi
|
23aea6007b
|
data file read/write now work with both file names and file streams
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@119 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-17 10:09:10 +00:00 |
|
bergamaschi
|
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 |
|
l_maliakal_d
|
6778060b56
|
changed dynamic range of gotthard, moved get temp to getadc function, added 3 debugging functions just for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@117 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-16 14:23:05 +00:00 |
|
l_maliakal_d
|
b7bb5a961b
|
fixed fpgaversion etc register problems
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@109 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-18 18:00:37 +00:00 |
|
l_maliakal_d
|
302a70d59b
|
Using myMod-reg for settings for the gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@108 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-17 10:48:01 +00:00 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
e8e1157c1a
|
included serverMAC function for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@100 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 11:43:03 +00:00 |
|
l_maliakal_d
|
19f7712e65
|
changes which commented out virtual for child functions and some other changes for configuremac and setclientip and setclientmac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@96 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 09:44:04 +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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|