110 Commits

Author SHA1 Message Date
bergamaschi
0c3f1d95b9 some debugging of the post processing funcs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@698 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-27 12:00:04 +00:00
bergamaschi
1ed2ba63b5 solved bug on the number of chans of multiSlsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@697 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-21 15:57:57 +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
b5b031a33e changed default output dir to root directory
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@637 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-19 10:09:42 +00:00
l_maliakal_d
8720f960e7 implemented getting ids for eiger. also id ret should be int64_t
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@630 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-10 15:58:43 +00:00
l_maliakal_d
e8e2c7b3e4 fixed moench settings problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@628 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-25 11:30:29 +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
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
df6774e2c6 users:double for time in ns, bugfix:readframe wen no gui, return ok for config
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@564 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-17 09:51:31 +00:00
x04sa
b660c0aebf some debugging at the beamline (fnames)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@549 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-14 10:26:28 +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_maliakal_d
f0e30926fe fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 16:23:13 +00:00
x04sa
88f3fe3b26 more debugging at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@538 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-30 11:25:29 +00:00
x04sa
711cb836c0 post processing debugging at the beamline
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@537 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-29 21:58:29 +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
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
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
l_maliakal_d
8c06405622 reduced gui_client crashes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@498 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-19 16:00:25 +00:00
l_maliakal_d
a7dbfa91ce changed multislsdetector class to check for error mask each time they call a slsdetector fucntion
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@494 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-15 08:11:11 +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
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
3075b8ae11 made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:34:41 +00:00
l_maliakal_d
aae7c68f65 concatenated filenames for the gui when using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@469 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-22 11:26:43 +00:00
l_maliakal_d
1b6571500e included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@465 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:54:27 +00:00
l_maliakal_d
4a4efda69f added calibrate pedestal for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@456 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 10:45:41 +00:00
l_maliakal_d
35de710225 included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@454 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-07 17:34:09 +00:00
l_maliakal_d
9fe499e20c made ports reusable and added cannot connect to these ports in error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@453 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 17:36:03 +00:00
l_maliakal_d
1d03be832f added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@452 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 15:22:45 +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
l_maliakal_d
a4206208c9 implemented a trial error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@434 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 11:16:37 +00:00
l_maliakal_d
4cc8566311 included a current frame index whch is different than file frame index for gotthard, even when readout through blackfin, for mythen both will alwys be incrememnted by one; gotthard server all of them should be consistent for 32 bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@425 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 17:20:57 +00:00
l_maliakal_d
da2fd8369d not much change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@421 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 07:55:02 +00:00
l_maliakal_d
a99222cc02 included enable write to file in receiver, changed the enablewritetofie function in postprocessing to be modified by slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@387 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 08:16:29 +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
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
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
69d08ac546 frame index updated for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@321 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 13:46:22 +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
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
79bc1a010b file name with frame index and detector index
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@301 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:57:52 +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
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
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
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