l_maliakal_d
|
d0d7eac553
|
fixed gui expecting more databytes from receiver, cuz of probes changing databytes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@359 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-23 16:15:26 +00:00 |
|
l_maliakal_d
|
6a74fda3ed
|
modified receiver to save a simpler file name for sebastian, set receiver port modified
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@355 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-22 10:25:42 +00:00 |
|
l_maliakal_d
|
a86141a608
|
changed dataport to receiver port
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@352 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-21 08:27:12 +00:00 |
|
l_maliakal_d
|
ffd392c7eb
|
fixed changing ports inreceiver, included receiver config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@351 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-20 16:50:36 +00:00 |
|
l_maliakal_d
|
af3abff8dd
|
converted receiver to c++, edited generic socket to include differentclients
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@348 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-19 12:44:17 +00:00 |
|
l_maliakal_d
|
e4e46920cd
|
fixed frames from receiver to flip accordingly, also display frame index as not visible from filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-15 11:19:50 +00:00 |
|
bergamaschi
|
e0a1e4ab36
|
warnings fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@343 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-14 11:37:06 +00:00 |
|
l_maliakal_d
|
dc94fc3c97
|
receiver-read frame in right order, cleaned fileio, config file-include extsig and vhighvoltage
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@339 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-13 10:21:22 +00:00 |
|
l_maliakal_d
|
bf7da5f493
|
closeDataFile is only for gotthard and included lock for socket while using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@338 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-13 08:38:18 +00:00 |
|
l_maliakal_d
|
8f7872d056
|
gotthard receiver works so far without cpu file write and tcp generic socket lock
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-12 15:48:28 +00:00 |
|
l_maliakal_d
|
3cc914a8fb
|
moved configuremac to receiverip and change the config file writing to have the correct order
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@334 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-08 08:18:01 +00:00 |
|
bergamaschi
|
96d08d61d0
|
frame index in file name, increments instead of file index for real time acquisitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@330 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 15:52:40 +00:00 |
|
l_maliakal_d
|
439c2b1de8
|
got rid of client telling detector that receiver is down each time it doesnt work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@325 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 17:01:59 +00:00 |
|
l_maliakal_d
|
e94677cbf5
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@320 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:46:04 +00:00 |
|
l_maliakal_d
|
8387f70071
|
doxygen for slsReceiver and slsReceiverInterface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@315 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 09:38:54 +00:00 |
|
l_maliakal_d
|
4dcad48ecb
|
separated slsReceiverInterface from slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@313 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 08:58:26 +00:00 |
|
l_maliakal_d
|
b52f9a8569
|
filepath, filename and index set from slsdet or multislsdet, moving all receiver coding from slsdetectorcommand to slsdetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@312 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-24 11:59:04 +00:00 |
|
l_maliakal_d
|
cf5214bb01
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@306 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 10:01:16 +00:00 |
|
l_maliakal_d
|
6cf4fc5e43
|
editing configuremac to include adc number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@298 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-16 15:31:46 +00:00 |
|
l_maliakal_d
|
aa10120574
|
bugfix:receiverip checked for dots in the exact place, also updated receiver using multislsdetector reference
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@294 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-16 12:41:24 +00:00 |
|
l_maliakal_d
|
5d9d26506f
|
passing multislsdetector reference to slsdetector constructor
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@293 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-15 10:23:17 +00:00 |
|
l_maliakal_d
|
733f5b1f3e
|
made sure that server knows whether to stop sending to receiver even if receiver is down, made sure error in configuremac is shown when doing start receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@292 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-12 10:20:19 +00:00 |
|
l_maliakal_d
|
f6a2d599a0
|
indenting to emacs format and including check and start receiver before doing acquire or status start
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@291 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-11 16:17:07 +00:00 |
|
l_maliakal_d
|
29a540818f
|
configuremac after starting receiver, also telling the server to send packets to receiver or cpu with receiver start and receiver stop
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@290 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-11 12:53:48 +00:00 |
|
bergamaschi
|
b75b09cc7b
|
dataReady called
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@288 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-10 08:12:42 +00:00 |
|
bergamaschi
|
05181fa618
|
postprocessing based on external functions - can work with f90 interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@285 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-08 09:34:14 +00:00 |
|
l_maliakal_d
|
e5c5b76236
|
included lock receiver and update clients for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@284 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 15:12:33 +00:00 |
|
l_maliakal_d
|
8b3c4c21eb
|
update frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@282 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 12:43:17 +00:00 |
|
l_maliakal_d
|
eb58540e2e
|
bug fix: receiver connection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@281 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 09:10:48 +00:00 |
|
l_maliakal_d
|
6f9e265949
|
receiver online flag sets back to offline if it tried to connect and didnt work
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@280 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 08:58:01 +00:00 |
|
l_maliakal_d
|
8fa7e97470
|
receiver works without index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@278 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 08:08:36 +00:00 |
|
l_maliakal_d
|
d5a092c2e8
|
added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@276 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:21:19 +00:00 |
|
l_maliakal_d
|
2e5dc6515f
|
setup receiver first working draft
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@267 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-01 08:25:41 +00:00 |
|
bergamaschi
|
ae9b39fba3
|
now updating max number of modules when reading the number of modules
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@265 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-20 15:28:54 +00:00 |
|
l_maliakal_d
|
7b058c55cf
|
some more changes in savesettings for gotthard and loadsettings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@259 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-18 15:58:16 +00:00 |
|
l_maliakal_d
|
8ed87df48f
|
edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-18 15:12:08 +00:00 |
|
l_maliakal_d
|
3f5bda1674
|
added trimbit mask
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@254 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-13 08:58:45 +00:00 |
|
l_maliakal_d
|
4c8bc09143
|
edited getChanregs to include argument to get trimbits from sharedmemory or detector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@253 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-12 08:50:25 +00:00 |
|
l_maliakal_d
|
3faeca0649
|
added getchanregs function to get the trimbits
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@251 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-11 15:15:32 +00:00 |
|
bergamaschi
|
c6d383f770
|
Solved bug on number of measurements
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@250 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-11 09:13:52 +00:00 |
|
l_maliakal_d
|
5cb68d870e
|
checkOnline works properly now and calls tcpsocket if controlsocket not defined
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@245 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 15:15:43 +00:00 |
|
bergamaschi
|
2cfdc2b108
|
check online is ok
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@244 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 13:17:09 +00:00 |
|
l_maliakal_d
|
ef8455ced6
|
added a new function checkOnline to check individually if det is connected
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@243 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-10 09:31:32 +00:00 |
|
bergamaschi
|
26b4b8a2a7
|
Debugged loadCalibrationFile and loadSettingsFile concerning the extensions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@238 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-04 10:18:16 +00:00 |
|
l_maliakal_d
|
2b59857032
|
added loadCalibrationfile and saving it
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@236 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-03 09:21:25 +00:00 |
|
l_maliakal_d
|
2981ac8700
|
added a change for the dacs from double to dacs_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@224 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-16 08:46:41 +00:00 |
|
l_maliakal_d
|
3e8f1e22e9
|
changed all the dacs and adc types from double to dacs_int to an ifdef defined in sls det defs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@223 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-15 17:12:20 +00:00 |
|
l_maliakal_d
|
3229c849ab
|
vref_ds wasnt included
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@216 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-10 14:01:05 +00:00 |
|
ramani_n
|
1982b25d89
|
File_IO added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@207 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 14:37:37 +00:00 |
|
l_maliakal_d
|
5aebcd4888
|
Changed everywhere from float to double, even mythenDetectorServer and the standalone files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@206 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 12:58:08 +00:00 |
|