detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity
714 Commits 44 Branches 100 Tags
Commit Graph

49 Commits

Author SHA1 Message Date
l_maliakal_d
0df39b24e9 moench should work as well.. without filer 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@714 951219d9-93cf-4727-9268-0efd64621fa3
 2014-01-16 09:46:33 +00:00
l_maliakal_d
172d452bb2 works for moench receiver without compression 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@713 951219d9-93cf-4727-9268-0efd64621fa3
 2014-01-10 16:11:28 +00:00
l_maliakal_d
a485e33e82 changed receiver to work with many writer threads for only receiver without compression 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@707 951219d9-93cf-4727-9268-0efd64621fa3
 2013-12-16 10:07:08 +00:00
l_maliakal_d
64616be52d changes to slsreceiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@703 951219d9-93cf-4727-9268-0efd64621fa3
 2013-12-03 08:54:52 +00:00
l_maliakal_d
adb500c4a0 receiver modified: fifofreed using callback, last fifo freed after all the process, using locks for fifofree, updating currentframenum only in singlephoton if datacompression 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@701 951219d9-93cf-4727-9268-0efd64621fa3
 2013-11-29 11:39:22 +00:00
l_maliakal_d
8e24fc7ef9 changes to receiver works for data compression. needs optimizing 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@699 951219d9-93cf-4727-9268-0efd64621fa3
 2013-11-28 14:31:03 +00:00
l_maliakal_d
68ae219125 receiver complete change.dont check out 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@685 951219d9-93cf-4727-9268-0efd64621fa3
 2013-11-14 12:32:56 +00:00
l_maliakal_d
64ab43cb8c included total packets to display 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@682 951219d9-93cf-4727-9268-0efd64621fa3
 2013-10-04 09:53:22 +00:00
l_maliakal_d
9e08196677 huge change in receiver in previous version, sortingand padding frames before movign into fifo; users small change in previous revision typecasting 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@676 951219d9-93cf-4727-9268-0efd64621fa3
 2013-10-02 14:28:37 +00:00
l_maliakal_d
eba9bcf9ac gotthard server fix: problem for new board due to component version change 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@675 951219d9-93cf-4727-9268-0efd64621fa3
 2013-10-02 14:20:44 +00:00
l_maliakal_d
57d65fd59c semaphores , no usleep in receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@660 951219d9-93cf-4727-9268-0efd64621fa3
 2013-09-04 13:10:14 +00:00
l_maliakal_d
05f54e996c changed the start and stop receiver error messages to be displayed to the client and not jsus recever 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3
 2013-07-30 14:49:53 +00:00
l_maliakal_d
b5fb6be6df updated rxr to use 10 times less memory for moench and plugged possible memory leaks 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@634 951219d9-93cf-4727-9268-0efd64621fa3
 2013-07-12 09:24:55 +00:00
l_maliakal_d
cf30612701 trying to find memory leak, deleted pointers etc 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@629 951219d9-93cf-4727-9268-0efd64621fa3
 2013-07-10 09:31:29 +00:00
l_maliakal_d
d4bedf5ce6 fixed the receiver index turning negative for moench problem 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@594 951219d9-93cf-4727-9268-0efd64621fa3
 2013-06-12 10:10:58 +00:00
l_maliakal_d
666c73c988 edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
 2013-05-27 09:11:26 +00:00
l_maliakal_d
60f7fc9f84 moench receiver with packet index for each frame 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@534 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-26 15:43:09 +00:00
l_maliakal_d
ded2a4de5c moench receiver orders packets to frames 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@533 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-26 15:23:45 +00:00
l_maliakal_d
8c3e7f6160 giving priority to command line than config files for receivers, introducing variable to check moench receiver with gotthard detector 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@532 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-26 12:43:07 +00:00
l_maliakal_d
fd80a8b628 changed the receiver to use mmap and msync instead of fwrite each time, so no botteleneck after some frames as before 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@516 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-18 09:06:43 +00:00
l_maliakal_d
cec069f0e9 moench receiver works well now since we increased the memory allocation 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@513 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-15 13:07:53 +00:00
l_maliakal_d
27c91c36ff moench client and receiver works with gotthard module, without gui 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@511 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-12 12:54:36 +00:00
l_maliakal_d
778cd97317 started the basics for sending every nth frame from receiver to gui.incomplete and will be implemented later 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@506 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-11 12:00:44 +00:00
l_maliakal_d
02376bbc62 reducing changes of segmentation for null string, syntax of receiver call backs 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@505 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-10 13:34:10 +00:00
bergamaschi
1d159e676a makefile updated to include the receiver in the library 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@502 951219d9-93cf-4727-9268-0efd64621fa3
 2013-04-05 08:15:10 +00:00
l_maliakal_d
bb5ae3d2ab guiDataReady introduced so that both tcp and writing thread handshakes properly with their own variables 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@486 951219d9-93cf-4727-9268-0efd64621fa3
 2013-03-07 16:49:47 +00:00
l_maliakal_d
91e5e35c73 got rid of short file name 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@485 951219d9-93cf-4727-9268-0efd64621fa3
 2013-03-07 10:45:33 +00:00
bergamaschi
16c9561fcd Receiver changed passing only data array to fifos - fixed adata size given by bufferSize 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@481 951219d9-93cf-4727-9268-0efd64621fa3
 2013-03-05 16:02:10 +00:00
bergamaschi
b44cc16cff Added startAcquisition, acquisitionFinished and rawDataReady callbacks to receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@480 951219d9-93cf-4727-9268-0efd64621fa3
 2013-03-05 15:34:19 +00:00
l_maliakal_d
6aa90bba79 added default gui server port number 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@479 951219d9-93cf-4727-9268-0efd64621fa3
 2013-03-01 13:14:47 +00:00
l_maliakal_d
1ef4ace390 updated bug-crashing when file write disabled and included file pointer in call back function 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@474 951219d9-93cf-4727-9268-0efd64621fa3
 2013-02-26 16:08:03 +00:00
l_maliakal_d
28d2d64f51 defined a default and register call back function to write receiver data 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@473 951219d9-93cf-4727-9268-0efd64621fa3
 2013-02-26 10:19:05 +00:00
l_maliakal_d
7a55ed9a74 frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
 2013-02-05 11:23:46 +00:00
bergamaschi
247e84ba7b Modifications for circular FIFO and memory leak corrected done during beamtime - to be tested 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@447 951219d9-93cf-4727-9268-0efd64621fa3
 2013-02-04 10:13:48 +00:00
l_maliakal_d
341e026f4e shortframes work with gui enabled 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@445 951219d9-93cf-4727-9268-0efd64621fa3
 2013-01-31 11:13:21 +00:00
l_maliakal_d
22bd638f64 the gotthard receiver works for short frames, gui commented out for now 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
 2013-01-30 16:41:36 +00:00
l_maliakal_d
97442cf91a included enable write option in receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@386 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-17 08:14:38 +00:00
l_maliakal_d
e4d477b53e included settting up of udpport from client and getting receiver mac from receiver and also listening to only one ethernet interface 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@370 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-06 14:22:08 +00:00
l_maliakal_d
3b2a8ea13a max frames per file, getting config filename 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@368 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-05 16:40:51 +00:00
l_maliakal_d
6b935f3bd2 included exitReceiver, using different threads to listen and write packets in receiver, edited circularfifo to use pointer references, and acquire returns frames caught 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@362 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-30 09:28:52 +00:00
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
c02075dc12 included a short filename for receiver for sebastian, which has a frameindex incrementing by 1 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@356 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-22 12:45:42 +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
97ed3e8872 made udp socket in receiver use generic socket, included a incrememnt frame index in acquire before a break, got rid of infinite loop for unmatched index in receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@350 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-19 16:29:17 +00:00
l_maliakal_d
3c94d2cb40 converted to c++ 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@347 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-19 12:41:35 +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
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
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