---- eclips_Dec2017.f.orig	2018-09-21 17:50:58.947354695 +0200
-+++ eclips_Dec2017.f	2018-09-21 17:51:23.227141405 +0200
+--- eclips_Dec2017.f.orig	2018-10-08 10:47:29.305440637 +0200
++++ eclips_Dec2017.f	2018-10-08 10:49:06.397996483 +0200
 @@ -120,6 +120,9 @@
  C                      Jul 12, 2018  UPDATE ESTIMATED ECLIPSE START AND END TIME
  C                                    WHEN THEY ARE ESTIMATED FROM A CLOSER

       REAL*8    DABS, ABS, SIGN, DMOD, MAX, MIN
       REAL*8    SGAP(MAXSAT, MAXECL), EGAP(MAXSAT, MAXECL)
       REAL*8    ECLCTM(MAXSAT,MAXECL)
+      REAL*8    BTTAG(MAXSAT, 2), BSMPL(MAXSAT, 2), BINTRP
 C Dec 12, 2013
       REAL*8 YBIAS
       INTEGER*4 IBLK(*), J, I

 C Mar 09, 2016
 C      IF(IPRN.GT.32.AND.ABS(BETADG).LT.ANOON) THEN
        IF(IPRN.GT.32.AND.IPRN.LE.64.AND.ABS(BETADG).LT.ANOON) THEN
@@ -450,14 +461,14 @@
        DET= 180.0D0-ACOS(SVBCOS / COS(BETADG*DTR))/DTR
        IF(ABS(YANGLE).GT.90.0D0) DET= 360.0D0 -DET
 C May 03, 2017 THE ON LIMIT BETADG <= 4 DEG
-C  MEO YS/ON SWITCHING DELTA BETA LIMIT
-       BETAE= .52D0
-C  IGSO YS/ON SWITCHING DELTA BETA LIMIT
-       IF(IBLK(IPRN).EQ.22.OR.IBLK(IPRN).EQ.26) BETAE= .97D0
 C COMPUTE THE ACTUAL BETAE (HERE BETA INCREASE PER 1 REVOLUTION)
-       IF((TTAG-ECLSTM(IPRN,1)).NE.0.D0)
-     & BETAE= (BETADG-BETAINI(IPRN))/(TTAG-ECLSTM(IPRN,1))*360.D0/MURATE
-       BETAE = ABS(BETAE)
+       BETAE = ABS(BETAEV(IPRN, TTAG, BTTAG, BSMPL, P2, V2))
+       IF (BETAE .EQ. 0.0D0) THEN
+C          MEO YS/ON SWITCHING DELTA BETA LIMIT
+           BETAE= .52D0
+C          IGSO YS/ON SWITCHING DELTA BETA LIMIT
+           IF(IBLK(IPRN).EQ.22.OR.IBLK(IPRN).EQ.26) BETAE= .97D0
+       ENDIF
 C ON SWITCH FOR SURE FOR GEO (23/27) OR BETAE LIMIT
        IF(IBLK(IPRN).EQ.23.OR.IBLK(IPRN).EQ.27.OR.ABS(BETADG).LE.(4.1D0-
      &  BETAE)) GO TO 2
@@ -641,7 +652,11 @@
 C           IF(IDIR.GT.0.AND.IPRN.LE.100.AND.ABS(BETADG).LE.0.07D0
          IF(IDIR.GT.0.AND.(IPRN.LE.100.OR.IPRN.EQ.INPRN)
