37 Commits

Author SHA1 Message Date
Erik Frojdh
7d9417dffe fixed debug couts 2019-01-25 16:48:04 +01:00
Erik Frojdh
89ee1d5bcf new socket for slsDetector 2019-01-25 16:44:29 +01:00
Erik Frojdh
b07492be6f removing multiSlsDetectorCommand and using namespace std 2019-01-17 14:45:51 +01:00
Erik Frojdh
76da6a07aa using new CmdLineParser 2019-01-16 18:46:34 +01:00
Erik Frojdh
db0807bf7b adding cmdline parser 2019-01-16 16:50:19 +01:00
Erik Frojdh
683a859d4c cleanup 2019-01-16 14:56:01 +01:00
Erik Frojdh
0f688bb249 unique_ptr in multiSlsDetectorClient 2019-01-16 14:27:08 +01:00
Erik Frojdh
68545f2b26 removed pointer in multiSlsDetectorClient 2019-01-16 10:56:51 +01:00
c24a9b223c combined all the funcs into one, servers need to be recompiled 2018-10-11 13:57:47 +02:00
1c78400369 client compiles, more changes required 2018-10-08 09:34:08 +02:00
1c70f9ec65 mutli.cpp updated half (without masking multi error and no check on detectors boundaries for adding exceptions later. done upto savecalibrationfile 2018-10-03 17:56:04 +02:00
c248b12455 refactored ONLY THE CLIENT first stage, compiles 2018-10-02 15:15:35 +02:00
c784f0f539 client: moved shortenable to roi in reciever, roi not yet written in master file 2018-09-19 17:35:26 +02:00
da4253fe13 Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0 2018-08-10 17:07:29 +02:00
a0512a01d5 Exceptions: zmq socket class descriptors made into its own class for auto destruction upon construction exception, similarly for other try blocks. slsDetector and multislsdetector left to do 2018-08-09 18:12:56 +02:00
ab7e63c20f Moved sls_detector_exceptions to sls_receiver_exceptions & its consequences 2018-08-08 15:43:29 +02:00
c2b1eef75c slsDetectorSoftware: removed warnings, and made compilable via make 2018-07-10 14:58:18 +02:00
73ac8bab38 commenting out printout 2018-06-28 08:58:34 +02:00
3114512c3f sharedmem: sls_detector_acquire multi and sls index scaning, error message when trying to acquire from a differet multi shm id, updateoffset and create threadpool after adding slsdetectors 2018-06-27 17:20:05 +02:00
95254619c6 sharedmem: config, sethostname call freesharedmemory and call setupmulti, freesharedmemoy(nonstatic) also cleans up member variables to make it consistent with shm, sharedmemory pointer set to 0 in non static free shared memory to be able to continue within application, sethostname frees memory only if detectors found in shm, add calls addmultipledetectors, replace replaces a detector in sls detector level, should also take lines in config file that has comments in between while ignoring the comments, sethostname in slsdetector also updates client, adding object in sls when creating new shm complains if shm existed and must delete again, removed remove commands 2018-06-27 15:38:03 +02:00
a0016cb005 sharedmem: working, need to add replace 2018-06-27 10:05:05 +02:00
0b140111b3 sharedmem: more modifications on command line to remove features such as id, remove, add 2018-06-26 12:10:50 +02:00
d7831f6c64 sharedmem: command line refactor, fixing to do 2018-06-25 19:18:00 +02:00
a97b725f43 sharedmem: command line done, fixing to do 2018-06-25 19:14:41 +02:00
Erik Frojdh
212218396a removal of using namespace std from theadFiles 2018-05-24 14:47:45 +02:00
Erik Frojdh
a67d9e60da removing more using namespace std 2018-05-24 13:47:48 +02:00
Dhanya Maliakal
cf787c9e7d minor warnings removed 2015-09-23 17:01:44 +02:00
34a1dac0fe sls_detector_acquire [id-] should finally work 2015-08-31 14:44:40 +02:00
d19b051860 reverting multiSlsDetectorClient to previous version otherwise the index of the detector does not work with default multidetector index. Use sls_detector_get 1-acquire for acquiring with multiple multi-detectors 2015-08-28 12:58:26 +02:00
b073ecacb9 multiple detector on one PC should now work 2015-08-28 12:14:55 +02:00
Dhanya Maliakal
cdd18182a8 resolved client side memory leak caused from gui 2015-03-04 16:24:03 +01: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
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
bergamaschi
7093e92c08 enCalLog and angCalLog added
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@233 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-27 15:29:18 +00:00
ramani_n
67471563b0 void pointers added to callback functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@199 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-22 12:12:29 +00:00
bergamaschi
042b71b403 solved problem reading config files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@191 951219d9-93cf-4727-9268-0efd64621fa3
2012-06-15 12:29:40 +00:00
bergamaschi
0bab16cde7 Detectors types can (should) be configured in the multiSlsDetector structure
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@181 951219d9-93cf-4727-9268-0efd64621fa3
2012-05-22 12:24:15 +00:00