diff --git a/hepdata_converter/testsuite/testdata/root/full.root b/hepdata_converter/testsuite/testdata/root/full.root index 3c2c848..f2765e6 100644 Binary files a/hepdata_converter/testsuite/testdata/root/full.root and b/hepdata_converter/testsuite/testdata/root/full.root differ diff --git a/hepdata_converter/testsuite/testdata/yaml_full/data5.yaml b/hepdata_converter/testsuite/testdata/yaml_full/data5.yaml index bd11ef7..eb63fdb 100644 --- a/hepdata_converter/testsuite/testdata/yaml_full/data5.yaml +++ b/hepdata_converter/testsuite/testdata/yaml_full/data5.yaml @@ -1,6 +1,6 @@ --- independent_variables: - - header: {name: 'Leading dilepton DELTA(PHI(LEPTON+, LEPTON\-))', units: GEV} + - header: {name: 'Leading dilepton DELTA(PHI(LEPTON+, LEPTON-))', units: GEV} values: - {low: 0.0, high: 0.5} - {low: 0.5, high: 1.0} diff --git a/hepdata_converter/version.py b/hepdata_converter/version.py index 736d0d2..ffcae31 100644 --- a/hepdata_converter/version.py +++ b/hepdata_converter/version.py @@ -1,3 +1,3 @@ # this file ideally should only contain __version__ declaration, as anything else # may break setup.py and PyPI uploads -__version__ = '0.2.2' +__version__ = '0.2.3' diff --git a/hepdata_converter/writers/array_writer.py b/hepdata_converter/writers/array_writer.py index 26f9302..92803bb 100644 --- a/hepdata_converter/writers/array_writer.py +++ b/hepdata_converter/writers/array_writer.py @@ -186,8 +186,8 @@ def calculate_total_errors(variable, is_number_list, min_errs, max_errs, values, err_breakdown[i_numeric][label]['dn'] = err_minus # want to maintain directionality of errors except TypeError: log.error('TypeError encountered when parsing {0} and {1}'.format( - str(error['asymerror']['minus']).encode('utf8', 'replace'), - str(error['asymerror']['plus']).encode('utf8', 'replace'))) + str(error['asymerror']['minus']).encode('utf8', 'replace').decode(), + str(error['asymerror']['plus']).encode('utf8', 'replace').decode())) elif 'symerror' in error: try: err = error_value_processor(entry['value'], error['symerror']) @@ -197,7 +197,7 @@ def calculate_total_errors(variable, is_number_list, min_errs, max_errs, values, err_breakdown[i_numeric][label]['dn'] = -err except TypeError: log.error('TypeError encountered when parsing {0}'.format( - str(error['symerror']).encode('utf8', 'replace')) + str(error['symerror']).encode('utf8', 'replace').decode()) ) min_errs.append(sqrt(errors_min)) diff --git a/hepdata_converter/writers/root_writer.py b/hepdata_converter/writers/root_writer.py index c4c2fc4..6f2908b 100644 --- a/hepdata_converter/writers/root_writer.py +++ b/hepdata_converter/writers/root_writer.py @@ -86,7 +86,7 @@ def _create_empty_hist(self, dependent_var_title, index, yval): name = self.independent_variables[i]['header']['name'] if 'units' in self.independent_variables[i]['header']: name += ' [%s]' % self.independent_variables[i]['header']['units'] - name = str(name.encode('ascii', 'replace')) + name = name.encode('ascii', 'replace').decode() getattr(hist, self._hist_axes_getters[i])().SetTitle(name) if 'labels' in self.independent_variables[i]: for ibin, label in enumerate(self.independent_variables[i]['labels']): @@ -136,7 +136,7 @@ def _create_hist(self, xval): name = self.independent_variables[i]['header']['name'] if 'units' in self.independent_variables[i]['header']: name += ' [%s]' % self.independent_variables[i]['header']['units'] - name = str(name.encode('ascii', 'replace')) + name = name.encode('ascii', 'replace').decode() getattr(hist, self._hist_axes_getters[i])().SetTitle(name) if 'labels' in self.independent_variables[i]: # set alphanumeric bin labels for ibin, label in enumerate(self.independent_variables[i]['labels']): @@ -146,7 +146,7 @@ def _create_hist(self, xval): name = self.dependent_variable['header']['name'] if 'units' in self.dependent_variable['header']: name += ' [%s]' % self.dependent_variable['header']['units'] - name = str(name.encode('ascii', 'replace')) + name = name.encode('ascii', 'replace').decode() getattr(hist, self._hist_axes_getters[self.dim])().SetTitle(name) for i in range(len(self.xval[0])): @@ -305,15 +305,15 @@ def create_objects(self): xname = self.independent_variables[0]['header']['name'] if 'units' in self.independent_variables[0]['header']: xname += ' [%s]' % self.independent_variables[0]['header']['units'] - xname = str(xname.encode('ascii', 'replace')) + xname = xname.encode('ascii', 'replace').decode() yname = self.independent_variables[1]['header']['name'] if 'units' in self.independent_variables[1]['header']: yname += ' [%s]' % self.independent_variables[1]['header']['units'] - yname = str(yname.encode('ascii', 'replace')) + yname = yname.encode('ascii', 'replace').decode() zname = self.dependent_variable['header']['name'] if 'units' in self.dependent_variable['header']: zname += ' [%s]' % self.dependent_variable['header']['units'] - zname = str(zname.encode('ascii', 'replace')) + zname = zname.encode('ascii', 'replace').decode() graph.GetXaxis().SetTitle(xname) graph.GetYaxis().SetTitle(yname) @@ -353,11 +353,11 @@ def create_objects(self): xname = self.independent_variables[0]['header']['name'] if 'units' in self.independent_variables[0]['header']: xname += ' [%s]' % self.independent_variables[0]['header']['units'] - xname = str(xname.encode('ascii', 'replace')) + xname = xname.encode('ascii', 'replace').decode() yname = self.dependent_variable['header']['name'] if 'units' in self.dependent_variable['header']: yname += ' [%s]' % self.dependent_variable['header']['units'] - yname = str(yname.encode('ascii', 'replace')) + yname = yname.encode('ascii', 'replace').decode() graph.GetXaxis().SetTitle(xname) graph.GetYaxis().SetTitle(yname)