detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 12:07:44 +01:00
Code Issues Actions Packages Releases Activity

editing configuremac to include adc number

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@298 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-10-16 15:31:46 +00:00
parent 6fb6f72bc3
commit 6cf4fc5e43
10 changed files with 79 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@@ -2705,13 +2705,13 @@ const char * multiSlsDetector::getSettingsFile() {
}
int multiSlsDetector::configureMAC() {
int multiSlsDetector::configureMAC(int adc) {
int ret=-100, ret1;
for (int idet=0; idet<thisMultiDetector->numberOfDetectors; idet++) {
if (detectors[idet]) {
ret1=detectors[idet]->configureMAC();
ret1=detectors[idet]->configureMAC(adc);
if (ret==-100)
ret=ret1;
else if (ret!=ret1)

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@@ -888,8 +888,12 @@ class multiSlsDetector : public slsDetectorUtils {
string getLastClientIP();
int configureMAC();
/**
configures mac for gotthard readout
\param adc adc number
\returns OK or FAIL
*/
int configureMAC(int adc=-1);
int setNumberOfModules(int i=-1, dimension d=X);
int getMaxNumberOfModules(dimension d=X);