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 |
|
l_maliakal_d
|
89ddfa9b51
|
fixed the problem with multiple frame scan, frame index and file index included in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@344 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-14 13:43:42 +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
|
2338de4054
|
added receiver in here
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 10:06:58 +00:00 |
|
l_maliakal_d
|
007995a5ec
|
changed the default of incrememnt progress to 1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@327 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 10:04:05 +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
|
1f69778a6f
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@319 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:45:22 +00:00 |
|
l_maliakal_d
|
5d50fa8e00
|
frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@318 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-29 13:44:57 +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
|
0c122168f3
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@307 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 10:01:26 +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
|
8637272248
|
file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@305 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 10:00:35 +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 |
|
bergamaschi
|
6fb6f72bc3
|
almost compiling on 64bit...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@297 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-16 14:50:05 +00:00 |
|
l_maliakal_d
|
0c89b0986f
|
status start should not look for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@296 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-16 13:51:28 +00:00 |
|
l_maliakal_d
|
4e3fc179fa
|
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@295 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-16 12:41: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
|
1d47eb16a1
|
few bugs fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@286 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-08 10:34:34 +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
|
980d7ecce0
|
float caused error and included header file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@283 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 12:58:25 +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
|
d6ff3e9227
|
outdir checks if path exists, bug fix receiver: now checks online flag before tryig to set it online for outdir, filename and file index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@279 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-03 08:31:35 +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
|
7e374abc27
|
should not update filename, dir or index when receiver cannot update
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@277 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:38:09 +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 |
|
bergamaschi
|
d77f4a679a
|
slsDetectorUsers reloaded
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@275 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:20:56 +00:00 |
|
l_maliakal_d
|
2a31378b73
|
added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@274 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:18:18 +00:00 |
|
l_maliakal_d
|
a59d47289c
|
added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@273 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:16:29 +00:00 |
|
l_maliakal_d
|
e1b0da53cc
|
added receiver functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@272 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 15:15:34 +00:00 |
|
bergamaschi
|
fe73d4cb92
|
slsDetectorUsers is composed of multiSlsDetector instead of being its base class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@268 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-02 07:23:24 +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
|
32621b1916
|
included command to get detector firmware svn version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@261 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-19 12:09:00 +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 |
|