Hreco -> error_treatment and changed default 2 -> 3 (toy MC)

Author: kreczko

config/RooUnfold_template.py

@@ -15,7 +15,11 @@
 SVD_k_value = 5
 SVD_tau_value = -1
 SVD_n_toy = 1000
-Hreco = 2
+# 0 = no error treatment: returns sqrt(N)
+# 1 = bin-by-bin errors (diagonal covariance matrix)
+# 2 = covariance matrix from unfolding
+# 3 = covariance matrix from toy MC
+Hreco = 3
 Bayes_n_repeat = 4
 
 unfolded_markerStyle = 20

src/cross_section_measurement/02_unfold_and_measure.py

@@ -28,9 +28,9 @@ def unfold_results( results, category, channel, tau_value, h_truth, h_measured,
 
     # turning off the unfolding errors for systematic samples
     if not category == 'central':
-        unfoldCfg.Hreco = 0
+        unfoldCfg.error_treatment = 0
     else:
-        unfoldCfg.Hreco = options.Hreco
+        unfoldCfg.error_treatment = options.error_treatment
 
     h_unfolded_data = unfolding.unfold( h_data )
     del unfolding
@@ -379,9 +379,9 @@ def calculate_normalised_xsections( normalisation, category, channel, normalise_
                       help = "Load fakes histogram and perform manual fake subtraction in TSVDUnfold" )
     parser.add_option( "-u", "--unfolding_method", dest = "unfolding_method", default = 'RooUnfoldSvd',
                       help = "Unfolding method: RooUnfoldSvd (default), TSVDUnfold, RooUnfoldTUnfold, RooUnfoldInvert, RooUnfoldBinByBin, RooUnfoldBayes" )
-    parser.add_option( "-H", "--hreco", type = 'int',
-                      dest = "Hreco", default = 2,
-                      help = "Hreco parameter for error treatment in RooUnfold" )
+    parser.add_option( "-e", "--error_treatment", type = 'int',
+                      dest = "error_treatment", default = unfoldCfg.error_treatment,
+                      help = "parameter for error treatment in RooUnfold" )
     parser.add_option( "-c", "--centre-of-mass-energy", dest = "CoM", default = 13,
                       help = "set the centre of mass energy for analysis. Default = 13 [TeV]", type = int )
     parser.add_option( "-C", "--combine-before-unfolding", dest = "combine_before_unfolding", action = "store_true",
@@ -471,7 +471,7 @@ def calculate_normalised_xsections( normalisation, category, channel, normalise_
         phase_space = "VisiblePS"
 
     load_fakes = options.load_fakes
-    unfoldCfg.Hreco = options.Hreco
+    unfoldCfg.error_treatment = options.error_treatment
     method = options.unfolding_method
     combine_before_unfolding = options.combine_before_unfolding
     met_type = translate_options[options.metType]

src/unfolding_tests/k_value_determination.py

@@ -48,7 +48,7 @@ def get_k_from_d_i( h_truth, h_measured, h_response, h_fakes = None, h_data = No
                            h_fakes,
                            method = method,
                            k_value = k_start,
-                           Hreco = 0,
+                           error_treatment = 0,
                            verbose = 1 )
     unfolding.unfold( h_data )
     hist_d_i = None

src/unfolding_tests/k_value_optimisation_plots.py

@@ -17,7 +17,7 @@
 from tools.ROOT_utils import set_root_defaults
 
 from tools.file_utilities import make_folder_if_not_exists
-from tools.hist_utilities import value_error_tuplelist_to_hist, get_fit_results_histogram
+from tools.hist_utilities import get_fit_results_histogram
 from tools.plotting import make_plot, Histogram_properties
 from tools.Unfolding import Unfolding, get_unfold_histogram_tuple
 from config.variable_binning import bin_edges
@@ -37,7 +37,7 @@ def draw_regularisation_histograms( h_truth, h_measured, h_response, h_fakes = N
                            h_fakes,
                            method = method,
                            k_value = k_max,
-                           Hreco = 2,
+                           error_treatment = 4,
                            verbose = 1 )
 
     RMSerror, MeanResiduals, RMSresiduals, Chi2 = unfolding.test_regularisation ( h_data, k_max )

tools/Unfolding.py

@@ -27,7 +27,7 @@ def __init__( self,
                  k_value = unfoldCfg.SVD_k_value,
                  n_toy = unfoldCfg.SVD_n_toy,
                  Bayes_n_repeat = unfoldCfg.Bayes_n_repeat,
-                 Hreco = unfoldCfg.Hreco,
+                 error_treatment = unfoldCfg.error_treatment,
                  measured_truth_without_fakes = None,
                  verbose = 0 ):
         if not method in unfoldCfg.availablemethods:
@@ -46,7 +46,7 @@ def __init__( self,
         self.k_value = int(k_value)
         self.n_toy = n_toy
         self.Bayes_n_repeat = Bayes_n_repeat
-        self.Hreco = Hreco
+        self.error_treatment = error_treatment
         self.measured_truth_without_fakes = measured_truth_without_fakes
 
     def setup_unfolding ( self, data ):
@@ -100,7 +100,7 @@ def setup_unfolding ( self, data ):
     def test_regularisation ( self, data, k_max ):
         self.setup_unfolding( data )
         if self.method == 'RooUnfoldSvd':
-            findingK = RooUnfoldParms( self.unfoldObject, self.Hreco, self.truth )
+            findingK = RooUnfoldParms( self.unfoldObject, self.error_treatment, self.truth )
             findingK.SetMinParm( 1 )
             findingK.SetMaxParm( k_max )
             findingK.SetStepSizeParm( 1 )
@@ -124,7 +124,7 @@ def unfold( self, data ):
         else:
             # remove unfold reports (faster)
             self.unfoldObject.SetVerbose( self.verbose )
-            self.unfolded_data = asrootpy( self.unfoldObject.Hreco( self.Hreco ) )
+            self.unfolded_data = asrootpy( self.unfoldObject.Hreco( self.error_treatment ) )
         return self.unfolded_data
 
     def closureTest( self ):