--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2006/10/11 06:53:02 1.7 +++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2006/10/25 16:18:41 1.8 @@ -242,12 +242,13 @@ IDCAND = icand !fitted track-candidate ifail=0 !error flag in chi2 computation jstep=0 !# minimization steps - - call mini_2(jstep,ifail) + iprint=0 + if(DEBUG)iprint=1 + call mini2(jstep,ifail,iprint) if(ifail.ne.0) then if(DEBUG)then print *, - $ '*** MINIMIZATION FAILURE *** (mini_2) ' + $ '*** MINIMIZATION FAILURE *** (mini2) ' $ ,iev endif chi2=-chi2 @@ -1708,6 +1709,13 @@ goto 10 endif * ---------------------------------------------------- +* cut on multiplicity (X VIEW) +* ---------------------------------------------------- + if(mult(icx).ge.mult_x_max)then + cl_single(icx)=0 + goto 10 + endif +* ---------------------------------------------------- * cut BAD (X VIEW) * ---------------------------------------------------- badseed=BAD(VIEW(icx),nvk(MAXS(icx)),nst(MAXS(icx))) @@ -1753,6 +1761,13 @@ goto 20 endif * ---------------------------------------------------- +* cut on multiplicity (X VIEW) +* ---------------------------------------------------- + if(mult(icy).ge.mult_y_max)then + cl_single(icy)=0 + goto 20 + endif +* ---------------------------------------------------- * cut BAD (Y VIEW) * ---------------------------------------------------- badseed=BAD(VIEW(icy),nvk(MAXS(icy)),nst(MAXS(icy))) @@ -2998,12 +3013,14 @@ enddo ifail=0 !error flag in chi^2 computation jstep=0 !number of minimization steps - call mini_2(jstep,ifail) + iprint=0 + if(DEBUG)iprint=1 + call mini2(jstep,ifail,iprint) if(ifail.ne.0) then if(DEBUG)then print *, $ '*** MINIMIZATION FAILURE *** ' - $ //'(mini_2 in clouds_to_ctrack)' + $ //'(mini2 in clouds_to_ctrack)' endif chi2=-chi2 endif @@ -3752,7 +3769,7 @@ c good2=1!.true. chi2_nt(ntr) = sngl(chi2) - nstep_nt(ntr) = 0!nstep + nstep_nt(ntr) = nstep phi = al(4) !(4) sinth = al(3) !(4)