data-manipulation-utilities 0.2.8.dev720__tar.gz → 0.2.8.dev725__tar.gz

{data_manipulation_utilities-0.2.8.dev720 → data_manipulation_utilities-0.2.8.dev725}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: data-manipulation-utilities
-Version: 0.2.8.dev720
+Version: 0.2.8.dev725
 Summary: Project storing utilities needed to reduce boilerplate code when analyzing data
 Requires-Python: >=3.10,<3.13
 Classifier: Programming Language :: Python :: 3

{data_manipulation_utilities-0.2.8.dev720 → data_manipulation_utilities-0.2.8.dev725}/pyproject.toml

@@ -1,15 +1,28 @@
 [tool.poetry]
 name           = 'data-manipulation-utilities'
 description    = 'Project storing utilities needed to reduce boilerplate code when analyzing data'
-version        = "0.2.8.dev720"
+version        = "0.2.8.dev725"
 readme         = 'README.md'
 package-mode   = true 
-packages       = [{include='dmu', from='src'}]
-include        = [
-'src/dmu_data/**/*.yaml',
-'src/dmu_data/**/*.toml',
-'src/dmu_data/**/*.json',
-'src/dmu_data/**/*.txt']
+packages       = [
+{include='dmu',      from='src'},
+{include='dmu_data', from='src'}]
+
+[[tool.poetry.include]]
+path = "src/dmu_data/**/*.yaml"
+format = "wheel"
+
+[[tool.poetry.include]]
+path = "src/dmu_data/**/*.toml"
+format = "wheel"
+
+[[tool.poetry.include]]
+path = "src/dmu_data/**/*.json"
+format = "wheel"
+
+[[tool.poetry.include]]
+path = "src/dmu_data/**/*.txt"
+format = "wheel"
 
 [tool.poetry.dependencies]
 python         = '>=3.10, <3.13'

{data_manipulation_utilities-0.2.8.dev720 → data_manipulation_utilities-0.2.8.dev725}/src/dmu/plotting/plotter.py

@@ -5,12 +5,12 @@ Module containing plotter class
 import os
 import json
 import math
-from typing import Union
 
 import numpy
 import matplotlib.pyplot as plt
 
-from ROOT                  import RDataFrame
+from ROOT                  import RDataFrame, RDF
+from omegaconf             import DictConfig
 from dmu.logging.log_store import LogStore
 
 log = LogStore.add_logger('dmu:plotting:Plotter')
@@ -20,16 +20,28 @@ class Plotter:
     Base class of Plotter1D and Plotter2D
     '''
     #-------------------------------------
-    def __init__(self, d_rdf=None, cfg=None):
-        if not isinstance(  cfg, dict):
+    def __init__(
+            self,
+            d_rdf: dict|None            =None,
+            cfg  : dict|DictConfig|None =None):
+        '''
+        Parameters
+        --------------
+        d_rdf: Dictionary where
+            key  : Identifier of dataset
+            value: ROOT dataframe representing dataset
+
+        cfg  : Dictionary or DictConfig instance holding configuration
+        '''
+        if not isinstance(  cfg, (dict,DictConfig)):
             raise ValueError('Config dictionary not passed')
 
         if not isinstance(d_rdf, dict):
             raise ValueError('Dataframe dictionary not passed')
 
         self._d_cfg = cfg
-        self._d_rdf : dict[str, RDataFrame]    = { name : self._preprocess_rdf(rdf) for name, rdf in d_rdf.items()}
-        self._d_wgt : Union[dict[str, Union[numpy.ndarray, None]], None]
+        self._d_rdf : dict[str, RDF.RNode]    = { name : self._preprocess_rdf(rdf) for name, rdf in d_rdf.items()}
+        self._d_wgt : dict[str, numpy.ndarray|None] | None
 
         self._title : str = ''
     #-------------------------------------
@@ -68,9 +80,9 @@ class Plotter:
 
         return minx, maxx
     #-------------------------------------
-    def _preprocess_rdf(self, rdf : RDataFrame) -> RDataFrame:
+    def _preprocess_rdf(self, rdf : RDF.RNode) -> RDF.RNode:
         '''
-        rdf (RDataFrame): ROOT dataframe
+        rdf (RDF.RNode): ROOT dataframe
 
         returns preprocessed dataframe
         '''
@@ -146,7 +158,7 @@ class Plotter:
 
         return rdf
     # --------------------------------------------
-    def _print_weights(self, arr_wgt : Union[numpy.ndarray, None], var : str, sample : str) -> None:
+    def _print_weights(self, arr_wgt : numpy.ndarray|None, var : str, sample : str) -> None:
         if arr_wgt is None:
             log.debug(f'Not using weights for {sample}:{var}')
             return
@@ -171,7 +183,7 @@ class Plotter:
 
         return fig_size
     #-------------------------------------
-    def _get_weights(self, var) -> Union[dict[str, Union[numpy.ndarray, None]], None]:
+    def _get_weights(self, var) -> dict[str, numpy.ndarray|None]| None:
         d_cfg = self._d_cfg['plots'][var]
         if 'weights' not in d_cfg:
             return None
@@ -186,7 +198,7 @@ class Plotter:
 
         return d_weight
     # --------------------------------------------
-    def _read_weights(self, name : str, rdf : RDataFrame) -> numpy.ndarray:
+    def _read_weights(self, name : str, rdf : RDF.RNode) -> numpy.ndarray:
         v_col = rdf.GetColumnNames()
         l_col = [ col.c_str() for col in v_col ]