--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2007/09/04 15:44:49 1.32 +++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2007/11/27 15:28:57 1.33 @@ -1053,7 +1053,7 @@ if(icx.gt.nclstr1.or.icy.gt.nclstr1)then print*,'xyzpam: ***WARNING*** clusters ',icx,icy - $ ,' does not exists (nclstr1=',nclstr1,')' + $ ,' do not exists (n.clusters=',nclstr1,')' icx = -1*icx icy = -1*icy return @@ -3153,8 +3153,8 @@ if(LADDER(icx).ne.nldt.or. !If the ladder number does not match c $ cl_used(icx).eq.1.or. !or the X cluster is already used c $ cl_used(icy).eq.1.or. !or the Y cluster is already used - $ cl_used(icx).ne.0.or. !or the X cluster is already used !(3) - $ cl_used(icy).ne.0.or. !or the Y cluster is already used !(3) + $ cl_used(icx).ne.0.or. !or the X cluster is already used + $ cl_used(icy).ne.0.or. !or the Y cluster is already used $ .false.)goto 1188 !then jump to next couple. * call xyz_PAM(icx,icy,ist, @@ -3787,11 +3787,11 @@ elseif(icl.ne.0)then + cl_used(icl) = 1 !tag used clusters if(mod(VIEW(icl),2).eq.0)then cltrx(ip,ntr)=icl - xbad(ip,ntr) = nbadstrips(4,icl) if(nsatstrips(icl).gt.0)dedx_x(ip,ntr)=-dedx_x(ip,ntr) @@ -3805,7 +3805,6 @@ elseif(mod(VIEW(icl),2).eq.1)then cltry(ip,ntr)=icl - ybad(ip,ntr) = nbadstrips(4,icl) if(nsatstrips(icl).gt.0)dedx_y(ip,ntr)=-dedx_y(ip,ntr) @@ -3919,24 +3918,7 @@ * associati ad una traccia, e permettere di salvare * solo questi nell'albero di uscita * -------------------------------------------------- - - -c$$$ print*,' cl ',icl,' --> ',cl_used(icl) -c$$$ -c$$$ if( cl_used(icl).ne.0 )then -c$$$ if( -c$$$ $ mod(VIEW(icl),2).eq.0.and. -c$$$ $ cltrx(ip,whichtrack(icl)).ne.icl ) -c$$$ $ print*,'**WARNING** cltrx(',ip,',',whichtrack(icl) -c$$$ $ ,')=',cltrx(ip,whichtrack(icl)),'.ne.',icl -c$$$ if( -c$$$ $ mod(VIEW(icl),2).eq.1.and. -c$$$ $ cltry(ip,whichtrack(icl)).ne.icl ) -c$$$ $ print*,'**WARNING** cltry(',ip,',',whichtrack(icl) -c$$$ $ ,')=',cltry(ip,whichtrack(icl)),'.ne.',icl -c$$$ endif - - + enddo end