Merge pull request #57 from blinkseb/cat_fix

Ensure that categories and cuts are unique. Fix #56
cp3-llbb · Sep 17, 2015 · cb910ff · cb910ff
2 parents db126a9 + e30c675
commit cb910ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/interface/Category.h b/interface/Category.h
@@ -91,6 +91,10 @@ class CategoryManager {
     public:
         template<class T>
         void new_category(const std::string& name, const std::string& description, const edm::ParameterSet& config) {
+            if (m_categories.count(name) > 0) {
+                throw edm::Exception(edm::errors::InsertFailure, "A category named '" + name + "' already exists.");
+            }
+
             std::unique_ptr<Category> category(new T());
             category->configure(config);
             m_categories.emplace(name, CategoryData(name, description, std::move(category), m_tree));

diff --git a/src/Cut.cc b/src/Cut.cc
@@ -2,6 +2,9 @@
 #include <cp3_llbb/Framework/interface/Category.h>
 
 void CutManager::new_cut(const std::string& name, const std::string& description) {
+    if (m_cuts.count(name) > 0) {
+        throw edm::Exception(edm::errors::InsertFailure, "A cut named '" + name + "' already exists.");
+    }
     m_cuts.emplace(name, Cut(name, description, m_category.tree));
 }