l_maliakal_d
|
145e38eac1
|
commenting out small printf changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@153 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-19 14:35:21 +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
|
c822b064ab
|
added the testfunction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@151 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:47:25 +00:00 |
|
l_maliakal_d
|
7b3bc86678
|
a weird merge had a return ok in the end of retreievedetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@150 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:24:12 +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
|
bb12fe77d3
|
edited the updatedetector function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@148 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:22:43 +00:00 |
|
l_maliakal_d
|
af864279a5
|
added loadimage function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@147 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 13:06:28 +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 |
|
l_maliakal_d
|
794ab4fdfc
|
updated the master, settiming, setextsig, setfpgasignal, synchronization functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@145 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 12:55:01 +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 |
|
l_maliakal_d
|
c2846e72e7
|
changed fifo_data address, made fifo related stuff volatile, changed makefile to incorporate compiling image and program simultaneously
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@138 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 08:26:10 +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
|
bd54f179ed
|
status register updates
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@129 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-21 15:58:58 +00:00 |
|
l_maliakal_d
|
4a4e7540ca
|
added digital_test_bit for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@128 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 14:00:08 +00:00 |
|
l_maliakal_d
|
e24a4b79a3
|
modified configuremac function to have zero arguments
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@127 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 13:59:31 +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
|
7ed37b2e3f
|
moving digital test bit in configuremac function to the digital test function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@125 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 13:46:41 +00:00 |
|
l_maliakal_d
|
92a61d1441
|
added the dark/gain image functions and enum
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@124 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 10:06:30 +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
|
44eea027f3
|
fixed dark/gain image correction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@122 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 10:00:59 +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 |
|
l_maliakal_d
|
a7e9cc1091
|
added the dark and gain image funcitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@120 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-17 10:26:04 +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
|
ee2652f864
|
read_frame works and moved get temp to the getadc function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@116 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-16 14:16:38 +00:00 |
|
l_maliakal_d
|
2e15e9c2db
|
works but usleep required
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@115 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-14 10:39:37 +00:00 |
|
l_maliakal_d
|
ba833233b9
|
changed the register addresses
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@114 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-03 15:44:57 +00:00 |
|
l_maliakal_d
|
266d13759c
|
a few changes for the fifo_read and the bus_r16
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@113 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-30 07:45:05 +00:00 |
|
l_maliakal_d
|
af2c6b9bb2
|
named enums in mcb_funcs.h
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@112 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-23 15:33:19 +00:00 |
|
l_maliakal_d
|
094a87ec7b
|
changes for testram which didnt work anyway
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@111 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-23 15:05:08 +00:00 |
|
l_maliakal_d
|
41fea1fbcf
|
fixed testfpga, fixed pattern reg etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@110 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-19 11:05:37 +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
|
918bcd3836
|
settings fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@107 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-17 10:47:21 +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
|
3265f8b483
|
added the read write reg for debugging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@105 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 17:00:06 +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 |
|