Merge pull request #9 from MadAnalysis/bugfix_reader

Error during cut initialisation
MadAnalysis · Oct 12, 2022 · 49726c7 · 49726c7
2 parents d07925c + 8cc0500
commit 49726c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/docs/releases/changelog-dev.md → docs/releases/changelog-v3.0.md b/docs/releases/changelog-dev.md → docs/releases/changelog-v3.0.md
@@ -1,4 +1,4 @@
-# Release 3.0.0-dev (development release)
+# Release 3.0
 
 ## New features since last release
   * Complete interface with PAD in order to run exclusion limits externally
@@ -18,6 +18,9 @@
  * Make exceptions accessible through `ma5.system` module
     ([#7](https://github.com/MadAnalysis/ma5_expert/pull/7)).
 
+ * Signal region initialisation fixes in cutflow collection.
+   ([#9](https://github.com/MadAnalysis/ma5_expert/pull/9))
+
 ## Contributors
 
 This release contains contributions from (in alphabetical order):

diff --git a/setup.py b/setup.py
@@ -12,15 +12,15 @@
 
 setup(
     name="ma5_expert",
-    version="3.0.2",
+    version="3.0.3",
     description=("MadAnalysis 5 interpreter for Expert mode"),
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/MadAnalysis/ma5_expert",
     project_urls={
         "Bug Tracker": "https://github.com/MadAnalysis/ma5_expert/issues",
     },
-    download_url="https://github.com/MadAnalysis/ma5_expert/archive/refs/tags/v3.0.2.tar.gz",
+    download_url="https://github.com/MadAnalysis/ma5_expert/archive/refs/tags/v3.0.3.tar.gz",
     author="Jack Y. Araz",
     author_email=("[email protected]"),
     license="MIT",

diff --git a/src/ma5_expert/cutflow/reader.py b/src/ma5_expert/cutflow/reader.py
@@ -116,7 +116,7 @@ def _readCollection(
                 self._srID.append(currentSR.id)
             except Exception as err:
                 log.error(err)
-                currentSR.id = f"SR_{len(self.srID)}"
+                currentSR.id = f"SR_{len(self._srID)}"
                 setattr(self, currentSR.id, currentSR)
                 self._srID.append(currentSR.id)
 
@@ -156,15 +156,15 @@ def addSignalRegion(
             if ix == 0:
                 current_cut = Cut(
                     name=name,
-                    Nevents=val,
+                    _Nevents = val,
                     Nentries=entries,
                 )
             else:
                 current_cut = Cut(
                     name=name,
-                    previous_cut=SR[-1],
-                    initial_cut=SR[0],
-                    Nevents=val,
+                    _previous_cut=SR[-1],
+                    _initial_cut=SR[0],
+                    _Nevents=val,
                     Nentries=entries,
                 )
             SR.addCut(current_cut)
@@ -174,7 +174,7 @@ def addSignalRegion(
             self._srID.append(SR.id)
         except Exception as err:
             log.error(err)
-            SR.id = f"SR_{len(self.srID)}"
+            SR.id = f"SR_{len(self._srID)}"
             setattr(self, SR.id, SR)
             self._srID.append(SR.id)