From 1c194bb8c12314c41bf4bac8e58de01adac74cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barth=C3=A9l=C3=A9my=20von=20Haller?= Date: Fri, 8 Mar 2019 11:14:27 +0100 Subject: [PATCH] Remove publication of list of objects (O2-526) (#124) * Remove the special object that contained the list of objects published by the tasks. * one more case to remove --- Framework/include/QualityControl/MonitorObject.h | 4 ---- Framework/include/QualityControl/ObjectsManager.h | 8 -------- Framework/src/MonitorObject.cxx | 2 -- Framework/src/ObjectsManager.cxx | 14 -------------- 4 files changed, 28 deletions(-) diff --git a/Framework/include/QualityControl/MonitorObject.h b/Framework/include/QualityControl/MonitorObject.h index 44ee83fbc8..0fbf4724be 100644 --- a/Framework/include/QualityControl/MonitorObject.h +++ b/Framework/include/QualityControl/MonitorObject.h @@ -119,10 +119,6 @@ class MonitorObject : public TObject void Draw(Option_t* option) override; TObject* DrawClone(Option_t* option) const override; - // Names of special objects published by the framework for each task, behind the scene. - public: - static constexpr char SYSTEM_OBJECT_PUBLICATION_LIST[] = "objectsList"; // list of objects published by the task - private: TObject* mObject; std::map mChecks; diff --git a/Framework/include/QualityControl/ObjectsManager.h b/Framework/include/QualityControl/ObjectsManager.h index 4227dadc21..845cad5ae8 100644 --- a/Framework/include/QualityControl/ObjectsManager.h +++ b/Framework/include/QualityControl/ObjectsManager.h @@ -71,17 +71,9 @@ class ObjectsManager TObjArray* getNonOwningArray() const { return new TObjArray(mMonitorObjects); }; - std::string getObjectsListString() { return mObjectsList.GetString().Data(); } - - private: - void UpdateIndex(const std::string& nonEmptyName); - private: TObjArray mMonitorObjects; std::string mTaskName; - // todo make it a vector of string when support added - TObjString mObjectsList; // the list of objects we publish. (comma separated) - // Possibly needed on the client side to know what was there at a given time. }; } // namespace core diff --git a/Framework/src/MonitorObject.cxx b/Framework/src/MonitorObject.cxx index ce5bfd9ee5..80940f8f97 100644 --- a/Framework/src/MonitorObject.cxx +++ b/Framework/src/MonitorObject.cxx @@ -28,8 +28,6 @@ namespace quality_control namespace core { -constexpr char MonitorObject::SYSTEM_OBJECT_PUBLICATION_LIST[]; - MonitorObject::MonitorObject() : TObject(), mObject(nullptr), mTaskName(""), mIsOwner(true) {} MonitorObject::~MonitorObject() diff --git a/Framework/src/ObjectsManager.cxx b/Framework/src/ObjectsManager.cxx index e9f7e06465..57da51ba7e 100644 --- a/Framework/src/ObjectsManager.cxx +++ b/Framework/src/ObjectsManager.cxx @@ -30,7 +30,6 @@ namespace core ObjectsManager::ObjectsManager(TaskConfig& taskConfig) : mTaskName(taskConfig.taskName) { - startPublishing(&mObjectsList, MonitorObject::SYSTEM_OBJECT_PUBLICATION_LIST); mMonitorObjects.SetOwner(true); } @@ -43,19 +42,6 @@ void ObjectsManager::startPublishing(TObject* object, std::string objectName) auto* newObject = new MonitorObject(object, mTaskName); newObject->setIsOwner(false); mMonitorObjects.Add(newObject); - - // update index - if (objectName != MonitorObject::SYSTEM_OBJECT_PUBLICATION_LIST) { - UpdateIndex(object->GetName()); - } -} - -void ObjectsManager::UpdateIndex(const string& nonEmptyName) -{ - string newString = this->mObjectsList.GetString().Data(); - newString += nonEmptyName; - newString += ","; - this->mObjectsList.SetString(newString.c_str()); } Quality ObjectsManager::getQuality(std::string objectName)