diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h index 145d1e404..7a358e32a 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h @@ -87,15 +87,9 @@ class multiSlsDetectorClient { } // call multi detector command line - slsDetectorCommand myCmd(detPtr); - std::cout << "narg: " << parser.n_arguments()+1 << '\n'; - std::cout << "narg: " << parser.argv().data() << '\n'; - std::cout << "narg: " << parser.detector_id() << '\n'; - - std::cout << "HEY!!!!!!!!!!!!!!!!!!!!!!! 55555\n"; - + slsDetectorCommand myCmd(detPtr); std::string answer = myCmd.executeLine(parser.n_arguments()+1, parser.argv().data(), action_, parser.detector_id()); -std::cout << "HEY!!!!!!!!!!!!!!!!!!!!!!! 9999\n"; + if (parser.multi_id()!=0) std::cout << parser.multi_id() << '-'; if (parser.detector_id() != -1) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp index 1a1b39134..89b9c4021 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp @@ -1947,7 +1947,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { //----------------------------------------------------------- std::string slsDetectorCommand::executeLine(int narg, char *args[], int action, int detPos) { -std::cout << "HEY!!!!!!!!!!!!!!!!!!!!!!! 984651654\n"; + if (action == READOUT_ACTION) return cmdAcquire(narg, args, action, detPos); diff --git a/slsSupportLib/include/logger.h b/slsSupportLib/include/logger.h index 781b3eedc..e1a75ab51 100644 --- a/slsSupportLib/include/logger.h +++ b/slsSupportLib/include/logger.h @@ -17,7 +17,7 @@ #endif #ifndef FILELOG_MAX_LEVEL -#define FILELOG_MAX_LEVEL logDEBUG5 +#define FILELOG_MAX_LEVEL logINFO #endif