bugfix for issue #190

MadAnalysis · Apr 21, 2023 · add397f · add397f
1 parent 9100642
commit add397f
Showing 1 changed file with 114 additions and 108 deletions.
diff --git a/tools/SampleAnalyzer/Commons/DataFormat/WeightCollection.h b/tools/SampleAnalyzer/Commons/DataFormat/WeightCollection.h
@@ -1,31 +1,29 @@
 ////////////////////////////////////////////////////////////////////////////////
-//  
+//
 //  Copyright (C) 2012-2022 Jack Araz, Eric Conte & Benjamin Fuks
 //  The MadAnalysis development team, email: <ma5team@iphc.cnrs.fr>
-//  
+//
 //  This file is part of MadAnalysis 5.
 //  Official website: <https://github.com/MadAnalysis/madanalysis5>
-//  
+//
 //  MadAnalysis 5 is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-//  
+//
 //  MadAnalysis 5 is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 //  GNU General Public License for more details.
-//  
+//
 //  You should have received a copy of the GNU General Public License
 //  along with MadAnalysis 5. If not, see <http://www.gnu.org/licenses/>
-//  
+//
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef WEIGHT_COLLECTION_H
 #define WEIGHT_COLLECTION_H
 
-
 // STL headers
 #include <map>
 #include <iostream>
@@ -38,132 +36,140 @@
 #include "SampleAnalyzer/Commons/Service/LogService.h"
 #include "SampleAnalyzer/Commons/Service/ExceptionService.h"
 
-
 namespace MA5
 {
 
-class WeightCollection
-{
-
-  // -------------------------------------------------------------
-  //                        data members
-  // -------------------------------------------------------------
- private:
-  std::map<MAuint32,MAfloat64> weights_;
-  static const MAfloat64 emptyvalue_;
-
-
-  // -------------------------------------------------------------
-  //                      method members
-  // -------------------------------------------------------------
- public :
-
-  /// Constructor withtout arguments
-  WeightCollection()
-  { }
-
-  /// Destructor
-  ~WeightCollection()
-  { }
-
-  /// Clear all the content
-  void Reset()
-  { weights_.clear(); }
-  void clear() {Reset();}
-
-  /// Size
-  MAuint32 size() const
-  { return weights_.size(); }
-
-  /// Add a new weight group
-  MAbool Add(MAuint32 id, MAfloat64 value)
+  class WeightCollection
   {
-    // Try to add the item
-    std::pair<std::map<MAuint32,MAfloat64>::iterator,bool> ret;
-    ret = weights_.insert(std::pair<MAuint32,MAfloat64>(id,value));
 
-    // Is it added?
-    try
+    // -------------------------------------------------------------
+    //                        data members
+    // -------------------------------------------------------------
+  private:
+    std::map<MAuint32, MAfloat64> weights_;
+    static const MAfloat64 emptyvalue_;
+
+    // -------------------------------------------------------------
+    //                      method members
+    // -------------------------------------------------------------
+  public:
+    /// Constructor withtout arguments
+    WeightCollection()
     {
-      if (!ret.second)
-      {
-        std::stringstream str;
-        str << id;
-        std::string idname;
-        str >> idname;
-        throw EXCEPTION_WARNING("The Weight '"+idname+
-                                "' is defined at two times. Redundant values are skipped.","",0);
-      }
     }
-    catch(const std::exception& e)
+
+    /// Destructor
+    ~WeightCollection()
     {
-      MANAGE_EXCEPTION(e);
-      return false;
     }
 
-    return true;
-  }
-
+    /// Clear all the content
+    void Reset()
+    {
+      weights_.clear();
+    }
+    void clear() { Reset(); }
 
-  /// Get all the Weight Collection
-  const std::map<MAuint32,MAfloat64>& GetWeights() const
-  { return weights_; }
+    /// Size
+    MAuint32 size() const
+    {
+      return weights_.size();
+    }
 
-  /// Get a weight
-  const MAfloat64& Get(MAuint32 id) const
-  {
-    // Try to get the item
-    std::map<MAuint32,MAfloat64>::const_iterator it= weights_.find(id);
-    try
+    /// Add a new weight group
+    MAbool Add(MAuint32 id, MAfloat64 value)
     {
-      if (it!=weights_.end())
+      // Try to add the item
+      std::pair<std::map<MAuint32, MAfloat64>::iterator, bool> ret;
+      ret = weights_.insert(std::pair<MAuint32, MAfloat64>(id, value));
+
+      // Is it added?
+      try
+      {
+        if (!ret.second)
+        {
+          std::stringstream str;
+          str << id;
+          std::string idname;
+          str >> idname;
+          throw EXCEPTION_WARNING("The Weight '" + idname +
+                                      "' is defined at two times. Redundant values are skipped.",
+                                  "", 0);
+        }
+      }
+      catch (const std::exception &e)
       {
-        std::stringstream str;
-        str << id;
-        std::string idname;
-        str >> idname;
-        throw EXCEPTION_ERROR("The Weight '"+idname+
-                              "' is not defined. Return null value.","",0);
+        MANAGE_EXCEPTION(e);
+        return false;
       }
+
+      return true;
     }
-    catch(const std::exception& e)
+
+    /// Get all the Weight Collection
+    const std::map<MAuint32, MAfloat64> &GetWeights() const
     {
-      MANAGE_EXCEPTION(e);
-      return emptyvalue_;
+      return weights_;
     }
 
-    return it->second;
-  }
-
-
-  /// Get a weight
-  const MAfloat64& operator[](MAuint32 id) const
-  { return Get(id); }
-
-
-  /// Add a new weight group
-  void Print() const
-  {
-    if (weights_.empty()) return;
-
-    // Loop over weights for getting max
-    MAuint32 maxi=0;
-    for (std::map<MAuint32,MAfloat64>::const_iterator
-         it=weights_.begin();it!=weights_.end();it++)
+    /// Get a weight
+    const MAfloat64 &Get(MAuint32 id) const
     {
-      if (it->first>maxi) maxi=it->first;
+      // Try to get the item
+      std::map<MAuint32, MAfloat64>::const_iterator it = weights_.find(id);
+      try
+      {
+        if (it == weights_.end())
+        {
+          std::stringstream str;
+          str << id;
+          std::string idname;
+          str >> idname;
+          throw EXCEPTION_ERROR("The Weight '" + idname +
+                                    "' is not defined. Return null value.",
+                                "", 0);
+        }
+      }
+      catch (const std::exception &e)
+      {
+        MANAGE_EXCEPTION(e);
+        return emptyvalue_;
+      }
+
+      return it->second;
     }
 
-    // Loop over weights
-    for (std::map<MAuint32,MAfloat64>::const_iterator
-         it=weights_.begin();it!=weights_.end();it++)
+    /// Get a weight
+    const MAfloat64 &operator[](MAuint32 id) const
     {
-      INFO << "ID=" << it->first << " : " << it->second << endmsg;
+      return Get(id);
     }
-  }
 
+    /// Add a new weight group
+    void Print() const
+    {
+      if (weights_.empty())
+        return;
+
+      // Loop over weights for getting max
+      MAuint32 maxi = 0;
+      for (std::map<MAuint32, MAfloat64>::const_iterator
+               it = weights_.begin();
+           it != weights_.end(); it++)
+      {
+        if (it->first > maxi)
+          maxi = it->first;
+      }
 
-};
+      // Loop over weights
+      for (std::map<MAuint32, MAfloat64>::const_iterator
+               it = weights_.begin();
+           it != weights_.end(); it++)
+      {
+        INFO << "ID=" << it->first << " : " << it->second << endmsg;
+      }
+    }
+  };
 
 }