Merge lp:~ma5dev/madanalysis5/v1.9_py3 into lp:~ma5dev/madanalysis5/v1.9_beta

[Jack Y. Araz]

matplotlib update: normed -> density

Bug fix for matplotlib. `normed` option is deprecated in the recent versions of matplotlib.

Additional note: this change will break the compatibility with the older versions of matplotlib. There are 3 things we can do 1) check the version and act accordingly 2) use try 3) don't care about older versions and make matplotlib available if it's above certain version.

[lp:~ma5dev/madanalysis5/v1.9_py3]

151. By Jack Y. Araz on 2021-03-29

support both versions of matplotlib

[Jack Y. Araz (jackaraz)]

both versions of matplotlib are supported

[Benjamin Fuks (fuks)]

review: Approve

=== modified file 'madanalysis/layout/merging_plots.py'
--- madanalysis/layout/merging_plots.py	2020-09-29 12:04:57 +0000
+++ madanalysis/layout/merging_plots.py	2021-03-29 12:23:14 +0000
@@ -460,14 +460,26 @@
                 outputPy.write('             label=\'Sum\', ')
             else:
                 outputPy.write('             label=\''+str(ind-1)+'-jet sample\', ')
-            outputPy.write('rwidth=0.8,\\\n'+\
-                '             color='+linecolor+', '+\
-                'edgecolor='+linecolor+', '+\
-                'linewidth=1, '+\
-                'linestyle='+linestyle+',\\\n'+\
-                '             bottom=None, '+\
-                'cumulative=False, normed=False, ' +\
-                'align="mid", orientation="vertical")\n\n')
+            try:
+                import matplotlib.pyplot as plt
+                plt.hist([0],normed=True)
+                outputPy.write('rwidth=0.8,\\\n'+\
+                                '             color='+linecolor+', '+\
+                                'edgecolor='+linecolor+', '+\
+                                'linewidth=1, '+\
+                                'linestyle='+linestyle+',\\\n'+\
+                                '             bottom=None, '+\
+                                'cumulative=False, normed=False, ' +\
+                                'align="mid", orientation="vertical")\n\n')
+            except:
+                outputPy.write('rwidth=0.8,\\\n'+\
+                    '             color='+linecolor+', '+\
+                    'edgecolor='+linecolor+', '+\
+                    'linewidth=1, '+\
+                    'linestyle='+linestyle+',\\\n'+\
+                    '             bottom=None, '+\
+                    'cumulative=False, density=False, ' +\
+                    'align="mid", orientation="vertical")\n\n')
 
         # Setting X axis label
         axis_titleX = "log10(DJR"+str(ind)+")"

=== modified file 'madanalysis/layout/plotflow.py'
--- madanalysis/layout/plotflow.py	2020-09-29 12:04:57 +0000
+++ madanalysis/layout/plotflow.py	2021-03-29 12:23:14 +0000
@@ -802,13 +802,25 @@
                                '             label='+mytitle+', ')
             if ntot!=0:
                 outputPy.write('histtype='+filledmode+', ')
-            outputPy.write(    'rwidth='+str(rWidth)+',\\\n'+\
-                               '             color='+mybackcolor+', '+\
-                               'edgecolor='+mylinecolor+', '+\
-                               'linewidth='+str(mylinewidth)+', '+\
-                               'linestyle='+mylinestyle+',\\\n'+\
-                               '             bottom=None, '+\
-                               'cumulative=False, normed=False, align="mid", orientation="vertical")\n\n')
+            try:
+                import matplotlib.pyplot as plt
+                plt.hist([0],normed=True)
+                outputPy.write(    'rwidth='+str(rWidth)+',\\\n'+\
+                                   '             color='+mybackcolor+', '+\
+                                   'edgecolor='+mylinecolor+', '+\
+                                   'linewidth='+str(mylinewidth)+', '+\
+                                   'linestyle='+mylinestyle+',\\\n'+\
+                                   '             bottom=None, '+\
+                                   'cumulative=False, normed=False, align="mid", orientation="vertical")\n\n')
+            except:
+                outputPy.write(    'rwidth='+str(rWidth)+',\\\n'+\
+                                   '             color='+mybackcolor+', '+\
+                                   'edgecolor='+mylinecolor+', '+\
+                                   'linewidth='+str(mylinewidth)+', '+\
+                                   'linestyle='+mylinestyle+',\\\n'+\
+                                   '             bottom=None, '+\
+                                   'cumulative=False, density=False, align="mid",'+\
+                                   ' orientation="vertical")\n\n')
         outputPy.write('\n')
 
         # Label