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
474 Commits 42 Branches 100 Tags
Commit Graph

78 Commits

Author SHA1 Message Date
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
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
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
9f1825b193 uncommented ifdef verbose 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@423 951219d9-93cf-4727-9268-0efd64621fa3
 2013-01-11 09:52:35 +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
3d6530f043 deleted a few unnecessary c files 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@409 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-17 14:12:26 +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
09bfd59e69 checking change 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@381 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-13 10:41:11 +00:00
l_maliakal_d
9c6886d030 included mismatched indices error shouldnt return fail, but client should try to read again 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@375 951219d9-93cf-4727-9268-0efd64621fa3
 2012-12-13 08:33:22 +00:00
l_maliakal_d
e490f437a2 get progress when acquisition is over to show 100 percent 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@363 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-30 09:51:05 +00:00
l_maliakal_d
d8af12456d receiver does the flipping and processing before sending client the correct frame to display 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@361 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-26 15:33:53 +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
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
6ee21ba810 included progresscallback to use in the gui to get the progress for receivers 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@336 951219d9-93cf-4727-9268-0efd64621fa3
 2012-11-08 08:28:51 +00:00
bergamaschi
50beac1f8a defined generic socket class for both TCP and UDP, inherited by MySocketTCP - send receive funcs should still be implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@332 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-31 11:56: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
b29d8d33f0 got rif of unnnecessary couts for receiver part in processing 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@326 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 17:02:42 +00:00
l_maliakal_d
7cd1f9138e frame index updated for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@322 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-29 13:48:56 +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
d115b8bf20 file name with frame index and detector index 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@304 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-18 09:59:28 +00:00
l_maliakal_d
f2be1d5fd9 file name with frame index and detector index 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@303 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-18 09:59:18 +00:00
l_maliakal_d
a05631f2c3 file name with frame index and detector index 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@302 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-18 09:58:54 +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
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
e5a7d834db detectorData now properly instantiated 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@289 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-10 08:50:02 +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
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
bergamaschi
924f583be9 Added f90Interface used at SLS X04SA 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@269 951219d9-93cf-4727-9268-0efd64621fa3
 2012-10-02 08:52:01 +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
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
bergamaschi
d7bafd8072 almost no changes - checking in for alba 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@263 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-20 08:57:44 +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
l_maliakal_d
8ed87df48f edited writesettings for gotthard to not include hv, ipaddress etc and edited loadsettings to allow .settings 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@258 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-18 15:12:08 +00:00
bergamaschi
5f78b4534f angular conversion data ready callback working also with 0 positions, and multislsdetector write data file fixed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@256 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-17 15:31:20 +00:00
l_maliakal_d
4b3fecbaf0 copy call back data verbose 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@255 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-17 15:19:45 +00:00
l_maliakal_d
3f5bda1674 added trimbit mask 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@254 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-13 08:58:45 +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
bergamaschi
c6d383f770 Solved bug on number of measurements 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@250 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-11 09:13:52 +00:00
bergamaschi
25edfba592 added measurement_finished callback 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@249 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-11 08:23:33 +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
bergamaschi
2cfdc2b108 check online is ok 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@244 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-10 13:17:09 +00:00
l_maliakal_d
6902585e24 edited the getRateCorrectionTau for multislsdet to return -1 if different for any of the detectors 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@242 951219d9-93cf-4727-9268-0efd64621fa3
 2012-09-10 08:36:22 +00:00