--- DarthVader/TrackerLevel2/src/F77/mini.f 2007/06/06 09:26:09 1.19 +++ DarthVader/TrackerLevel2/src/F77/mini.f 2008/01/15 14:22:45 1.20 @@ -72,6 +72,11 @@ DIMENSION AL0(5) LOGICAL SUCCESS_NEW,SUCCESS_OLD + +c$$$ PRINT*,'==========' ! TEST +c$$$ PRINT*,'START MINI' ! TEST +c$$$ PRINT*,'==========' ! TEST + * * define kind of minimization (0x=chi2+gaussian or 1x=likelihood+student) * @@ -96,18 +101,20 @@ * ---------------------------------------------------------- AVRESX = RESXAV AVRESY = RESYAV + NX = 0.0 + NY = 0.0 DO IP=1,6 IF( XGOOD(IP).EQ.1 )THEN - NX=NX+1 + NX=NX+1.0 AVRESX=AVRESX+RESX(IP) ENDIF - IF(NX.NE.0)AVRESX=AVRESX/NX IF( YGOOD(IP).EQ.1 )THEN - NY=NY+1 + NY=NY+1.0 AVRESY=AVRESY+RESY(IP) ENDIF - IF(NX.NE.0)AVRESY=AVRESY/NY ENDDO + IF(NX.NE.0.0)AVRESX=AVRESX/NX + IF(NY.NE.0.0)AVRESY=AVRESY/NY * ---------------------------------------------------------- * define ALTOL(5) ---> tolerances on state vector @@ -993,14 +1000,26 @@ c$$$ print*,'POSXY (prima) ',vout DO I=1,nplanes -cpp step=vout(3)-zv(i) - step=vout(3)-zm(i) +c$$$ ipass = 0 ! TEST +c$$$ PRINT *,'TRACKING -> START PLANE: ',I ! TEST +cPPP step=vout(3)-zm(i) +cPP step=(zm(i)-vout(3))/VOUT(6) 10 DO J=1,7 VECT(J)=VOUT(J) VECTINI(J)=VOUT(J) ENDDO +cPPP step=vect(3)-zm(i) + IF(VOUT(6).GE.0.) THEN + IFAIL=1 + if(TRKVERBOSE) + $ PRINT *,'posxy (grkuta): WARNING ===> backward track!!' + RETURN + ENDIF + step=(zm(i)-vect(3))/VOUT(6) 11 continue CALL GRKUTA(CHARGE,STEP,VECT,VOUT) +c$$$ ipass = ipass + 1 ! TEST +c$$$ PRINT *,'TRACKING -> STEP: ',ipass,' LENGHT: ', STEP ! TEST IF(VOUT(3).GT.VECT(3)) THEN IFAIL=1 if(TRKVERBOSE) @@ -1042,6 +1061,7 @@ VOUT(7) = VOUT(7) * 0.997 !0.9968 * ----------------------------------------------- ENDIF +c$$$ PRINT *,'TRACKING -> END' ! TEST ENDDO