Merge pull request BristolTopGroup#284 from kreczko/more-stuff

More stuff

Author: kreczko

src/cross_section_measurement/01_get_fit_results.py

@@ -579,7 +579,9 @@ def write_fit_results( channel, category, fit_results ):
                       )
         write_fit_results_and_initial_values( 'electron', category, fit_results_electron, initial_values_electron, templates_electron )
         write_fit_results_and_initial_values( 'muon', category, fit_results_muon, initial_values_muon, templates_muon )
-        # write_fit_results( 'combined', category, combine_complex_results( fit_results_electron, fit_results_muon ) )
+        fit_results_combined = combine_complex_results( fit_results_electron, fit_results_muon )
+        initial_values_combined = combine_complex_results( initial_values_electron, initial_values_muon)
+        write_fit_results_and_initial_values( 'combined', category, fit_results_combined, initial_values_combined)
         last_systematic = category
 
         # TTJet_file.Close()

src/cross_section_measurement/01_get_ttjet_normalisation.py

@@ -29,6 +29,7 @@
 import glob
 import tools.measurement
 from copy import deepcopy
+from tools.Calculation import combine_complex_results
 
 # define logger for this module
 mylog = log["01b_get_ttjet_normalisation"]
@@ -196,6 +197,21 @@ def method_string(self):
 
         return 'unknown_method'
 
+    @mylog.trace()
+    def combine(self, other):
+        if not self.have_normalisation or not other.have_normalisation:
+            mylog.warn(
+                'One of the TTJetNormalisations does not have a normalisation, aborting.')
+            return
+
+        self.normalisation = combine_complex_results(
+            self.normalisation, other.normalisation)
+        self.initial_normalisation = combine_complex_results(
+            self.initial_normalisation, other.initial_normalisation)
+        self.templates = combine_complex_results(
+            self.templates, other.templates)
+        self.channel = 'combined'
+
 
 def parse_options():
     parser = OptionParser(__doc__)
@@ -244,6 +260,7 @@ def main():
     phase_space = 'FullPS'
     if options.visiblePS:
         phase_space = 'VisiblePS'
+    results = {}
     for channel in ['electron', 'muon']:
         inputs = {
             'energy': options.CoM,
@@ -264,6 +281,16 @@ def main():
             )
             norm.calculate_normalisation()
             norm.save(output_path)
+            r_name = f.replace(channel, '')
+            if not results.has_key(r_name):
+                results[r_name] = [norm]
+            else:
+                results[r_name].append(norm)
+    for f, r_list in results.items():
+        assert(len(r_list) == 2)
+        n1, n2 = r_list
+        n1.combine(n2)
+        n1.save(output_path)
 
 
 def get_category_from_file(json_file):

src/cross_section_measurement/02_unfold_and_measure.py

@@ -130,7 +130,7 @@ def get_unfolded_normalisation( TTJet_fit_results, category, channel, tau_value,
                                                                               visiblePS = visiblePS,
                                                                               )
 
-    # central_results = hist_to_value_error_tuplelist( h_truth )
+#     central_results = hist_to_value_error_tuplelist( h_truth )
     TTJet_fit_results_unfolded = unfold_results( TTJet_fit_results,
                                                 category,
                                                 channel,
@@ -463,6 +463,7 @@ def calculate_normalised_xsections( normalisation, category, channel, normalise_
 
     tau_value_electron = measurement_config.tau_values_electron[variable]
     tau_value_muon = measurement_config.tau_values_muon[variable]
+    tau_value_combined = measurement_config.tau_values_combined[variable]
 
     visiblePS = options.visiblePS
     phase_space = 'FullPS'
@@ -530,7 +531,6 @@ def calculate_normalised_xsections( normalisation, category, channel, normalise_
         # read fit results from JSON
         electron_file = path_to_JSON + '/' + category + '/normalisation_electron_' + met_type + '.txt'
         muon_file = path_to_JSON + '/' + category + '/normalisation_muon_' + met_type + '.txt'
-    #     combined_file = path_to_JSON + '/fit_results/' + category + '/fit_results_combined_' + met_type + '.txt'
 
         # don't change fit input for ttbar generator/theory systematics and PDF weights
         if category in ttbar_generator_systematics or category in pdf_uncertainties:
@@ -569,10 +569,10 @@ def calculate_normalised_xsections( normalisation, category, channel, normalise_
         else:
             fit_results_electron = read_data_from_JSON( electron_file )
             fit_results_muon = read_data_from_JSON( muon_file )
-        # fit_results_combined = read_data_from_JSON( combined_file )
+        fit_results_combined = combine_complex_results(fit_results_electron, fit_results_muon)
         TTJet_fit_results_electron = fit_results_electron['TTJet']
         TTJet_fit_results_muon = fit_results_muon['TTJet']
-        # TTJet_fit_results_combined = fit_results_combined['TTJet']
+        TTJet_fit_results_combined = fit_results_combined['TTJet']
 
     #     # change back to original MET type for the unfolding
         met_type = translate_options[options.metType]
@@ -602,10 +602,14 @@ def calculate_normalised_xsections( normalisation, category, channel, normalise_
         calculate_normalised_xsections( unfolded_normalisation_muon, category, 'muon' )
         calculate_normalised_xsections( unfolded_normalisation_muon, category, 'muon' , True )
 
-        # # if combine_before_unfolding:
-        # #     unfolded_normalisation_combined = get_unfolded_normalisation( TTJet_fit_results_combined, category, 'combined', k_value_combined )
-        # # else:
-        unfolded_normalisation_combined = combine_complex_results( unfolded_normalisation_electron, unfolded_normalisation_muon )
+        if combine_before_unfolding:
+            unfolded_normalisation_combined = get_unfolded_normalisation(
+                    TTJet_fit_results_combined,
+                    category,'combined', tau_value=tau_value_combined,
+                    visiblePS=visiblePS,
+            )
+        else:
+            unfolded_normalisation_combined = combine_complex_results( unfolded_normalisation_electron, unfolded_normalisation_muon )
 
         filename = path_to_JSON + '/xsection_measurement_results/combined/%s/normalisation_%s.txt' % ( category, met_type )
         write_data_to_JSON( unfolded_normalisation_combined, filename )

tools/Calculation.py

@@ -96,9 +96,10 @@ def combine_complex_results(result1, result2):
     for sample in samples:
         results = []
         for entry1, entry2 in zip(result1[sample], result2[sample]):
-            value1, error1 = entry1
-            value2, error2 = entry2
-            results.append( ( value1 + value2, sqrt( error1**2 + error2**2 ) ) )
+            v1 = ufloat(entry1[0], entry1[1])
+            v2 = ufloat(entry2[0], entry2[1])
+            s = v1 + v2
+            results.append( ( s.nominal_value, s.std_dev ) )
         combined_result[sample] = results
     return combined_result