[Tut] Solve various problems

tutorials/roofit/roostats/StandardHypoTestInvDemo.py

@@ -33,8 +33,8 @@
 #
 # \author Lorenzo Moneta (C++ version), and P. P. (Python translation)
 
 import ROOT
 import os
 
 
 # structure defining the options
@@ -176,7 +176,7 @@
 
         # RooStats.HypoTestInvTool.SetParameter(name, value):
         # def SetParameter(self, name, value):
-        elif (type(name) is str) and (type(value) is bool):
+        elif (type(name) is str) and (type(value) is int):
 
             #
             # set integer parameters
@@ -220,7 +220,7 @@
 
         # RooStats.HypoTestInvTool.SetParameter(name, value):
         # def SetParameter(self, name, value):
-        elif (type(name) is str) and (type(value) is (float or double)):
+        elif (type(name) is str) and (type(value) is float):
 
             #
             # set string parameters
@@ -268,17 +268,17 @@
         # ROOT.std::cout << "DEBUG : [ " << lowerLimit << " , " << upperLimit << "  ] " << ROOT.std::endl;
 
         if lowerLimit < upperLimit * (1.0 - 1.0e-4) and lowerLimit != 0:
             print(f"The computed lower limit is: ", lowerLimit, " +/- ", llError)
 
         print(f"The computed upper limit is: {upperLimit} +/- ", ulError)
 
         # compute expected limit
         print(f"Expected upper limits, using the B (alternate) model : ")
         print(f" expected limit (median) ", r.GetExpectedUpperLimit(0))
         print(f" expected limit (-1 sig) ", r.GetExpectedUpperLimit(-1))
         print(f" expected limit (+1 sig) ", r.GetExpectedUpperLimit(1))
         print(f" expected limit (-2 sig) ", r.GetExpectedUpperLimit(-2))
         print(f" expected limit (+2 sig) ", r.GetExpectedUpperLimit(2))
 
         # detailed output
         if self.mEnableDetOutput:
@@ -310,11 +310,11 @@
             ulDist = 0
             existULDist = not ROOT.gSystem.AccessPathName(uldistFile)
             if existULDist:
                 fileULDist = TFile.Open(uldistFile)
                 if fileULDist:
                     ulDist = fileULDist.Get("RULDist")
 
             fileOut = TFile(self.mResultFileName, "RECREATE")
             r.Write()
             if ulDist:
                 ulDist.Write()
@@ -524,7 +524,7 @@
         doFit = self.mInitialFit
         if testStatType == 0 and self.mInitialFit == -1:
             doFit = False  # case of LEP test statistic
-        if type == 3 and self.mInitialFit == -1:
+        if Type == 3 and self.mInitialFit == -1:
             doFit = False  # case of Asymptoticcalculator with nominal Asimov
         poihat = 0
 
@@ -765,7 +765,7 @@
             hhc = HybridCalculator(hc)
             assert hhc
 
-            hhc.SetToys(ntoys, ntoys / self.mNToysRatio)  # can use less ntoys for b hypothesis
+            hhc.SetToys(ntoys, int(ntoys / self.mNToysRatio))  # can use less ntoys for b hypothesis
 
             # remove global observables from ModelConfig (this is probably not needed anymore in 5.32)
             bModel.SetGlobalObservables(RooArgSet())
@@ -813,11 +813,11 @@
                 nuisPdf.Print()
 
                 nuisParams = (
-                    ibModel.GetNuisanceParameters()
+                    bModel.GetNuisanceParameters()
                     if (bModel.GetNuisanceParameters())
                     else (sbModel.GetNuisanceParameters())
                 )
-                npnuisPdf.getObservables(nuisParams)
+                np = npnuisPdf.getObservables(nuisParams)
                 if np.getSize() == 0:
                     ROOT.Warning(
                         "StandardHypoTestInvDemo",
@@ -827,21 +827,21 @@
                 hhc.ForcePriorNuisanceAlt(nuisPdf)
                 hhc.ForcePriorNuisanceNull(nuisPdf)
 
-        elif type == 2 or type == 3:
+        elif Type == 2 or Type == 3:
             if testStatType == 3:
                 hc.SetOneSided(True)
             if testStatType != 2 and testStatType != 3:
                 ROOT.Warning(
                     "StandardHypoTestInvDemo",
                     "Only the PL test statistic can be used with AsymptoticCalculator - use by default a two-sided PL",
                 )
-        elif type == 0:
-            hc.SetToys(ntoys, ntoys / self.mNToysRatio)
+        elif Type == 0:
+            hc.SetToys(ntoys, int(ntoys / self.mNToysRatio))
             # store also the fit information for each poi point used by calculator based on toys
             if self.mEnableDetOutput:
                 hc.StoreFitInfo(True)
-        elif type == 1:
-            hc.SetToys(ntoys, ntoys / self.mNToysRatio)
+        elif Type == 1:
+            hc.SetToys(ntoys, int(ntoys / self.mNToysRatio))
             # store also the fit information for each poi point used by calculator based on toys
             # if (self.mEnableDetOutput):
             #    hc.StoreFitInfo(True)