From 668d8c814d0b2a0ab1896fb3e203e31b316830c7 Mon Sep 17 00:00:00 2001
From: "Herbert J. Bernstein" <yayahjb@gmail.com>
Date: Sun, 7 Jul 2019 11:57:47 -0400
Subject: [PATCH] Update CMakeLists.txt for this release Fix d7dist application
 removing double G6 conversion Update make tests for changed d7test -- HJB

---
 CMakeLists.txt | 345 +++++++++++++++----------------------------------
 Makefile       |   5 +-
 d7dist.cpp     | 114 +++++-----------
 dist_test.bash |   4 +-
 dist_tests.out | 170 ++++++++++++------------
 5 files changed, 228 insertions(+), 410 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27c8757..ce2690c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 ######################################################################
 #  CMakeLists.txt - cmake build file for make to create ncdist       #
 #                                                                    #
-# Version 1.0.3 16 Dec 2018                                          #
+# Version 1.1.0 07 Jul 2019                                          #
 #                                                                    #
 #         Herbert J. Bernstein (yayahjb@gmail.com)                   #
 #         Lawrence C Andrews                                         #
@@ -83,111 +83,87 @@ include_directories("${CMAKE_SOURCE_DIR}" "${R_INCLUDE_DIRS}"
 
 message("include RCPPPARA: "  ${RCPPPARA_INCLUDE_DIRS})
 
+set(DEPENDENCIES
+B4.cpp          B4.h
+C3.cpp          C3.h
+CellInputData.h CellInputData.cpp
+D7.cpp          D7.h
+D7.h            D7.cpp 
+D7_Boundary.h   D7_Boundary.cpp
+D7_BoundaryList.h D7_BoundaryList.cpp 
+D7_Subboundary.h D7_Subboundary.cpp 
+D7_ClassifySubboundaries.h D7_ClassifySubboundaries.cpp
+G6.cpp  G6.h
+inverse.cpp     inverse.h
+LatticeConverter.h LatticeConverter.cpp
+LRL_Cell.h      LRL_Cell.cpp  
+LRL_Cell_Degrees.h   
+LRL_Cell_Degrees.cpp  
+LRL_CoordinateConversionMatrices.h LRL_CoordinateConversionMatrices.cpp  
+LRL_StringTools.h  LRL_StringTools.cpp  
+MatD7.h         MatD7.cpp  
+MatG6.h         MatG6.cpp  
+MatS6.h         MatS6.cpp  
+MatN.cpp        MatN.h
+MatMN.cpp       MatMN.h
+Mat66.cpp       Mat66.h
+MaximaTools.h   MaximaTools.cpp
+PrintTable.h    PrintTable.cpp
+ProjectorTools.h ProjectorTools.cpp 
+RandTools.h     RandTools.cpp 
+ReadCellData.h  ReadCellData.cpp
+Reducer.cpp     Reducer.h
+S6.cpp          S6.h
+S6Dist.cpp      S6Dist.h
+Selling.cpp     Selling.h
+S6M_SellingReduce.h
+S6Dist_func.cpp S6Dist_func.h
+Vec_N_Tools.cpp Vec_N_Tools.h
+VecN.cpp        VecN.h
+VectorTools.cpp VectorTools.h
+vector_3d.cpp   vector_3d.h)
+
+
 set(CS6DIST_APP_SOURCES
 cs6dist_app.cpp
 CS6Dist_func.cpp	CS6Dist_func.h
-Cell.cpp        Cell.h
-CS6Dist.h
-D6.cpp	D6.h
-D7.cpp	D7.h
-Delone.cpp	Delone.h
-B4.cpp	B4.h
-G6.cpp	G6.h
-inverse.cpp 	inverse.h
-MatN.cpp	MatN.h
-MatMN.cpp	MatMN.h
-Mat66.cpp	Mat66.h
-NCDist.h
-Reducer.cpp	Reducer.h
-S6.cpp          S6.h
-S6Dist.cpp	S6Dist.h
-Selling.cpp	Selling.h
-S6M_SellingReduce.h
-S6Dist_func.cpp	S6Dist_func.h
-Vec_N_Tools.cpp	Vec_N_Tools.h
-VecN.cpp	VecN.h
-VectorTools.cpp	VectorTools.h
-vector_3d.cpp	vector_3d.h)
+CS6Dist.c CS6Dist.h
+Delone.cpp              Delone.h
+${DEPENDENCIES}
+)
 
 set(CS6DIST_DIST_SOURCES
 cs6dist_dist.cpp
 CS6Dist_func.cpp	CS6Dist_func.h
-Cell.cpp        Cell.h
-CS6Dist.h
-D6.cpp	D6.h
-D7.cpp	D7.h
-Delone.cpp	Delone.h
-B4.cpp	B4.h
-G6.cpp	G6.h
-inverse.cpp 	inverse.h
-MatN.cpp	MatN.h
-MatMN.cpp	MatMN.h
-Mat66.cpp	Mat66.h
-NCDist.h
-Reducer.cpp	Reducer.h
-S6.cpp          S6.h
-S6Dist.cpp	S6Dist.h
-Selling.cpp	Selling.h
-S6M_SellingReduce.h
-S6Dist_func.cpp	S6Dist_func.h
-Vec_N_Tools.cpp	Vec_N_Tools.h
-VecN.cpp	VecN.h
-VectorTools.cpp	VectorTools.h
-vector_3d.cpp	vector_3d.h)
+CS6Dist.c CS6Dist.h
+Delone.cpp      Delone.h
+${DEPENDENCIES}
+)
 
 
 set(CS6DIST_MAT_SOURCES
 cs6dist_mat.cpp
 CS6Dist_func.cpp	CS6Dist_func.h
-Cell.cpp        Cell.h
-CS6Dist.h
-D6.cpp	D6.h
-D7.cpp	D7.h
-Delone.cpp	Delone.h
-B4.cpp	B4.h
-G6.cpp	G6.h
-inverse.cpp 	inverse.h
-MatN.cpp	MatN.h
-MatMN.cpp	MatMN.h
-Mat66.cpp	Mat66.h
-NCDist.h
-Reducer.cpp	Reducer.h
-S6.cpp          S6.h
-S6Dist.cpp	S6Dist.h
-Selling.cpp	Selling.h
-S6M_SellingReduce.h
-S6Dist_func.cpp	S6Dist_func.h
-Vec_N_Tools.cpp	Vec_N_Tools.h
-VecN.cpp	VecN.h
-VectorTools.cpp	VectorTools.h
-vector_3d.cpp	vector_3d.h)
+CS6Dist.c CS6Dist.h
+Delone.cpp      Delone.h
+${DEPENDENCIES}
+)
+
+set(CS6_S6_TEST_SOURCES
+cs6_s6_test.cpp
+CS6Dist_func.cpp	CS6Dist_func.h
+CS6Dist.c CS6Dist.h
+Delone.cpp      Delone.h
+${DEPENDENCIES}
+)
 
 
 set(S6DIST_APP_SOURCES
 s6dist_app.cpp
 S6Dist_func.cpp	S6Dist_func.h
-Cell.cpp        Cell.h
-CS6Dist.h
-D6.cpp	D6.h
-D7.cpp	D7.h
-Delone.cpp	Delone.h
-B4.cpp	B4.h
-G6.cpp	G6.h
-inverse.cpp 	inverse.h
-MatN.cpp	MatN.h
-MatMN.cpp	MatMN.h
-Mat66.cpp	Mat66.h
-NCDist.h
-Reducer.cpp	Reducer.h
-S6.cpp          S6.h
-S6Dist.cpp	S6Dist.h
-Selling.cpp	Selling.h
-S6M_SellingReduce.h
-S6Dist_func.cpp	S6Dist_func.h
-Vec_N_Tools.cpp	Vec_N_Tools.h
-VecN.cpp	VecN.h
-VectorTools.cpp	VectorTools.h
-vector_3d.cpp	vector_3d.h)
+Delone.cpp      Delone.h
+${DEPENDENCIES}
+)
 
 
 set(MINIMAL_S6DIST_SOURCES
@@ -200,146 +176,64 @@ S6Dist.cpp      S6Dist.h
 Vec_N_Tools.cpp Vec_N_Tools.h
 inverse.cpp     inverse.h
 MinimalS6Dist.cpp
+Delone.cpp      Delone.h
 S6.cpp          S6.h
 triple.h
 vector_3d.cpp   vector_3d.h
 rhrand.h
+${DEPENDENCIES}
 )
 
 
 set(NCDIST_SOURCES
-Cell.cpp        Cell.h
-D6.cpp          D6.h
-D7.cpp          D7.h
-Delone.cpp      Delone.h
-B4.cpp
-B4.h
-G6.cpp          G6.h
-inverse.cpp inverse.h
-Mat66.cpp       Mat66.h
-MatN.cpp        MatN.h
-MatMN.cpp       MatMN.h
-Reducer.cpp     Reducer.h
-VecN.cpp        VecN.h
-Vec_N_Tools.cpp Vec_N_Tools.h
-vector_3d.cpp   vector_3d.h
-VectorTools.cpp VectorTools.h
-NCDist.h    ncdist.cpp)
+NCDist.h    ncdist.cpp
+Delone.h    Delone.cpp
+${DEPENDENCIES}
+)
 
 set (RCPP_CS6DIST_SOURCES
 rcpp_cs6dist.cpp
-Cell.cpp        Cell.h
-D6.cpp          D6.h
-D7.cpp          D7.h
-S6.cpp          S6.h
-Delone.cpp      Delone.h
-B4.cpp
-B4.h
-G6.cpp          G6.h
-inverse.cpp inverse.h
-Mat66.cpp       Mat66.h
-MatN.cpp        MatN.h
-MatMN.cpp       MatMN.h
-Reducer.cpp     Reducer.h
-VecN.cpp        VecN.h
-Vec_N_Tools.cpp Vec_N_Tools.h
-vector_3d.cpp   vector_3d.h
-VectorTools.cpp VectorTools.h
-D7Dist.h )
+CS6Dist.h CS6Dist.c
+S6Dist_func.cpp S6Dist_func.h
+Delone.cpp Delone.h
+${DEPENDENCIES}
+)
 
 set(RCPP_D7DIST_SOURCES
-Cell.cpp        Cell.h
-D6.cpp          D6.h
-D7.cpp          D7.h
-S6.cpp          S6.h
+rcpp_d7dist.cpp
+D7Dist.c        D7Dist.h
 Delone.cpp      Delone.h
-B4.cpp
-B4.h
-G6.cpp          G6.h
-inverse.cpp inverse.h
-Mat66.cpp       Mat66.h
-MatN.cpp        MatN.h
-MatMN.cpp       MatMN.h
-Reducer.cpp     Reducer.h
-VecN.cpp        VecN.h
-Vec_N_Tools.cpp Vec_N_Tools.h
-vector_3d.cpp   vector_3d.h
-VectorTools.cpp VectorTools.h
-D7Dist.h        rcpp_d7dist.cpp)
+${DEPENDENCIES}
+)
 
 
 set(RCPP_NCDIST_SOURCES
-Cell.cpp        Cell.h
-D6.cpp          D6.h
-D7.cpp          D7.h
-S6.cpp          S6.h
+rcpp_ncdist.cpp 
+NCDist.h
 Delone.cpp      Delone.h
-B4.cpp
-B4.h
-G6.cpp          G6.h
-inverse.cpp inverse.h
-Mat66.cpp       Mat66.h
-MatN.cpp        MatN.h
-MatMN.cpp       MatMN.h
-Reducer.cpp     Reducer.h
-VecN.cpp        VecN.h
-Vec_N_Tools.cpp Vec_N_Tools.h
-vector_3d.cpp   vector_3d.h
-VectorTools.cpp VectorTools.h
-NCDist.h        rcpp_ncdist.cpp)
+${DEPENDENCIES}
+)
 
 set (RCPP_S6DIST_SOURCES
 rcpp_s6dist.cpp
-Cell.cpp        Cell.h
-D6.cpp          D6.h
-D7.cpp          D7.h
-S6.cpp          S6.h
-Delone.cpp      Delone.h
-B4.cpp
-B4.h
-G6.cpp          G6.h
-inverse.cpp inverse.h
-Mat66.cpp       Mat66.h
-MatN.cpp        MatN.h
-MatMN.cpp       MatMN.h
-Reducer.cpp     Reducer.h
-VecN.cpp        VecN.h
-Vec_N_Tools.cpp Vec_N_Tools.h
-vector_3d.cpp   vector_3d.h
-VectorTools.cpp VectorTools.h
-D7Dist.h )
+S6Dist_func.cpp  S6Dist_func.h
+Delone.cpp Delone.h
+${DEPENDENCIES}
+)
 
 set(D7DIST_SOURCES
-Cell.cpp        Cell.h
-D6.cpp          D6.h
-D7.cpp          D7.h
-Delone.cpp      Delone.h
-B4.cpp
-B4.h
-G6.cpp          G6.h
-inverse.cpp inverse.h
-Mat66.cpp       Mat66.h
-MatN.cpp        MatN.h
-MatMN.cpp       MatMN.h
-Reducer.cpp     Reducer.h
-VecN.cpp        VecN.h
-Vec_N_Tools.cpp Vec_N_Tools.h
-vector_3d.cpp   vector_3d.h
-VectorTools.cpp VectorTools.h
-D7Dist.h    d7dist.cpp)
+d7dist.cpp
+D7Dist.c        D7Dist.h
+Delone.cpp Delone.h
+${DEPENDENCIES}
+)
 
 
 set(FOLLOWER_SOURCES
-Cell.cpp        Cell.h
-CellInputData.cpp	CellInputData.h 
-cqrlib.c	cqrlib.h
-CreateFileName.cpp	CreateFileName.h
-CS6Dist.h
-D6.cpp	D6.h
-D7.cpp	D7.h
-D7Dist.c	D7Dist.h	D7Dist_.hpp
-Delone.cpp	Delone.h
-B4.cpp	B4.h
+D7Dist.c D7Dist.h
+Delone.cpp Delone.h
+CreateFileName.h CreateFileName.cpp
+MapBoundaryStrings2Colors.h MapBoundaryStrings2Colors.cpp
 FileOperations.cpp	FileOperations.h
 FileWriter.h
 Follow.h 
@@ -347,42 +241,12 @@ Follower.h
 FollowerConstants.cpp	FollowerConstants.h
 FollowerIO.cpp	FollowerIO.h
 FollowerTools.cpp	FollowerTools.h
-Follower_main.cpp 
-G6.cpp	G6.h
-Glitch.h GlitchElement.h
-inverse.cpp 	inverse.h
-LinearAxis.cpp
-MapBoundaryStrings2Colors.cpp	MapBoundaryStrings2Colors.h
-Mat7.cpp	Mat7.h
-MaximaTools.cpp	MaximaTools.h
-MatN.cpp	MatN.h
-MatMN.cpp	MatMN.h
-Mat66.cpp	Mat66.h
-NCDist.c	NCDist.h	NCDist_.hpp
-NormedInt.h
-ProjectorTools.cpp ProjectorTools.h
-RandTools.cpp	RandTools.h
-ReadCellData.cpp	ReadCellData.h 
-ReadGlobalData.cpp	ReadGlobalData.h
-Reducer.cpp	Reducer.h
-ReportTools.cpp	ReportTools.h
-Rn_Path.h 
-rhrand.h
-S6.cpp          S6.h
-S6Dist.cpp	S6Dist.h
-Selling.cpp	Selling.h
-S6M_SellingReduce.h
-S6Dist_func.cpp	S6Dist_func.h
-SVG_CirclePlot.h	SVG_DistancePlot.h	SVG_Writer.h
-StoreResults.h 
-SuperFastHash.cpp	SuperFastHash.h 
-TNear.h Theta.h
-ToString.h
-triple.h
-Vec_N_Tools.cpp	Vec_N_Tools.h
-VecN.cpp	VecN.h
-VectorTools.cpp	VectorTools.h
-vector_3d.cpp	vector_3d.h)
+Follower_main.cpp
+LinearAxis.cpp LinearAxis.h
+ReadGlobalData.cpp 
+NCDist.c NCDist.h
+${DEPENDENCIES}
+)
 
 
 add_library(R_shared_lib INTERFACE IMPORTED GLOBAL)
@@ -406,6 +270,8 @@ add_executable(cs6dist_app ${CS6DIST_APP_SOURCES} )
 target_link_libraries(cs6dist_app ${CMAKE_THREAD_LIBS_INIT} )
 add_executable(cs6dist_mat ${CS6DIST_MAT_SOURCES} )
 target_link_libraries(cs6dist_mat ${CMAKE_THREAD_LIBS_INIT} )
+add_executable(cs6_s6_test ${CS6_S6_TEST_SOURCES} )
+target_link_libraries(cs6_s6_test ${CMAKE_THREAD_LIBS_INIT} )
 add_executable(s6dist_app ${S6DIST_APP_SOURCES} )
 target_link_libraries(s6dist_app ${CMAKE_THREAD_LIBS_INIT} )
 add_executable(cs6dist_dist ${CS6DIST_DIST_SOURCES} )
@@ -419,6 +285,7 @@ target_link_libraries(Follower ${CMAKE_THREAD_LIBS_INIT} )
 
 install(TARGETS cs6dist_app DESTINATION bin)
 install(TARGETS cs6dist_mat DESTINATION bin)
+install(TARGETS cs6_s6_test DESTINATION bin)
 install(TARGETS cs6dist_dist DESTINATION bin)
 install(TARGETS minimal_s6dist DESTINATION bin)
 install(TARGETS ncdist DESTINATION bin)
diff --git a/Makefile b/Makefile
index 8ae2b27..79c9be1 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ DEPENDENCIES =  \
 
 
 
-all:  ncdist ncdist_mat D7Test Follower \
+all:  ncdist ncdist_mat d7dist D7Test Follower \
 	rcpp_ncdist.so rcpp_d7dist.so rcpp_s6dist.so rcpp_cs6dist.so rcpp_cs6dist.so \
 	cs6dist_app  s6dist_app cs6dist_mat cs6dist_dist cs6_s6_test
 
@@ -246,8 +246,9 @@ d7dist_.o:  d7dist.cpp Reducer.h Delone.h LRL_Cell.h  LRL_Cell_Degrees.h NCDist.
 
 d7dist:  d7dist_.o \
 	$(DEPENDENCIES) Delone.h Delone.cpp
-	g++ $(CXXFLAGS) -o d7dist d7dist_.o -I $(RCPPARMA_HEADERS) -I $(RCPPPARA_HEADERS) \
+	g++ $(CXXFLAGS) -o d7dist d7dist_.o  -I $(RCPPARMA_HEADERS) -I $(RCPPPARA_HEADERS) \
 	$(LIBSOURCES) \
+	D7Dist.c  Delone.cpp \
 	-lpthread
 
 Reducer.o:  Reducer.cpp Reducer.h LRL_Cell.h LRL_Cell_Degrees.h NCDist.h
diff --git a/d7dist.cpp b/d7dist.cpp
index 99812b6..4ef0f77 100644
--- a/d7dist.cpp
+++ b/d7dist.cpp
@@ -1,19 +1,23 @@
 
-#include "Reducer.h"
-#include "Delone.h"
+
+#include "S6M_SellingReduce.h"
+#include "D7Dist.h"
+#include "G6.h"
+#include "D7.h"
+#include "S6.h"
 #include "LRL_Cell.h"
 #include "LRL_Cell_Degrees.h"
-#include "D7Dist.h"
-#define ARMA_DONT_USE_BLAS
-#define ARMA_DONT_USE_LAPACK
+#include "Delone.h"
 #include <iostream>
 #include <cmath>
 #include <stdlib.h>
+#include <ctype.h>
 
 //*****************************************************************************
 G6 makeprimredprobe( std::string testlattice,
 	double a, double b, double c, double alpha, double beta, double gamma )
 {
+    int reduced;
     std::string latsym;
     char clatsym;
     G6 v6cell;
@@ -27,6 +31,8 @@ G6 makeprimredprobe( std::string testlattice,
     G6 reducedBase;
     G6 primredprobe;
     G6 dprimredprobe;
+    double d7cell[7];
+    double d7redcell[7];
     double crootvol;
     LRL_Cell rawcell(a,b,c, alpha,beta,gamma);
     int ii;
@@ -54,8 +60,8 @@ G6 makeprimredprobe( std::string testlattice,
         case 'r':
         case 'H':
         case 'h':
-            mc = rawcell.LatSymMat66(latsym);
-            primcell = mc*(rawcell.Cell2V6());
+            CS6M_CelltoG6(rawcell,v6cell);
+            CS6M_LatSymMat66(v6cell,clatsym,mc,primcell);
             break;
         case 'V':
         case 'v':
@@ -69,70 +75,16 @@ G6 makeprimredprobe( std::string testlattice,
         default:
             std::cerr << "Unrecognized lattice symbol "<< testlattice<<" treated as P" << std::endl;
             latsym = "P";
-            mc = rawcell.LatSymMat66(latsym);
-            primcell = mc*(rawcell.Cell2V6());
+            clatsym = 'P';
+            CS6M_CelltoG6(rawcell,v6cell);
+            CS6M_LatSymMat66(v6cell,clatsym,mc,primcell);
             break;
     }
-    ret = Reducer::Reduce(primcell,m,redprimcell,0.0);
-    ret = Delone::Reduce(primcell,dm,dredprimcell,0.0);
-    primredprobe = LRL_Cell_Degrees(LRL_Cell(redprimcell));
-    dprimredprobe = LRL_Cell_Degrees(LRL_Cell(dredprimcell));
-    std::cout << "Primitive Reduced Probe LRL_Cell: " <<
-    primredprobe[0]<<" "<<
-    primredprobe[1]<<" "<<
-    primredprobe[2]<<" "<<
-    primredprobe[3]<<" "<<
-    primredprobe[4]<<" "<<
-    primredprobe[5] << std::endl;
-    std::cout << "Delaunay Primitive Reduced Probe LRL_Cell: " <<
-    dprimredprobe[0]<<" "<<
-    dprimredprobe[1]<<" "<<
-    dprimredprobe[2]<<" "<<
-    dprimredprobe[3]<<" "<<
-    dprimredprobe[4]<<" "<<
-    dprimredprobe[5] << std::endl;
-    std::cout << "Volume :" << LRL_Cell(redprimcell).Volume() << std::endl;
-    crootvol = pow(LRL_Cell(redprimcell).Volume(),1./3.);
-    Reducer::Reduce((LRL_Cell(redprimcell).Inverse()).Cell2V6(),m,reducedBase,0.0);
-    recipcell = LRL_Cell_Degrees(LRL_Cell(redprimcell).Inverse());
-    
-    std::cout << "Reciprocal of Primitive Probe LRL_Cell: " <<
-    recipcell[0]<<" "<<
-    recipcell[1]<<" "<<
-    recipcell[2]<<" "<<
-    recipcell[3]<<" "<<
-    recipcell[4]<<" "<<
-    recipcell[5]<< std::endl;
-    std::cout << "Volume of Reciprocal LRL_Cell: " <<
-    (LRL_Cell(redprimcell).Inverse()).Volume() << std::endl;
-    std::cout << "V7 linearized and scaled: "
-    << primredprobe[0]*std::sqrt(6./7.)<<" "
-    << primredprobe[1]*std::sqrt(6./7.)<<" "
-    << primredprobe[2]*std::sqrt(6./7.)<<" "
-    << std::sqrt(1./reducedBase[0])*std::sqrt(6./7.)<<" "
-    << std::sqrt(1./reducedBase[1])*std::sqrt(6./7.)<<" "
-    << std::sqrt(1./reducedBase[2])*std::sqrt(6./7.)<<" "
-    << " "<<
-    crootvol*std::sqrt(6./7.)<<std::endl;
-    if (latsym[0] == 'V' || latsym[0] == 'v') {
-        std::cout << "raw G6 vector: "
-        << primcell[0]<<" "
-        << primcell[1]<<" "
-        << primcell[2]<<" "
-        << primcell[3]<<" "
-        << primcell[4]<<" "
-        << primcell[5]<<std::endl;
-    } else {
-        std::cout << "raw G6 vector: "
-        << dprimredprobe[0]*dprimredprobe[0]<<" "
-        << dprimredprobe[1]*dprimredprobe[1]<<" "
-        << dprimredprobe[2]*dprimredprobe[2]<<" "
-        << 2.*dprimredprobe[1]*dprimredprobe[2]*cos(dprimredprobe[3]*std::atan(1.0)/45.)<<" "
-        << 2.*dprimredprobe[0]*dprimredprobe[2]*cos(dprimredprobe[4]*std::atan(1.0)/45.)<<" "
-        << 2.*dprimredprobe[0]*dprimredprobe[1]*cos(dprimredprobe[5]*std::atan(1.0)/45.)<<std::endl;
-    }
-    std::cout << std::endl;
-    return dprimredprobe;
+    CS6M_G6Reduce(primcell,redprimcell,reduced);
+    CS6M_G6toD7(primcell,d7cell);
+    CS6M_D7Reduce(d7cell,d7redcell,reduced);
+    CS6M_D7toG6(d7redcell,dredprimcell);
+    return dredprimcell;
 }
 
 
@@ -168,22 +120,18 @@ int main(int argc, char ** argv) {
     gamma2 = atof(argv[14]);
     prim1 = makeprimredprobe(lat1,a1,b1,c1,alpha1,beta1,gamma1);
     prim2 = makeprimredprobe(lat2,a2,b2,c2,alpha2,beta2,gamma2);
-    LRL_Cell cell1 = LRL_Cell(prim1[0],prim1[1],prim1[2],prim1[3],prim1[4],prim1[5]);
-    LRL_Cell cell2 = LRL_Cell(prim2[0],prim2[1],prim2[2],prim2[3],prim2[4],prim2[5]);
-    G6 gv1 = G6(cell1.Cell2V6());
-    G6 gv2 = G6(cell2.Cell2V6());
     for (ii=0; ii < 3; ii++) {
-      dprim1[ii] = gv1[ii];
-      dprim2[ii] = gv2[ii];
+      dprim1[ii] = prim1[ii];
+      dprim2[ii] = prim2[ii];
     }
-    dprim1[3] = gv1[0]+gv1[1]+gv1[2]+gv1[3]+gv1[4]+gv1[5];
-    dprim2[3] = gv2[0]+gv2[1]+gv2[2]+gv2[3]+gv2[4]+gv2[5];
-    dprim1[4] =       +gv1[1]+gv1[2]+gv1[3];
-    dprim2[4] =       +gv2[1]+gv2[2]+gv2[3];
-    dprim1[5] = gv1[0]       +gv1[2]       +gv1[4];
-    dprim2[5] = gv2[0]       +gv2[2]       +gv2[4];
-    dprim1[6] = gv1[0]+gv1[1]                     +gv1[5];
-    dprim2[6] = gv2[0]+gv2[1]                     +gv2[5];
+    dprim1[3] = prim1[0]+prim1[1]+prim1[2]+prim1[3]+prim1[4]+prim1[5];
+    dprim2[3] = prim2[0]+prim2[1]+prim2[2]+prim2[3]+prim2[4]+prim2[5];
+    dprim1[4] =         +prim1[1]+prim1[2]+prim1[3];
+    dprim2[4] =         +prim2[1]+prim2[2]+prim2[3];
+    dprim1[5] = prim1[0]         +prim1[2]         +prim1[4];
+    dprim2[5] = prim2[0]         +prim2[2]         +prim2[4];
+    dprim1[6] = prim1[0]+prim1[1]                           +prim1[5];
+    dprim2[6] = prim2[0]+prim2[1]                           +prim2[5];
     std::cout << "dprim1: [" << dprim1[0] <<", "<< dprim1[1] << ", "<< dprim1[2] << ", "
               << dprim1[3] << ", " << dprim1[4] << ", " << dprim1[5] << ", " << dprim1[6]<< "]" << std::endl;
     std::cout << "dprim2: [" << dprim2[0] <<", "<< dprim2[1] << ", "<< dprim2[2] << ", "
diff --git a/dist_test.bash b/dist_test.bash
index 03a984e..6642758 100755
--- a/dist_test.bash
+++ b/dist_test.bash
@@ -17,7 +17,9 @@ gamma2=$7
 s6dist_val=`./s6dist_app $latsym1 $a1 $b1 $c1 $alpha1 $beta1 $gamma1 $latsym2 $a2 $b2 $c2 $alpha2 $beta2 $gamma2 | tail -1`
 cs6dist_val=`./cs6dist_app $latsym1 $a1 $b1 $c1 $alpha1 $beta1 $gamma1 $latsym2 $a2 $b2 $c2 $alpha2 $beta2 $gamma2 | tail -1`
 ncdist_val=`./ncdist $latsym1 $a1 $b1 $c1 $alpha1 $beta1 $gamma1 $latsym2 $a2 $b2 $c2 $alpha2 $beta2 $gamma2 | tail -1`
+d7dist_val=`./d7dist $latsym1 $a1 $b1 $c1 $alpha1 $beta1 $gamma1 $latsym2 $a2 $b2 $c2 $alpha2 $beta2 $gamma2 | tail -1`
 #echo $s6dist_val
 #echo $cs6dist_val
 #echo $ncdist_val
-echo "cell1: [ $latsym1 $a1 $b1 $c1 $alpha1 $beta1 $gamma1] cell2: [ $latsym2 $a2 $b2 $c2 $alpha2 $beta2 $gamma2] s6dist: $s6dist_val cs6dist: $cs6dist_val ncdist: $ncdist_val"
+#echo $d7dist_val
+echo "cell1: [ $latsym1 $a1 $b1 $c1 $alpha1 $beta1 $gamma1] cell2: [ $latsym2 $a2 $b2 $c2 $alpha2 $beta2 $gamma2] s6dist: $s6dist_val cs6dist: $cs6dist_val ncdist: $ncdist_val d7dist: $d7dist_val"
diff --git a/dist_tests.out b/dist_tests.out
index f0b4e2b..c273c68 100644
--- a/dist_tests.out
+++ b/dist_tests.out
@@ -1,85 +1,85 @@
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ I 108.750 108.750 108.750 90.000 90.000 90.000] s6dist: 0 cs6dist: 0 ncdist: 0
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 59.120 86.190 126.080 90.000 99.990 90.000] s6dist: 11.5255 cs6dist: 11.5255 ncdist: 11.2702
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ H 71.095 71.095 149.210 90.000 90.000 120.000] s6dist: 6.67004 cs6dist: 6.67004 ncdist: 10.4861
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 9.34244 cs6dist: 9.34244 ncdist: 12.0119
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 6.89602 cs6dist: 6.89602 ncdist: 11.0323
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 6.75139 cs6dist: 6.75139 ncdist: 9.96519
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 7.29807 cs6dist: 7.29807 ncdist: 12.1223
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 11.6663 cs6dist: 11.6663 ncdist: 10.7115
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 11.472 cs6dist: 11.472 ncdist: 11.2231
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 12.0165 cs6dist: 12.0165 ncdist: 12.1119
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 11.6463 cs6dist: 11.6463 ncdist: 11.5421
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 11.7346 cs6dist: 11.7346 ncdist: 11.5756
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 11.7438 cs6dist: 11.7438 ncdist: 11.5648
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 7.18772 cs6dist: 7.18772 ncdist: 12.2226
-cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 11.7076 cs6dist: 11.7076 ncdist: 11.5537
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 59.120 86.190 126.080 90.000 99.990 90.000] s6dist: 0 cs6dist: 0 ncdist: 0
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ H 71.095 71.095 149.210 90.000 90.000 120.000] s6dist: 11.4899 cs6dist: 10.5861 ncdist: 11.2755
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 8.71223 cs6dist: 7.98669 ncdist: 9.44705
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 10.9426 cs6dist: 10.1201 ncdist: 11.2262
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 10.4346 cs6dist: 9.96989 ncdist: 9.58792
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 12.1119 cs6dist: 11.521 ncdist: 12.099
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 7.07135 cs6dist: 7.07135 ncdist: 7.00619
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 1.19741 cs6dist: 1.19741 ncdist: 1.29224
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 6.949 cs6dist: 6.22696 ncdist: 6.86035
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 4.15706 cs6dist: 4.15706 ncdist: 5.3368
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 4.25787 cs6dist: 4.25787 ncdist: 5.25965
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 4.27212 cs6dist: 4.27212 ncdist: 5.24471
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 11.5489 cs6dist: 10.8323 ncdist: 12.034
-cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 4.21062 cs6dist: 4.21062 ncdist: 5.27529
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ H 71.095 71.095 149.210 90.000 90.000 120.000] s6dist: 0 cs6dist: 0 ncdist: 0
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 8.68571 cs6dist: 8.68571 ncdist: 9.08644
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 5.62136 cs6dist: 5.62136 ncdist: 5.78711
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 6.62074 cs6dist: 6.60393 ncdist: 8.27877
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 5.46677 cs6dist: 4.27752 ncdist: 6.99986
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 11.574 cs6dist: 11.574 ncdist: 11.0124
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 11.44 cs6dist: 11.44 ncdist: 11.2413
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 11.8959 cs6dist: 11.8959 ncdist: 11.4653
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 11.4977 cs6dist: 11.4977 ncdist: 11.0745
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 11.5936 cs6dist: 11.5936 ncdist: 11.166
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 11.6046 cs6dist: 11.6046 ncdist: 11.1735
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 4.46138 cs6dist: 4.46138 ncdist: 7.29991
-cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 11.5651 cs6dist: 11.5651 ncdist: 11.136
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 0 cs6dist: 0 ncdist: 0
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 7.66287 cs6dist: 7.55148 ncdist: 8.54941
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 8.0447 cs6dist: 7.80575 ncdist: 8.85945
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 9.27423 cs6dist: 9.27423 ncdist: 8.77392
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 9.64986 cs6dist: 8.97976 ncdist: 9.64986
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 8.66672 cs6dist: 7.9614 ncdist: 9.44529
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 8.66672 cs6dist: 7.9614 ncdist: 9.44529
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 8.33069 cs6dist: 7.78134 ncdist: 8.50728
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 8.59966 cs6dist: 7.64914 ncdist: 8.59966
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 8.70266 cs6dist: 7.75045 ncdist: 8.70266
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 8.73219 cs6dist: 7.78097 ncdist: 8.73219
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 8.55444 cs6dist: 8.13952 ncdist: 8.60071
-cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 8.68935 cs6dist: 7.73763 ncdist: 8.68935
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 0 cs6dist: 0 ncdist: 0
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 6.46232 cs6dist: 6.39757 ncdist: 8.17308
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 5.60661 cs6dist: 5.60661 ncdist: 5.96449
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 11.2357 cs6dist: 11.2357 ncdist: 10.7499
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 10.8935 cs6dist: 10.8935 ncdist: 11.1905
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 11.1494 cs6dist: 11.1494 ncdist: 11.2259
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 10.9438 cs6dist: 10.9438 ncdist: 10.8276
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 11.0417 cs6dist: 11.0417 ncdist: 10.9235
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 11.0566 cs6dist: 11.0566 ncdist: 10.9315
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 4.77033 cs6dist: 4.77033 ncdist: 6.31195
-cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 11.016 cs6dist: 11.016 ncdist: 10.8927
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 0 cs6dist: 0 ncdist: 0
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 6.86965 cs6dist: 6.66487 ncdist: 8.92386
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 10.8376 cs6dist: 10.8376 ncdist: 9.77086
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 10.3822 cs6dist: 10.3822 ncdist: 9.56106
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 11.1093 cs6dist: 11.1216 ncdist: 10.1832
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 10.5503 cs6dist: 10.5503 ncdist: 9.38299
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 10.6568 cs6dist: 10.6568 ncdist: 9.4857
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 10.6689 cs6dist: 10.6689 ncdist: 9.49353
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 6.51136 cs6dist: 6.51136 ncdist: 9.49448
-cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 10.6237 cs6dist: 10.6237 ncdist: 9.4476
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 0 cs6dist: 0.00065695 ncdist: 0
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 12.3809 cs6dist: 12.3809 ncdist: 11.7731
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 12.0639 cs6dist: 12.0639 ncdist: 12.0735
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 12.4164 cs6dist: 12.4164 ncdist: 11.9603
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 12.1814 cs6dist: 12.1814 ncdist: 11.5552
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 12.2721 cs6dist: 12.2721 ncdist: 11.6513
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 12.285 cs6dist: 12.285 ncdist: 11.6637
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 4.1269 cs6dist: 4.1269 ncdist: 4.74268
-cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 12.2471 cs6dist: 12.2471 ncdist: 11.6234
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ I 108.750 108.750 108.750 90.000 90.000 90.000] s6dist: 0 cs6dist: 0 ncdist: 0 d7dist: 0
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 59.120 86.190 126.080 90.000 99.990 90.000] s6dist: 11.5255 cs6dist: 11.5255 ncdist: 11.2702 d7dist: 14.7567
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ H 71.095 71.095 149.210 90.000 90.000 120.000] s6dist: 6.67004 cs6dist: 6.67004 ncdist: 10.4861 d7dist: 11.6625
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 9.34244 cs6dist: 9.34244 ncdist: 12.0119 d7dist: 11.787
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 6.89602 cs6dist: 6.89602 ncdist: 11.0323 d7dist: 11.394
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 6.75139 cs6dist: 6.75139 ncdist: 9.96519 d7dist: 9.2788
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 7.29807 cs6dist: 7.29807 ncdist: 12.1223 d7dist: 13.8669
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 11.6663 cs6dist: 11.6663 ncdist: 10.7115 d7dist: 15.7838
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 11.472 cs6dist: 11.472 ncdist: 11.2231 d7dist: 14.696
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 12.0165 cs6dist: 12.0165 ncdist: 12.1119 d7dist: 14.6374
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 11.6463 cs6dist: 11.6463 ncdist: 11.5421 d7dist: 14.737
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 11.7346 cs6dist: 11.7346 ncdist: 11.5756 d7dist: 14.8921
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 11.7438 cs6dist: 11.7438 ncdist: 11.5648 d7dist: 14.9255
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 7.18772 cs6dist: 7.18772 ncdist: 12.2226 d7dist: 13.1894
+cell1: [ I 108.750 108.750 108.750 90.000 90.000 90.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 11.7076 cs6dist: 11.7076 ncdist: 11.5537 d7dist: 14.8583
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 59.120 86.190 126.080 90.000 99.990 90.000] s6dist: 0 cs6dist: 0 ncdist: 0 d7dist: 0
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ H 71.095 71.095 149.210 90.000 90.000 120.000] s6dist: 11.4899 cs6dist: 10.5861 ncdist: 11.2755 d7dist: 17.2277
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 8.71223 cs6dist: 7.98669 ncdist: 9.44705 d7dist: 14.2954
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 10.9426 cs6dist: 10.1201 ncdist: 11.2262 d7dist: 16.69
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 10.4346 cs6dist: 9.96989 ncdist: 9.58792 d7dist: 15.0765
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 12.1119 cs6dist: 11.521 ncdist: 12.099 d7dist: 18.8195
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 7.07135 cs6dist: 7.07135 ncdist: 7.00619 d7dist: 9.24612
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 1.19741 cs6dist: 1.19741 ncdist: 1.29224 d7dist: 1.45095
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 6.949 cs6dist: 6.22696 ncdist: 6.86035 d7dist: 9.05222
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 4.15706 cs6dist: 4.15706 ncdist: 5.3368 d7dist: 5.07969
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 4.25787 cs6dist: 4.25787 ncdist: 5.25965 d7dist: 5.09415
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 4.27212 cs6dist: 4.27212 ncdist: 5.24471 d7dist: 5.09224
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 11.5489 cs6dist: 10.8323 ncdist: 12.034 d7dist: 18.1031
+cell1: [ P 59.120 86.190 126.080 90.000 99.990 90.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 4.21062 cs6dist: 4.21062 ncdist: 5.27529 d7dist: 5.0466
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ H 71.095 71.095 149.210 90.000 90.000 120.000] s6dist: 0 cs6dist: 0 ncdist: 0 d7dist: 0
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 8.68571 cs6dist: 8.68571 ncdist: 9.08644 d7dist: 10.9944
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 5.62136 cs6dist: 5.62136 ncdist: 5.78711 d7dist: 6.75989
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 6.62074 cs6dist: 6.60393 ncdist: 8.27877 d7dist: 9.42085
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 5.46677 cs6dist: 4.27752 ncdist: 6.99986 d7dist: 8.39221
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 11.574 cs6dist: 11.574 ncdist: 11.0124 d7dist: 18.3585
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 11.44 cs6dist: 11.44 ncdist: 11.2413 d7dist: 17.1854
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 11.8959 cs6dist: 11.8959 ncdist: 11.4653 d7dist: 16.5175
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 11.4977 cs6dist: 11.4977 ncdist: 11.0745 d7dist: 17.0461
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 11.5936 cs6dist: 11.5936 ncdist: 11.166 d7dist: 17.2003
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 11.6046 cs6dist: 11.6046 ncdist: 11.1735 d7dist: 17.2408
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 4.46138 cs6dist: 4.46138 ncdist: 7.29991 d7dist: 6.8351
+cell1: [ H 71.095 71.095 149.210 90.000 90.000 120.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 11.5651 cs6dist: 11.5651 ncdist: 11.136 d7dist: 17.1726
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 41.401 41.401 99.008 90.000 90.000 90.000] s6dist: 0 cs6dist: 0 ncdist: 0 d7dist: 0
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 7.66287 cs6dist: 7.55148 ncdist: 8.54941 d7dist: 9.77526
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 8.0447 cs6dist: 7.80575 ncdist: 8.85945 d7dist: 9.57959
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 9.27423 cs6dist: 9.27423 ncdist: 8.77392 d7dist: 12.8892
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 9.64986 cs6dist: 8.97976 ncdist: 9.64986 d7dist: 16.0645
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 8.66672 cs6dist: 7.9614 ncdist: 9.44529 d7dist: 14.258
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 8.66672 cs6dist: 7.9614 ncdist: 9.44529 d7dist: 14.258
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 8.33069 cs6dist: 7.78134 ncdist: 8.50728 d7dist: 12.7193
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 8.59966 cs6dist: 7.64914 ncdist: 8.59966 d7dist: 13.9956
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 8.70266 cs6dist: 7.75045 ncdist: 8.70266 d7dist: 14.1716
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 8.73219 cs6dist: 7.78097 ncdist: 8.73219 d7dist: 14.2304
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 8.55444 cs6dist: 8.13952 ncdist: 8.60071 d7dist: 11.827
+cell1: [ P 41.401 41.401 99.008 90.000 90.000 90.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 8.68935 cs6dist: 7.73763 ncdist: 8.68935 d7dist: 14.1516
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 61.334 61.334 65.154 90.000 90.000 120.000] s6dist: 0 cs6dist: 0 ncdist: 0 d7dist: 0
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 6.46232 cs6dist: 6.39757 ncdist: 8.17308 d7dist: 8.94463
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 5.60661 cs6dist: 5.60661 ncdist: 5.96449 d7dist: 8.91494
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 11.2357 cs6dist: 11.2357 ncdist: 10.7499 d7dist: 17.973
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 10.8935 cs6dist: 10.8935 ncdist: 11.1905 d7dist: 16.6489
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 11.1494 cs6dist: 11.1494 ncdist: 11.2259 d7dist: 15.7695
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 10.9438 cs6dist: 10.9438 ncdist: 10.8276 d7dist: 16.4939
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 11.0417 cs6dist: 11.0417 ncdist: 10.9235 d7dist: 16.6519
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 11.0566 cs6dist: 11.0566 ncdist: 10.9315 d7dist: 16.6962
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 4.77033 cs6dist: 4.77033 ncdist: 6.31195 d7dist: 7.53799
+cell1: [ P 61.334 61.334 65.154 90.000 90.000 120.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 11.016 cs6dist: 11.016 ncdist: 10.8927 d7dist: 16.6261
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 44.808 85.707 90.678 112.950 101.950 85.920] s6dist: 0 cs6dist: 0 ncdist: 0 d7dist: 0
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 6.86965 cs6dist: 6.66487 ncdist: 8.92386 d7dist: 11.7125
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 10.8376 cs6dist: 10.8376 ncdist: 9.77086 d7dist: 16.4888
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 10.3822 cs6dist: 10.3822 ncdist: 9.56106 d7dist: 15.028
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 11.1093 cs6dist: 11.1216 ncdist: 10.1832 d7dist: 14.6042
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 10.5503 cs6dist: 10.5503 ncdist: 9.38299 d7dist: 14.9561
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 10.6568 cs6dist: 10.6568 ncdist: 9.4857 d7dist: 15.1317
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 10.6689 cs6dist: 10.6689 ncdist: 9.49353 d7dist: 15.1758
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 6.51136 cs6dist: 6.51136 ncdist: 9.49448 d7dist: 10.8299
+cell1: [ P 44.808 85.707 90.678 112.950 101.950 85.920] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 10.6237 cs6dist: 10.6237 ncdist: 9.4476 d7dist: 15.0977
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 51.491 51.491 35.389 90.000 90.000 120.000] s6dist: 0 cs6dist: 0.00065695 ncdist: 0 d7dist: 0
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 92.383 116.596 82.430 90.000 90.000 90.000] s6dist: 12.3809 cs6dist: 12.3809 ncdist: 11.7731 d7dist: 19.9775
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 59.980 86.070 125.820 90.000 100.300 90.000] s6dist: 12.0639 cs6dist: 12.0639 ncdist: 12.0735 d7dist: 18.7818
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 50.315 128.595 62.389 90.000 101.690 90.000] s6dist: 12.4164 cs6dist: 12.4164 ncdist: 11.9603 d7dist: 18.0431
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 56.320 82.980 122.000 90.000 90.000 90.000] s6dist: 12.1814 cs6dist: 12.1814 ncdist: 11.5552 d7dist: 18.6796
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 56.880 83.030 122.940 90.000 90.000 90.000] s6dist: 12.2721 cs6dist: 12.2721 ncdist: 11.6513 d7dist: 18.821
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 57.280 83.370 122.960 90.000 90.000 90.000] s6dist: 12.285 cs6dist: 12.285 ncdist: 11.6637 d7dist: 18.8602
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 45.352 50.052 49.597 90.000 101.420 90.000] s6dist: 4.1269 cs6dist: 4.1269 ncdist: 4.74268 d7dist: 5.54163
+cell1: [ P 51.491 51.491 35.389 90.000 90.000 120.000] cell2: [ P 56.880 83.380 122.570 90.000 90.000 90.000] s6dist: 12.2471 cs6dist: 12.2471 ncdist: 11.6234 d7dist: 18.7973