Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
10
vector.h
10
vector.h
@@ -91,12 +91,20 @@ MATRIX vectorCrossProduct(MATRIX v1, MATRIX v2);
|
||||
*/
|
||||
MATRIX matFromTwoVectors(MATRIX v1, MATRIX v2);
|
||||
/**
|
||||
* calculate the nagle between two vectors
|
||||
* calculate the angle between two vectors
|
||||
* @param v1 first vector
|
||||
* @param v2 second vector
|
||||
* @return angle in degree
|
||||
*/
|
||||
double angleBetween(MATRIX v1, MATRIX v2);
|
||||
/**
|
||||
* calculate the angle between two vectors. Try to determine the
|
||||
* sign of the rotation
|
||||
* @param v1 first vector
|
||||
* @param v2 second vector
|
||||
* @return angle in degree
|
||||
*/
|
||||
double tasAngleBetween(MATRIX v1, MATRIX v2);
|
||||
|
||||
/**
|
||||
* scale the vector v with scale
|
||||
|
||||
Reference in New Issue
Block a user