From e24a4b79a37081ed1988ff8c25e23d896f25ae39 Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Mon, 20 Feb 2012 13:59:31 +0000 Subject: [PATCH] modified configuremac function to have zero arguments git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@127 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 4 ++-- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index fc1640f70..8966e03fb 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -2421,13 +2421,13 @@ const char * multiSlsDetector::getSettingsFile() { } -int multiSlsDetector::configureMAC(int p) { +int multiSlsDetector::configureMAC() { int ret=-100, ret1; for (int idet=0; idetnumberOfDetectors; idet++) { if (detectors[idet]) { - ret1=detectors[idet]->configureMAC(p); + ret1=detectors[idet]->configureMAC(); if (ret==-100) ret=ret1; else if (ret!=ret1) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 45b743e2e..ee97b8f6d 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -891,7 +891,7 @@ class multiSlsDetector : public slsDetectorUtils { string getLastClientIP(); - int configureMAC(int); + int configureMAC();