From aeab347db6fc0500cd77fc5629cd579264fed3e8 Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Mon, 26 Apr 2010 08:30:56 +0000 Subject: [PATCH] slsDetector adapted also too PICASSO git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@17 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/slsDetector/slsDetector.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index a0c087337..4e13d8b11 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -31,7 +31,7 @@ int slsDetector::initSharedMemory(detectorType type, int id) { case PICASSO: nch=128; // complete mythen system nm=24; - nc=10; + nc=12; nd=6; // dacs+adcs break; default: @@ -146,6 +146,15 @@ int slsDetector::initializeDetectorSize(detectorType type) { thisDetector->nModMax[Y]=1; thisDetector->dynamicRange=24; 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: thisDetector->nChans=65536; thisDetector->nChips=8;