minor tweak for styles

OstapHEP · Aug 10, 2024 · 3c53977 · 3c53977
1 parent 6872621
commit 3c53977
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 12 deletions.
diff --git a/ostap/core/config.py b/ostap/core/config.py
@@ -35,7 +35,6 @@
 import ostap.core.default_config as     default_config 
 from   ostap.utils.basic         import get_env        as ostap_getenv 
 # =============================================================================
-
 ## print for configparger 
 def _cp_str_ ( cp ) :
     """print for configparger"""

diff --git a/ostap/plotting/makestyles.py b/ostap/plotting/makestyles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # =============================================================================
 # @file ostap/plotting/makestyles.py
@@ -291,7 +291,7 @@ def table_style ( style , prefix = '' , title = '' ) :
 #  set_style ( style , config )
 #  style.set ( config ) ##   ditto 
 #  @endcode
-def set_style ( style , config ) :
+def set_style ( style , config , **kwargs ) :
     """Set the style from the configurtaion dictionary
     >>> config = ...
     >>> style  = ...
@@ -301,10 +301,11 @@ def set_style ( style , config ) :
 
     conf = cidict ( transform = cidict_fun )
     conf.update ( config ) 
+    conf.update ( kwargs ) 
 
     changed = {}
 
-    for attr in style_setters [0] :
+    for attr in style_setters  [ 0 ] :
 
         if not attr in conf : continue
 
@@ -571,9 +572,21 @@ def make_styles ( config = None ) :
         name        = n.strip ( )
         description = section.get        ( 'description' , fallback = 'The style %s' % name )
         ok          = section.getboolean ( 'ostaplike'   , fallback =  True )
+        base        = section.get        ( 'basestyle'   , fallback =  ''   )
 
+        base_config = {} 
+        if base :
+            groot = ROOT.ROOT.GetROOT      ()
+            slst  = groot.GetListOfStyles  ()
+            for s in slst :
+                if base == s.GetName() :
+                    base_config = dump_style ( s ) 
+                    break 
+            else :
+                logger.warning ( "makestyles: no base style `%s' is found! " % base )
+
         ## create ostap-like style 
-        if ok : style = make_ostap_style ( name , description , section ) 
+        if ok : style = make_ostap_style ( name , description , section , base = base_conf )
         else  :
             ## generic style
 
@@ -586,7 +599,8 @@ def make_styles ( config = None ) :
             else :
                 logger.info ( 'Create new generic style  %s/%s' % ( name , description ) )             
                 style       = ROOT.TStyle ( name , description )
-
+
+            if base_config : set_style ( style , base_config )
             set_style ( style , section )
 
         if name in StyleStore.styles :
@@ -647,7 +661,8 @@ def get_str    ( config , name , default ) :
 ## make Ostap-like style
 def make_ostap_style ( name                      ,
                        description = 'The Style' ,   
-                       config      = {}          , **kwargs ) :
+                       config      = {}          ,
+                       base        = {}          , **kwargs ) :
 
 
     kw = cidict ( transform = cidict_fun )
@@ -662,9 +677,11 @@ def make_ostap_style ( name                      ,
     description = config.get ( 'description' , description )
 
     conf  = {}
-    conf.update ( config )
-
+    conf.update ( base   )  ## base style configuration
+    conf.update ( config )  ## own configuration 
 
+
+
     conf [ 'AxisColor_X'       ] = get_int   ( config , 'AxisColor_X'         , 1   )
     conf [ 'AxisColor_Y'       ] = get_int   ( config , 'AxisColor_Y'         , 1   )
     conf [ 'AxisColor_Z'       ] = get_int   ( config , 'AxisColor_Z'         , 1   )

diff --git a/ostap/plotting/style.py b/ostap/plotting/style.py
@@ -48,8 +48,9 @@
 ## Create Ostap-style for the plots
 def OstapStyle ( name                           ,
                  description                    ,
-                 line_width  = ostap_line_width , 
-                 font        = ostap_font       ,
+                 base        = ''               , 
+                 line_width  = ostap_line_width ,
+                 font        = ostap_font       ,                 
                  force       = True             ,
                  scale       = 1.0              ,
                  colz        = False            ) :
@@ -63,6 +64,17 @@ def OstapStyle ( name                           ,
     config = {} 
     n2     = name.strip()
 
+    base_conf = {}
+    if base :
+        groot = ROOT.ROOT.GetROOT      ()
+        slst  = groot.GetListOfStyles  ()
+        for s in slst :
+            if base == s.GetName() :
+                base_config = dump_style ( s ) 
+                break
+        else :
+            logger.warning ( "OstapStyle: no base style `%s' is found! " % base )
+
     ## Look for "[Style:Nick]" in configuration 
     for key in CONFIG.config :
         lkey = key.lower() 
@@ -77,7 +89,8 @@ def OstapStyle ( name                           ,
 
     import ostap.plotting.makestyles as MS 
     style = MS.make_ostap_style ( name        = name        ,
-                                  description = description , 
+                                  description = description ,
+                                  base        = base_conf   , 
                                   config      = config      ,
                                   colz        = colz        ,
                                   scale       = scale       ,