From adcf1e2e8cd3b9cc40d97d27d5b55be0cf7f910d Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Thu, 11 Jul 2013 10:28:32 +0000 Subject: [PATCH] looks at dac names in settings file for moench and gotthard git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@633 951219d9-93cf-4727-9268-0efd64621fa3 --- .../slsDetectorAnalysis/energyConversion.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp index a85d8e3e6..eea9bf990 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.cpp @@ -100,6 +100,15 @@ slsDetectorDefs::sls_detector_module* energyConversion::readSettingsFile(string case MYTHEN: break; case MOENCH: + names[id++]="Vdac0"; + names[id++]="Vdac1"; + names[id++]="Vdac2"; + names[id++]="Vdac3"; + names[id++]="Vdac4"; + names[id++]="Vdac5"; + names[id++]="Vdac6"; + names[id++]="Vdac7"; + break; case GOTTHARD: names[id++]="Vref"; names[id++]="VcascN"; @@ -332,6 +341,15 @@ int energyConversion::writeSettingsFile(string fname, detectorType myDetectorTyp names[id++]="outBuffEnable"; break; case MOENCH: + names[id++]="Vdac0"; + names[id++]="Vdac1"; + names[id++]="Vdac2"; + names[id++]="Vdac3"; + names[id++]="Vdac4"; + names[id++]="Vdac5"; + names[id++]="Vdac6"; + names[id++]="Vdac7"; + break; case GOTTHARD: names[id++]="Vref"; names[id++]="VcascN";