From 64f4188a00b8c3d24cd47556ceccd2937fc17d8b Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 10 Oct 2018 10:16:18 +0200 Subject: [PATCH] removed ms mutex , not used anyway --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp | 2 -- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 818a19cb0..be77805ae 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -49,8 +49,6 @@ multiSlsDetector::multiSlsDetector(int id, bool verify, bool update) pthread_mutex_init(&mp, NULL); mg=mp1; pthread_mutex_init(&mg, NULL); - ms=mp1; - pthread_mutex_init(&ms, NULL); setupMultiDetector(verify, update); diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 4c3e15e38..fb66a14db 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -1712,9 +1712,6 @@ private: /** mutex to synchronizedata processing and plotting threads */ pthread_mutex_t mg; - /** mutex to synchronize slsdetector threads */ - pthread_mutex_t ms; - /** sets when the acquisition is finished */ int jointhread;