Skip to content

Commit

Permalink
1. Update histo_compare tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@VanyaBelyaev
VanyaBelyaev committed Nov 3, 2023
1 parent 9d30aab commit 9007f32
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 38 deletions.
2 changes: 2 additions & 0 deletions ReleaseNotes/release_notes.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## New features:

1. Update `histo_compare` tests

## Backward incompatible:

## Bug fixes:
Expand Down
15 changes: 9 additions & 6 deletions ostap/histos/compare.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def _h1_cmp_chi2_ ( h1 ,
if h1_ is not h1 : del h1_
if h2_ is not h2 : del h2_
return cmp

chi2 = 0.0
ndf = 0
for i , x , v1 in h1.items() :
Expand Down Expand Up @@ -1301,17 +1301,20 @@ def _h1_cmp_prnt_ ( h1 ,
fmt = '%+11.4g +- %-10.4g'
wid0 = 25

values = [ 'Mean' ,
values = [ 'Integral' ,
'Mean' ,
'Rms' ,
'Skewness' ,
'Kurtosis' ]

numbers = []

mean = h1.mean () , h2.mean ()
rms = h1.rms () , h2.rms ()
skew = h1.skewness () , h2.skewness ()
kurt = h1.kurtosis () , h2.kurtosis ()
area = h1.integrate () , h2.integrate ()
mean = h1.mean () , h2.mean ()
rms = h1.rms () , h2.rms ()
skew = h1.skewness () , h2.skewness ()
kurt = h1.kurtosis () , h2.kurtosis ()
numbers.append ( area )
numbers.append ( mean )
numbers.append ( rms )
numbers.append ( skew )
Expand Down
83 changes: 51 additions & 32 deletions ostap/histos/tests/test_histos_compare.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
__author__ = "Ostap developers"
__all__ = () ## nothing to import
# =============================================================================
from ostap.math.ve import VE
from ostap.core.core import hID
from ostap.histos.histos import h1_axis
from ostap.math.ve import VE
from ostap.core.core import hID
from ostap.histos.histos import h1_axis
from ostap.plotting.canvas import use_canvas
import ostap.histos.compare
from builtins import range
import ostap.histos.graphs
from builtins import range
import ROOT, random
# =============================================================================
# logging
Expand All @@ -44,8 +46,8 @@
bins = [ -5 ]
##
random.seed(10)
for i in range(0, 15 ) : bins.append ( random.uniform ( -5 , 5 ) )
bins += [ 5 ]
for i in range(0, 20 ) : bins.append ( random.uniform ( -5 , 5 ) )
bins = [ -5 ] + bins + [ 5 ]
bins.sort()

h4g = h1_axis ( bins )
Expand All @@ -70,18 +72,25 @@
v = VE(1,1.75**2)

random.seed(10)
for i in range ( 0, 50000 ) :
for i in range ( 0, 10000 ) :

g1 = v.gauss()
g2 = v.gauss()
g1 = -1000
g2 = -1000
g3 = -1000
g4 = -1000

while not -5 < g1 < 5 : g1 = v.gauss()
while not -5 < g2 < 5 : g2 = v.gauss()
g3 = g2 ## the same as g2
g4 = v.gauss()
while not -5 < g4 < 5 : g4 = v.gauss()

h1g.Fill ( g1 )
h2g.Fill ( g2 )
h3g.Fill ( g3 )
h4g.Fill ( g4 )

for i in range ( 0, 20000 ) :

u1 = random.uniform ( -5 , 5 )
u2 = random.uniform ( -5 , 5 )
u3 = u2 #3 the same as u2
Expand All @@ -92,14 +101,17 @@
h3u.Fill ( u3 )
h4u.Fill ( u4 )

e1 = -1 * random.expovariate( -0.5 ) -5
e2 = -1 * random.expovariate( -0.5 ) -5
e3 = e2 ## the same as e2
e4 = -1 * random.expovariate( -0.5 ) -5
if not -5 < e1 < 5 : continue
if not -5 < e2 < 5 : continue
if not -5 < e3 < 5 : continue
if not -5 < e4 < 5 : continue
for i in range ( 0, 50000 ) :

e1 = -1000
e2 = -1000
e3 = -1000
e4 = -1000

while not -5 < e1 < 5 : e1 = -1 * random.expovariate( -0.5 ) -5
while not -5 < e2 < 5 : e2 = -1 * random.expovariate( -0.5 ) -5
e3 = e2 ## the same as e2
while not -5 < e4 < 5 : e4 = -1 * random.expovariate( -0.5 ) -5

h1e.Fill ( e1 )
h2e.Fill ( e2 )
Expand All @@ -112,23 +124,30 @@

## compare two histograms
def compare ( h1 , h2 , title = '' , density = False ) :

## r1 = h1.cmp_fit ( h2 , opts = 'WL0Q' , density = density )
## if r1 : logger.info ( 'h1 vs h2 : fit probability is %.5f%% ' % ( r1.Prob()*100 ) )
## else : logger.warning ( 'h1 vs h2 : fit problems ')

## r2 = h2.cmp_fit ( h1 , opts = 'WL0Q' , density = density )
## if r2 : logger.info ( 'h2 vs h1 : fit probability is %.5f%% ' % ( r2.Prob()*100 ) )
## else : logger.warning ( 'h2 vs h1 : fit problems ')

## ct = h1.cmp_cos ( h2 , density = density )
## logger.info ( 'h1 vs h2 : cos(theta) is %s ' % ct )
## with use_canvas ( 'COMPARE!' , wait = 5 ) :

r1 = h1.cmp_fit ( h2 , opts = '0Q' , density = density )
if r1 : logger.info ( 'h1 vs h2 : fit probability is %.5f%%, scale %s' % ( r1.Prob()*100 , r1[0].toString ('%.3f +/- %.3f' ) ) )
else : logger.warning ( 'h1 vs h2 : fit problems ')

## h1.blue ()
## h2.green ()
## h1.draw('same')
## h2.draw('same')

r2 = h2.cmp_fit ( h1 , opts = '0Q' , density = density )
if r2 : logger.info ( 'h2 vs h1 : fit probability is %.5f%%, scale %s' % ( r2.Prob()*100 , r2[0].toString ( '%.3f +/- %.3f' ) ) )
else : logger.warning ( 'h2 vs h1 : fit problems ')

ct = h1.cmp_cos ( h2 , density = density )
logger.info ( 'h1 vs h2 : cos(theta) is %+.5f ' % ct )

## dd1 = h1.cmp_dist ( h2 , density = density )
## logger.info ( 'h1 vs h2 : distance is %s ' % dd1 )
dd1 = h1.cmp_dist ( h2 , density = density )
logger.info ( 'h1 vs h2 : distance is %+.5f ' % dd1 )

## ## dd2 = h1.cmp_dist2 ( h2 , density = density )
## ## logger.info ( 'h1 vs h2 : distance2 is %s ' % dd2 )
## dd2 = h1.cmp_dist2 ( h2 , density = density )
## logger.info ( 'h1 vs h2 : distance2 is %s ' % dd2 )

logger.info ( "%s\n%s" % ( title , h1.cmp_prnt ( h2 , density = density , title = title , prefix = '# ' ) ) )
logger.info ( "%s\n%s" % ( title , h1.cmp_diff_prnt ( h2 , density = density , title = title , prefix = '# ' ) ) )
Expand Down

0 comments on commit 9007f32

Please sign in to comment.