diff --git a/finalcif/report/tables.py b/finalcif/report/tables.py index 85e3c643..22ca1772 100644 --- a/finalcif/report/tables.py +++ b/finalcif/report/tables.py @@ -335,7 +335,7 @@ def populate_main_table_values(main_table: Table, cif: CifContainer, column=1, r row += 1 add_table_value(cif, main_table, '_exptl_crystal_F_000', row, column) try: - completeness = f"{round(float(cif['_diffrn_measured_fraction_theta_full']) * 100, 1):.1f} %" + completeness = f"{round(float(cif['_diffrn_measured_fraction_theta_max']) * 100, 1):.1f} %" except ValueError: completeness = '?' row += 1 @@ -486,9 +486,9 @@ def _goof(main_table: Table) -> None: def _completeness(cif, main_table: Table) -> None: p = paragraph(main_table) - theta_full = cif['_diffrn_reflns_theta_full'] - if theta_full: - p.add_run(f'Completeness to \n{theta_symbol} = {theta_full}{degree_sign}') + theta_max = cif['_diffrn_reflns_theta_max'] + if theta_max: + p.add_run(f'Completeness to \n{theta_symbol} = {theta_max}{degree_sign}') else: p.add_run('Completeness') diff --git a/finalcif/report/templated_report.py b/finalcif/report/templated_report.py index e29f260b..e4e269ce 100644 --- a/finalcif/report/templated_report.py +++ b/finalcif/report/templated_report.py @@ -346,7 +346,7 @@ def get_radiation(cif: CifContainer) -> RichText: @staticmethod def get_completeness(cif: CifContainer) -> str: try: - completeness = f"{float(cif['_diffrn_measured_fraction_theta_full']) * 100:.1f}{protected_space}%" + completeness = f"{float(cif['_diffrn_measured_fraction_theta_max']) * 100:.1f}{protected_space}%" except ValueError: completeness = '?' return completeness @@ -572,6 +572,7 @@ def _get_context(self, cif: CifContainer, options: Options, picfile: Path, tpl_d 'r_sigma' : this_or_quest(cif['_diffrn_reflns_av_unetI/netI']), 'completeness' : self.get_completeness(cif), 'theta_full' : cif['_diffrn_reflns_theta_full'], + 'theta_max' : cif['_diffrn_reflns_theta_max'], 'data' : this_or_quest(cif['_refine_ls_number_reflns']), 'restraints' : this_or_quest(cif['_refine_ls_number_restraints']), 'parameters' : this_or_quest(cif['_refine_ls_number_parameters']), diff --git a/finalcif/template/template1.docx b/finalcif/template/template1.docx index 3c07b0c7..7dfc1828 100644 Binary files a/finalcif/template/template1.docx and b/finalcif/template/template1.docx differ diff --git a/finalcif/template/template_for_multitable.docx b/finalcif/template/template_for_multitable.docx index f7d69915..e679d90b 100644 Binary files a/finalcif/template/template_for_multitable.docx and b/finalcif/template/template_for_multitable.docx differ diff --git a/finalcif/template/template_text.docx b/finalcif/template/template_text.docx index 5805b768..6506a764 100644 Binary files a/finalcif/template/template_text.docx and b/finalcif/template/template_text.docx differ diff --git a/finalcif/template/template_without_text.docx b/finalcif/template/template_without_text.docx index 625279aa..ccdb0824 100644 Binary files a/finalcif/template/template_without_text.docx and b/finalcif/template/template_without_text.docx differ