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

107 Commits

Author SHA1 Message Date
l_maliakal_d
8b833b0f7e removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-25 15:32:12 +00:00
l_maliakal_d
f854477aae implemented sending hostname to the receiver for eiger 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@764 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 10:49:35 +00:00
l_maliakal_d
a892a8854c compression extended to client side with r_compression 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@742 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-24 14:58:36 +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
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
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
3ac133db98 updated nchip to be defined in x and y directions 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@543 951219d9-93cf-4727-9268-0efd64621fa3
 2013-05-06 16:45:50 +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
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
1f15f7d5cb every function call in slsdetector also sets error mask if it was online and failed to connect 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@492 951219d9-93cf-4727-9268-0efd64621fa3
 2013-03-14 11:31:10 +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
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
5335e82100 included setroi for multidet 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@466 951219d9-93cf-4727-9268-0efd64621fa3
 2013-02-21 15:55:11 +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
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
6f793abca8 added receiver mac to be compatible with aldos receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-20 11:11:53 +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
f74ea5191d included detector ip and detector mac defaults in client, which can be specified in config file 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@374 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-10 13:58:47 +00:00
l_maliakal_d
9341a2875a now u can use receiver hostname instead of only ip, got rid of acqtest, separated udpip and port from setudpconnection 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@372 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-07 15:51:03 +00:00
l_maliakal_d
ac2c4211e2 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@371 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-06 14:27:52 +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
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
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
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
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
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
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
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
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
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
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
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