- Many fixes to the triple axis stuff
* update after a1-a6 drive * intrduction of targets - POLDI writing - Moved HKL calculation 4 TRICS to fourlib
This commit is contained in:
18
t_conv.f
18
t_conv.f
@@ -2,6 +2,11 @@ C------------------------------------------------------------------------
|
||||
C slightly edited version for inclusion into SICS
|
||||
C
|
||||
C Mark Koennecke, November 2000
|
||||
C
|
||||
C Found that ERRESO looks error messages up in a 2D array. Modified IER
|
||||
C values to refer to a 1D array.
|
||||
C
|
||||
C Mark Koennecke, January 2002
|
||||
C-------------------------------------------------------------------------
|
||||
SUBROUTINE INICURVE(MIDX, MRX1, MRX2, AIDX, ARX1, ARX2,
|
||||
+ MMIN, MMAX, AMIN, AMAX)
|
||||
@@ -165,12 +170,12 @@ C
|
||||
IF (LDK(2*IFX-1) .OR. LDK(2*IFX)) THEN
|
||||
LMOAN(IFX) = .TRUE.
|
||||
IF (LDK(2*IFX-1)) THEN
|
||||
IER = 1
|
||||
IER = 1 + 8
|
||||
IF(EDEF(1) .LT. EPS1) GOTO 999
|
||||
IER = 0
|
||||
AKDEF(1) = SQRT(EDEF(1)/F)
|
||||
ELSE
|
||||
IER = 1
|
||||
IER = 1 + 8
|
||||
IF(AKDEF(1) .LT. EPS1) GOTO 999
|
||||
IER = 0
|
||||
EDEF(1) = F*AKDEF(1)**2
|
||||
@@ -193,12 +198,12 @@ C
|
||||
IF (LDK(5-2*IFX) .OR. LDK(6-2*IFX)) THEN
|
||||
LMOAN(3-IFX) = .TRUE.
|
||||
IF (LDK(5-2*IFX)) THEN
|
||||
IER = 1
|
||||
IER = 1 + 8
|
||||
IF(EDEF(2) .LT. EPS4) GOTO 999
|
||||
IER = 0
|
||||
AKDEF(2) = SQRT(EDEF(2)/F)
|
||||
ELSE
|
||||
IER = 1
|
||||
IER = 1 + 8
|
||||
IF(AKDEF(2) .LT. EPS4) GOTO 999
|
||||
IER = 0
|
||||
EDEF(2) = F*AKDEF(2)**2
|
||||
@@ -207,7 +212,7 @@ C
|
||||
ELSEIF (LQHKLE) THEN
|
||||
LMOAN(3-IFX) = .TRUE.
|
||||
EDEF(2) = EDEF(1)+(2*IFX-3)*EN
|
||||
IER = 1
|
||||
IER = 1 + 8
|
||||
IF(EDEF(2) .LT. EPS4) GOTO 999
|
||||
IER = 0
|
||||
AKDEF(2) = SQRT(EDEF(2)/F)
|
||||
@@ -235,6 +240,7 @@ C
|
||||
LDR_ALM = .TRUE.
|
||||
endif
|
||||
ELSE
|
||||
IER = IER + 8
|
||||
GOTO 999
|
||||
ENDIF
|
||||
ENDIF
|
||||
@@ -254,6 +260,7 @@ C
|
||||
LDR_RA = .TRUE.
|
||||
endif
|
||||
ELSE
|
||||
IER = IER + 8
|
||||
GOTO 999
|
||||
ENDIF
|
||||
ENDIF
|
||||
@@ -276,6 +283,7 @@ C
|
||||
LDRA(4) = .TRUE.
|
||||
QM = DQM
|
||||
ELSE
|
||||
IER = IER + 4
|
||||
GOTO 999
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
Reference in New Issue
Block a user