Skip to content

Commit

Permalink
Remove publication of list of objects (O2-526) (#124)
Browse files Browse the repository at this point in the history
* Remove the special object that contained the list of objects published by the tasks.

* one more case to remove
  • Loading branch information
Barthelemy authored and knopers8 committed Mar 8, 2019
1 parent 29f3a89 commit 1c194bb
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 28 deletions.
4 changes: 0 additions & 4 deletions Framework/include/QualityControl/MonitorObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string /*checkName*/, CheckDefinition> mChecks;
Expand Down
8 changes: 0 additions & 8 deletions Framework/include/QualityControl/ObjectsManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions Framework/src/MonitorObject.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
14 changes: 0 additions & 14 deletions Framework/src/ObjectsManager.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ namespace core

ObjectsManager::ObjectsManager(TaskConfig& taskConfig) : mTaskName(taskConfig.taskName)
{
startPublishing(&mObjectsList, MonitorObject::SYSTEM_OBJECT_PUBLICATION_LIST);
mMonitorObjects.SetOwner(true);
}

Expand All @@ -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)
Expand Down

0 comments on commit 1c194bb

Please sign in to comment.