--- DarthVader/TrackerLevel2/src/F77/mini.f	2007/02/19 16:28:39	1.13
+++ DarthVader/TrackerLevel2/src/F77/mini.f	2007/03/28 09:07:26	1.14
@@ -105,7 +105,7 @@
 *     ----------------------------------------------------------
 *     changed in order to evaluate energy-dependent 
 *     tolerances on all 5 parameters
-      FACT=100.                  !scale factor to define tolerance on alfa
+cPP      FACT=1.0e10                  !scale factor to define tolerance on alfa
 c     deflection error (see PDG)
       DELETA1 = 0.01/0.3/0.4/0.4451**2*SQRT(720./(6.+4.))
       DELETA2 = 0.016/0.3/0.4/0.4451*SQRT(0.4451/9.36)
@@ -267,13 +267,15 @@
       ALTOL(3) = DSQRT(ALTOL(1)**2+ALTOL(2)**2)/44.51
       ALTOL(4) = ALTOL(3)        
       
+c$$$      print*,' -- ',(DAL(I),ALTOL(I),' - ',i=1,5) !>>>> new step!
+
 *---- check tolerances: 
 c$$$      DO I=1,5
 c$$$         if(TRKVERBOSE)print*,i,' -- ',DAL(I),ALTOL(I) !>>>> new step!
 c$$$      ENDDO
 c$$$      print*,'chi2 -- ',DCHI2
 
-      IF(ISTEP.LT.3) GOTO 10 ! ***PP***
+      IF(ISTEP.LT.ISTEPMIN) GOTO 10 ! ***PP***
       DO I=1,5
          IF(ABS(DAL(I)).GT.ALTOL(I))GOTO 10 !>>>> new step!
       ENDDO
@@ -364,8 +366,6 @@
      $        print*,'*** WARNING *** in mini n.dof = 0 (set to 1)' 
       endif
 
-      if(TRKDEBUG) print*,'mini2: -ok- ',istep,chi2,1./AL(5)
-
 *     ------------------------------------
 *     Reduced chi^2
       CHI2 = CHI2/dble(ndof)
@@ -374,8 +374,12 @@
 
  11   CONTINUE       
 
+      if(TRKDEBUG) print*,'mini2: -ok- ',istep,chi2,1./AL(5)
+
       NSTEP=ISTEP ! ***PP***
 
+c$$$      print*,'>>>>> NSTEP = ',NSTEP 
+
       RETURN
       END         
 
@@ -636,9 +640,9 @@
 c      
       DIMENSION AL_P(5)
 *     
-      DO I=1,nplanes
-         ZV(I)=ZM(I)            !
-      ENDDO      
+cpp      DO I=1,nplanes
+cpp         ZV(I)=ZM(I)            !
+cpp      ENDDO      
 *     
 *     set parameters for GRKUTA
 *     
@@ -656,7 +660,8 @@
 c$$$      print*,'POSXY (prima) ',vout
 
       DO I=1,nplanes
-         step=vout(3)-zv(i)
+cpp         step=vout(3)-zv(i)
+         step=vout(3)-zm(i)
  10      DO J=1,7
             VECT(J)=VOUT(J)
             VECTINI(J)=VOUT(J)
@@ -822,9 +827,15 @@
       ENDDO
       IFLAG=0                   !no debug mode
       CALL TRICIRCLE(NP,XP,ZP,AP,RP,CHI,XC,ZC,RADIUS,IFLAG)
-c      print*,' circle: ',XC,ZC,RADIUS,' --- ',CHI,IFLAG
+
+c$$$      print*,' circle: ',XC,ZC,RADIUS,' --- ',CHI,IFLAG
+c$$$      print*,' XP ',(xp(i),i=1,np)
+c$$$      print*,' ZP ',(zp(i),i=1,np)
+c$$$      print*,' AP ',(ap(i),i=1,np)
+c$$$      print*,' XP ',(rp(i),i=1,np)
+
       IF(IFLAG.NE.0)GOTO 10 !straigth fit
-      if(CHI.gt.100)GOTO 10 !straigth fit
+c      if(CHI.gt.100)GOTO 10 !straigth fit
       ARG = RADIUS**2-(ZINI-ZC)**2
       IF(ARG.LT.0)GOTO 10       !straigth fit
       DC = SQRT(ARG)      
@@ -834,6 +845,8 @@
       DEF=100./(RADIUS*0.3*0.43)
       IF(XC.GT.0)DEF=-DEF
       
+
+
       IF(ABS(X0).GT.30)THEN
 c$$$         PRINT*,'STRANGE GUESS: XC,ZC,R ',XC,ZC,RADIUS
 c$$$     $     ,' - CHI ',CHI,' - X0,AX,DEF ',X0,AX,DEF