aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-10-15 16:01:47 +0200
committerThomas White <taw@physics.org>2019-03-11 16:49:36 +0100
commite06952e9eefb0affb65d5361d1919d28bee5974d (patch)
tree29d932e77751f8980865e00a360fc35666529d06 /src
parent5ce8e318bcd3389acb28685c930e23087bf8722b (diff)
Remove cells_are_similar() from API
There are two functions with this name. Avoid confusion.
Diffstat (limited to 'src')
-rw-r--r--src/cell_tool.c32
1 files changed, 30 insertions, 2 deletions
diff --git a/src/cell_tool.c b/src/cell_tool.c
index 3450c299..085134b3 100644
--- a/src/cell_tool.c
+++ b/src/cell_tool.c
@@ -68,6 +68,34 @@ static void show_help(const char *s)
}
+static int cells_the_same(UnitCell *cell1, UnitCell *cell2, float ltl, float atl)
+{
+ double a1, b1, c1, al1, be1, ga1;
+ double a2, b2, c2, al2, be2, ga2;
+ UnitCellTransformation *tfn1, *tfn2;
+ UnitCell *pcell1, *pcell2;
+
+ /* Compare primitive cells, not centered */
+ pcell1 = uncenter_cell(cell1, &tfn1);
+ pcell2 = uncenter_cell(cell2, &tfn2);
+
+ cell_get_parameters(pcell1, &a1, &b1, &c1, &al1, &be1, &ga1);
+ cell_get_parameters(pcell2, &a2, &b2, &c2, &al2, &be2, &ga2);
+
+ cell_free(pcell1);
+ cell_free(pcell2);
+
+ if ( !within_tolerance(a1, a2, ltl) ) return 0;
+ if ( !within_tolerance(b1, b2, ltl) ) return 0;
+ if ( !within_tolerance(c1, c2, ltl) ) return 0;
+ if ( !within_tolerance(al1, al2, atl) ) return 0;
+ if ( !within_tolerance(be1, be2, atl) ) return 0;
+ if ( !within_tolerance(ga1, ga2, atl) ) return 0;
+
+ return 1;
+}
+
+
static int comparecells(UnitCell *cell, const char *comparecell,
double ltl, double atl)
{
@@ -122,7 +150,7 @@ static int comparecells(UnitCell *cell, const char *comparecell,
tfn = tfn_from_intmat(m);
nc = cell_transform(cell, tfn);
- if ( cells_are_similar(cell2, nc, ltl, atl) ) {
+ if ( cells_the_same(cell2, nc, ltl, atl) ) {
STATUS("-----------------------------------------------"
"-------------------------------------------\n");
cell_print(nc);
@@ -303,7 +331,7 @@ static int find_ambi(UnitCell *cell, SymOpList *sym, double ltl, double atl)
tfn = tfn_from_intmat(m);
nc = cell_transform(cell, tfn);
- if ( cells_are_similar(cell, nc, ltl, atl) ) {
+ if ( cells_the_same(cell, nc, ltl, atl) ) {
if ( !intmat_is_identity(m) ) add_symop(ops, m);
STATUS("-----------------------------------------------"
"-------------------------------------------\n");