detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 17:18:00 +02:00
Code Issues Actions Packages Releases Activity

passing multislsdetector reference to slsdetector constructor

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@293 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-15 10:23:17 +00:00
parent 733f5b1f3e
commit 5d9d26506f
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -109,7 +109,7 @@ int slsDetector::freeSharedMemory() {
slsDetector::slsDetector(int id) :slsDetectorUtils(),
slsDetector::slsDetector(int id,multiSlsDetector *p) :slsDetectorUtils(),
thisDetector(NULL),
detId(id),
shmId(-1),
@ -122,7 +122,8 @@ slsDetector::slsDetector(int id) :slsDetectorUtils(),
dacs(NULL),
adcs(NULL),
chipregs(NULL),
chanregs(NULL)
chanregs(NULL),
parentDet(p)
{
@ -157,7 +158,7 @@ slsDetector::slsDetector(int id) :slsDetectorUtils(),
slsDetector::slsDetector(detectorType type, int id): slsDetectorUtils(),
slsDetector::slsDetector(detectorType type, int id,multiSlsDetector *p): slsDetectorUtils(),
thisDetector(NULL),
detId(id),
shmId(-1),
@ -170,7 +171,8 @@ slsDetector::slsDetector(detectorType type, int id): slsDetectorUtils(),
dacs(NULL),
adcs(NULL),
chipregs(NULL),
chanregs(NULL)
chanregs(NULL),
parentDet(p)
{
while (shmId<0) {
/**Initlializes shared memory \sa initSharedMemory
@ -208,7 +210,7 @@ slsDetector::~slsDetector(){
};
slsDetector::slsDetector(char *name, int id, int cport) : slsDetectorUtils(),
slsDetector::slsDetector(char *name, int id, int cport,multiSlsDetector *p) : slsDetectorUtils(),
thisDetector(NULL),
detId(id),
shmId(-1),
@ -221,7 +223,8 @@ slsDetector::slsDetector(char *name, int id, int cport) : slsDetectorUtils(),
dacs(NULL),
adcs(NULL),
chipregs(NULL),
chanregs(NULL)
chanregs(NULL),
parentDet(p)
{
detectorType type=(detectorType)getDetectorType(name, cport);