From 15e72336f9763bfa2dce4d9aa0f8dcb518b51ac1 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 20 Apr 2023 12:23:25 +0200 Subject: compare_hkl: Recognise --fom=cc*, cc1/2 and cchalf --- doc/man/compare_hkl.1 | 4 ++-- src/compare_hkl.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/man/compare_hkl.1 b/doc/man/compare_hkl.1 index ca2af21d..25727f4c 100644 --- a/doc/man/compare_hkl.1 +++ b/doc/man/compare_hkl.1 @@ -50,10 +50,10 @@ sum(|I1-kI2|) / sum(I1) .IP \fBR2\fR .PD sqrt(sum[(I1-kI2)^2] / sum(I1^2)) -.IP \fBCC\fR +.IP \fBCC\ (CChalf)\fR .PD The Pearson correlation coefficient. -.IP \fBCC*\fR +.IP \fBCC*\ (CCstar)\fR .PD See Karplus and Diederichs, Science 336 (2012) p1030. .IP \fBCCano\fR diff --git a/src/compare_hkl.c b/src/compare_hkl.c index f3f174d8..7b3aeb64 100644 --- a/src/compare_hkl.c +++ b/src/compare_hkl.c @@ -88,7 +88,10 @@ static enum fom_type fom_type_from_string(const char *s) if ( strcasecmp(s, "r2") == 0 ) return FOM_R2; if ( strcasecmp(s, "rsplit") == 0 ) return FOM_RSPLIT; if ( strcasecmp(s, "cc") == 0 ) return FOM_CC; + if ( strcasecmp(s, "cc1/2") == 0 ) return FOM_CC; + if ( strcasecmp(s, "cchalf") == 0 ) return FOM_CC; if ( strcasecmp(s, "ccstar") == 0 ) return FOM_CCSTAR; + if ( strcasecmp(s, "cc*") == 0 ) return FOM_CCSTAR; if ( strcasecmp(s, "ccano") == 0 ) return FOM_CCANO; if ( strcasecmp(s, "crdano") == 0 ) return FOM_CRDANO; if ( strcasecmp(s, "rano") == 0 ) return FOM_RANO; -- cgit v1.2.3