--- DarthVader/TrackerLevel2/src/F77/mini.f 2007/05/24 13:29:09 1.17 +++ DarthVader/TrackerLevel2/src/F77/mini.f 2007/06/01 15:01:19 1.18 @@ -67,7 +67,7 @@ c LOGICAL TRKDEBUG,TRKVERBOSE c COMMON/TRKD/TRKDEBUG,TRKVERBOSE - LOGICAL TRKDEBUG,TRKVERBOSE,STUDENT + LOGICAL TRKDEBUG,TRKVERBOSE,STUDENT,FIRSTSTEPS,FIRSTSTUDENT COMMON/TRKD/TRKDEBUG,TRKVERBOSE DIMENSION AL0(5) @@ -76,6 +76,8 @@ * define kind of minimization (0x=chi2+gaussian or 1x=likelihood+student) * STUDENT = .false. + FIRSTSTEPS = .true. + FIRSTSTUDENT = .true. IF(MOD(INT(TRACKMODE/10),10).EQ.1) STUDENT = .true. IF(IPRINT.EQ.1) THEN @@ -144,7 +146,9 @@ * **** Chi2+gaussian minimization * ------------------------------- - IF(.NOT.STUDENT) THEN + IF(.NOT.STUDENT.OR.FIRSTSTEPS) THEN + + IF(ISTEP.GE.3) FIRSTSTEPS = .false. CALL CHISQ(IFLAG,JFAIL) !chi^2 and its derivatives IF(JFAIL.NE.0) THEN @@ -252,7 +256,13 @@ * **** Likelihood+Student minimization * ------------------------------- - IF(STUDENT) THEN + IF(STUDENT.AND.(.NOT.FIRSTSTEPS)) THEN + + IF(FIRSTSTUDENT) THEN + FIRSTSTUDENT = .false. + ISTEP = 1 + ENDIF + CALL CHISQSTT(1,JFAIL) DO I=1,5 DAL(I)=0.