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

cone.c

@@ -171,7 +171,6 @@ static long ConeSetValue(void *pData, SConnection * pCon, float fVal)
    */
   SICSHdbGetPar(obj, pCon, "target", &v);
   target.h = v.v.floatArray[0];
-  target.k = v.v.floatArray[1];
   target.l = v.v.floatArray[2];
   SICSHdbGetPar(obj, pCon, "qscale", &v);
   /*
@@ -198,7 +197,7 @@ static long ConeSetValue(void *pData, SConnection * pCon, float fVal)
   mat_free(csToPsi);
   if (status != 1) {
     SCWrite(pCon, "ERROR: cannot get cone vector into scattering position",
-            eError);
+            eLogError);
     SCSetInterrupt(pCon, eAbortOperation);
     return 0;
   }