From de9e83fd61dc0572580782cc7a2cb1af9d02406a Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 16 Mar 2022 12:07:03 +0100 Subject: [PATCH] set slave for m3 virtual --- .../mythen3DetectorServer/slsDetectorFunctionList.c | 9 +++++++-- .../slsDetectorServer/src/slsDetectorServer.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c index a24f16a84..647034186 100644 --- a/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c @@ -720,8 +720,13 @@ void setADIFDefaults() { int checkCommandLineConfiguration() { if (masterCommandLine != -1) { #ifdef VIRTUAL - bus_w(SYSTEM_STATUS_REG, - bus_r(SYSTEM_STATUS_REG) & ~SYSTEM_STATUS_SLV_BRD_DTCT_MSK); + if (masterCommandLine == 1) { + bus_w(SYSTEM_STATUS_REG, + bus_r(SYSTEM_STATUS_REG) & ~SYSTEM_STATUS_SLV_BRD_DTCT_MSK); + } else { + bus_w(SYSTEM_STATUS_REG, + bus_r(SYSTEM_STATUS_REG) | SYSTEM_STATUS_SLV_BRD_DTCT_MSK); + } #else initError = FAIL; strcpy(initErrorMessage, diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c index cf0481e49..2f9e3467b 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer.c @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) { case 'i': #if defined(EIGERD) || defined(GOTTHARDD) || defined(GOTTHARD2D) || \ - defined(JUNGFRAU) + defined(JUNGFRAUD) LOG(logINFO, ("Ignoring config file\n")); ignoreConfigFileFlag = 1; #else