Commit Graph

104 Commits

Author SHA1 Message Date
l_maliakal_d d8a1e20d80 minor changes needed for receiver nthr frame
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@568 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 14:50:50 +00:00
l_maliakal_d 0e73372cf8 receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 13:43:25 +00:00
l_maliakal_d 19179e1eb7 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@565 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 10:20:40 +00:00
l_maliakal_d 9693169bcd changed the receiver back to using fwrite instead of mmap
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@561 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 14:17:51 +00:00
l_maliakal_d 5b30a98b47 update svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@557 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-16 07:37:26 +00:00
l_maliakal_d d4a4786670 updated version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@555 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 15:08:53 +00:00
l_maliakal_d bccffa5c3d if file write not enabled, writing out packet loss and file name removed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@554 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 15:08:21 +00:00
l_maliakal_d 91661c3e5f updated svn without the callback defaults
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@551 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 13:27:54 +00:00
l_maliakal_d c8535a15a8 updated svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@550 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-15 13:26:48 +00:00
l_maliakal_d 21b511fe29 fileenablewrite shoudlnt decide if the datareadycallback is called
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@548 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-13 13:46:36 +00:00
l_maliakal_d 1eae11a87a fixed the undefined state of gui when acquisition stopped
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@545 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-07 14:20:01 +00:00
l_msdetect 1ed4017988 moench great stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@541 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 14:17:09 +00:00
l_msdetect 9c2c76237f moench gui stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@540 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 13:46:28 +00:00
l_msdetect ebba783dac moench gui stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@539 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 13:08:24 +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 6ca969e08f basic moench receiver runs with gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@521 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-25 09:36:00 +00:00
l_maliakal_d 82ce92e990 edited moench receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@520 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-19 14:42:33 +00:00
l_maliakal_d 5ab6d9076d the memcpy wasnt incremementing in receiver.
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@519 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-18 13:38:21 +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 ca15ff971d added nchans for each dimension and edited update offsets to work better for 2d dets
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@514 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-16 13:39:58 +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 c9cef8c12f moench receiver works most of the time
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@512 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-12 15:51:33 +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 c5b3f10669 changed gotthard server type to be defined in makefile and not in mcb
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@508 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:32:26 +00:00
l_maliakal_d e4c61a230a added moenchdetector server skeleton, copy of gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@507 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:23:13 +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 5e4c2f30b4 static compilation now works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@503 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-05 10:54:56 +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
bergamaschi 34a2f92cb4 slsReceiver now uses the slsReceiverUsers class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@501 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-04 09:46:16 +00:00
bergamaschi 4a133d8f6e Receiver API slsReceiverUsers implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@500 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-04 09:32:44 +00:00
l_maliakal_d 19ad1ae06e file permissions problem crash in rxr fixed, increased usleep in postprocessing getting rxr data which gives better gui display, allowed for mythen and gotthard sending module compatibility for 64 bit temp solution
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@496 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 14:37:14 +00:00
l_maliakal_d 922bc929c8 fixed connect receiver problem from previous version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@495 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 11:02:57 +00:00
l_maliakal_d 1882454cf3 udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-13 15:34:53 +00:00
l_maliakal_d d205e79106 implemented SCHED_RR scheduling with priority in receiver-only if super user
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@490 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-08 15:27:25 +00:00
l_maliakal_d c65026792c made sure read frame from receiver doesnt send a null for current filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@487 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-07 17:02:53 +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
l_maliakal_d 96d9e5d078 some revision variable problem resolved in slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@484 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 15:26:29 +00:00
bergamaschi 217f63b701 Small change in the receiver concerning the data to the GUI
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@483 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 10:00:40 +00:00
l_maliakal_d bf429705bf svn rev changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@482 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-06 09:18:16 +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
maliakal_d e3d68d05c6 added latest changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@478 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-01 10:36:20 +00:00
l_maliakal_d 9d8b621adf got rid of eth taking weird values error and also checks for fifo empty before you stop writing data
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@477 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-27 10:13:22 +00:00
maliakal_d bb07b6db7d UHRIX Callback function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@476 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 16:31:55 +00:00
maliakal_d 3c26cac591 UHRIX Callback added to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@475 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 16:25:37 +00:00