Merge branch 'master' of ssh://git-weiss@jade.msm.cam.ac.uk/srv/git/dtr

Conflicts:

	src/dirax.c

1 files changed, 6 insertions, 7 deletions

diff --git a/src/basis.h b/src/basis.h
index 25eb0ae..2253506 100644
--- a/src/basis.h
+++ b/src/basis.h
@@ -3,12 +3,12 @@
  *
  * Handle basis structures
  *
- * (c) 2007 Thomas White <taw27@cam.ac.uk>
+ * (c) 2007-2009 Thomas White <taw27@cam.ac.uk>
  *
  *  dtr - Diffraction Tomography Reconstruction
  *
  */
- 
+
 #ifndef BASIS_H
 #define BASIS_H
 
@@ -19,11 +19,11 @@
 #include "control.h"
 
 typedef struct {
-	
+
 	double x;
 	double y;
 	double z;
-	
+
 } Vector;
 
 typedef struct basis_struct {
@@ -41,9 +41,8 @@ typedef struct cell_struct {
 	double gamma;
 } UnitCell;
 
-extern double basis_efom(struct reflectionlist_struct *reflectionlist, Basis *basis);
-extern Basis basis_add(Basis u, Basis v);
 extern UnitCell basis_get_cell(Basis *cell);
+extern void basis_save(ControlContext *ctx);
+extern void basis_load(ControlContext *ctx);
 
 #endif	/* BASIS_H */
-