- Improved centering in DIFRAC

- Fixed a bug in UserWait
- Improved scan message in scancom
- Added zero point correction in lin2ang
- fixed an issue with uuencoded messages

difrac/wxw2t.f

@@ -8,7 +8,13 @@ C-----------------------------------------------------------------------
       SUBROUTINE WXW2T (DT,DO,DC,ISLIT)
       INCLUDE 'COMDIF'
       DIMENSION ANG(4)
-      CALL SHUTTR (99)       
+      CALL SHUTTR (99)
+C----- a fixed value for PHI alignement, MK   
+      DP = .1  
+C----- debug message: MK   
+      WRITE(COUT,22)DT, DO, DC
+ 22   FORMAT('STEP OM: ',F8.2,' Step TH: ',F8.2,' Step CH: ',F8.2)
+      CALL GWRITE(ITP,' ')
 C-----------------------------------------------------------------------
 C  For the CAD-4 centering is as follows :--
 C    1. an omega/2theta scan with the 4mm variable slit,
@@ -43,17 +49,25 @@ C-----------------------------------------------------------------------
         CALL CENTRE (DC,ANG,0)
         IF (KI .EQ. 'FF') GO TO 100
 C-----------------------------------------------------------------------
+C  Align Phi
+C----------------------------------------------------------------------
+       KI = 'SP'
+       CALL CENTRE(DP,ANG,0)
+       IF (KI .EQ. 'FF') GO TO 100
+C-----------------------------------------------------------------------
 C  Omega again
 C-----------------------------------------------------------------------
         KI = 'SO'
         CALL CENTRE (DO,ANG,0)
         IF (KI .EQ. 'FF') GO TO 100
+        IF (KI .EQ. 'FP') GO TO 100
 C-----------------------------------------------------------------------
 C  Align 2Theta
 C----------------------------------------------------------------------
         KI = 'ST'
         CALL CENTRE (DT,ANG,0)
         IF (KI .EQ. 'FF') GO TO 100
+        IF (KI .EQ. 'FP') GO TO 100
       ENDIF
 C-----------------------------------------------------------------------
 C  The answers are passed in BPSI in COMMON