- Removed -fwritable-string

SKIPPED:
	psi/dornier2.c
	psi/ecbdriv.c
	psi/el734hp.c
	psi/libpsi.a
	psi/make_gen
	psi/makefile_linux
	psi/pimotor.c
	psi/pipiezo.c
	psi/sinqhttp.c
	psi/tcpdornier.c
	psi/velodornier.c

ubfour.h

@@ -5,9 +5,14 @@
  *
  * Implemented:
  * - UB from cell cell constants and two reflections.
+ * - UB from three reflections
  * - Brute force index search
  *
- * Mark Koennecke, march 2005
+ * Mark Koennecke, March 2005
+ * 
+ * Added some general crystallographic calculations and stuff for conus scans 
+ * 
+ * Mark Koennecke, March 2006
  */
 #ifndef SICSUBFOUR
 #define SICSUBFOUR
@@ -73,4 +78,39 @@ typedef struct {
  */
 int searchIndex(lattice direct, double lambda, double two_theta, double max_deviation,
 		int limit, refIndex index[], int maxIndex);  
+/**
+ * calculate the angle between two reflections, given their miller indices
+ * @param B The B metric matrix
+ * @param r1 first reflection
+ * @param r2 second reflection
+ * @return angle between reflections
+ */        
+double angleBetweenReflections(MATRIX B, reflection r1, reflection r2);
+/**
+ * calculate the length of the scattering vector belonging to r
+ * @param B The B metric matrix to use
+ * @param r The reflction for wihic to calculate
+ * @return The length of the scattering vector
+ */
+double scatteringVectorLength(MATRIX B, reflection r);
+/**
+ * build the conversion MATRIX from the Busing Levy psi system (z = UB*h)
+ * to the coordinate system of a given center reflection for a cone
+ * @param r The reflection around which the cone is situated
+ * @param lambda The wavelength
+ * @return A sutiable conversion matrix or NULL in case of errors
+ */
+MATRIX makeInstToConeVectorMatrix(reflection r, double lambda);
+/**
+ * calculate a scattering vector on a cone around a given reflection at a
+ * specified cone rotation angle and a cone opening angle. The center 
+ * reflection of the cone is hidden in the conversion matrix.
+ * @param openingAngle The opening angle of the cone
+ * @param coneAngle The angle on the cone
+ * @param coneToPsi The matrix for the conversion from the cone coordinate
+ * system to the psi instrument coordinate system.
+ * @return a scattering vector on the cone
+ */
+MATRIX calcConeVector(double openingAngle, double coneAngle, 
+    double length, MATRIX coneToPsi);
 #endif