mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-05 17:40:40 +02:00
slsDetector adapted also too PICASSO
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@17 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
parent
bbb9780647
commit
aeab347db6
@ -31,7 +31,7 @@ int slsDetector::initSharedMemory(detectorType type, int id) {
|
|||||||
case PICASSO:
|
case PICASSO:
|
||||||
nch=128; // complete mythen system
|
nch=128; // complete mythen system
|
||||||
nm=24;
|
nm=24;
|
||||||
nc=10;
|
nc=12;
|
||||||
nd=6; // dacs+adcs
|
nd=6; // dacs+adcs
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -146,6 +146,15 @@ int slsDetector::initializeDetectorSize(detectorType type) {
|
|||||||
thisDetector->nModMax[Y]=1;
|
thisDetector->nModMax[Y]=1;
|
||||||
thisDetector->dynamicRange=24;
|
thisDetector->dynamicRange=24;
|
||||||
break;
|
break;
|
||||||
|
case PICASSO:
|
||||||
|
thisDetector->nChans=128;
|
||||||
|
thisDetector->nChips=12;
|
||||||
|
thisDetector->nDacs=6;
|
||||||
|
thisDetector->nAdcs=0;
|
||||||
|
thisDetector->nModMax[X]=24;
|
||||||
|
thisDetector->nModMax[Y]=1;
|
||||||
|
thisDetector->dynamicRange=24;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
thisDetector->nChans=65536;
|
thisDetector->nChans=65536;
|
||||||
thisDetector->nChips=8;
|
thisDetector->nChips=8;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user