diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 6b84e770d..dc61cc538 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -1146,6 +1146,9 @@ std::string CmdProxy::DacList(const int action) { throw sls::RuntimeError("This detector already has fixed dac " "names. Cannot change them."); } + if (det_id != -1) { + throw sls::RuntimeError("Cannot configure dacnames at module level"); + } if (args.size() != 18) { WrongNumberOfParameters(18); } diff --git a/slsDetectorSoftware/src/DetectorImpl.h b/slsDetectorSoftware/src/DetectorImpl.h index 92d364556..af1ec71ac 100644 --- a/slsDetectorSoftware/src/DetectorImpl.h +++ b/slsDetectorSoftware/src/DetectorImpl.h @@ -388,7 +388,7 @@ class DetectorImpl : public virtual slsDetectorDefs { const int detectorIndex{0}; sls::SharedMemory shm{0, -1}; - sls::SharedMemory ctb_shm{0, -1, "a"}; + sls::SharedMemory ctb_shm{0, -1, CtbConfig::shm_tag()}; std::vector> modules; /** data streaming (down stream) enabled in client (zmq sckets created) */ diff --git a/slsDetectorSoftware/src/SharedMemory.h b/slsDetectorSoftware/src/SharedMemory.h index 70be4e741..b45f06032 100644 --- a/slsDetectorSoftware/src/SharedMemory.h +++ b/slsDetectorSoftware/src/SharedMemory.h @@ -126,10 +126,8 @@ template class SharedMemory { RemoveSharedMemory(); throw SharedMemoryError(msg); } - // int *pInt = new (buf) int(3); - shared_struct = MapSharedMemory(); - new (shared_struct) T{}; // is this ok? + new (shared_struct) T{}; LOG(logINFO) << "Shared memory created " << name; }