--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f	2009/08/11 12:58:24	1.41
+++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f	2009/12/30 14:22:23	1.44
@@ -528,14 +528,6 @@
 
 
 *     --- and store the results --------------------------------
-         ntrk = ntrk + 1                   !counter of found tracks
-         if(.not.FIMAGE
-     $        .and.iimage.eq.0) image(ntrk)= 0
-         if(.not.FIMAGE
-     $        .and.iimage.ne.0)image(ntrk)=ntrk+1 !this is the image of the next
-         if(FIMAGE)     image(ntrk)=ntrk-1 !this is the image of the previous
-         call fill_level2_tracks(ntrk)     !==> good2=.true.
-
          if(ntrk.eq.NTRKMAX)then
             if(verbose.eq.1)
      $           print*,
@@ -545,6 +537,24 @@
 cc            good2=.false.
             goto 880            !fill ntp and go to next event
          endif
+
+         ntrk = ntrk + 1                   !counter of found tracks
+         if(.not.FIMAGE
+     $        .and.iimage.eq.0) image(ntrk)= 0
+         if(.not.FIMAGE
+     $        .and.iimage.ne.0)image(ntrk)=ntrk+1 !this is the image of the next
+         if(FIMAGE)     image(ntrk)=ntrk-1 !this is the image of the previous
+         call fill_level2_tracks(ntrk)     !==> good2=.true.
+
+c$$$         if(ntrk.eq.NTRKMAX)then
+c$$$            if(verbose.eq.1)
+c$$$     $           print*,
+c$$$     $           '** warning ** number of identified '// 
+c$$$     $           'tracks exceeds vector dimension '
+c$$$     $           ,'( ',NTRKMAX,' )'
+c$$$cc            good2=.false.
+c$$$            goto 880            !fill ntp and go to next event
+c$$$         endif
          if(iimage.ne.0)then
             FIMAGE=.true.       !
             goto 1212           !>>> fit image-track
@@ -3884,7 +3894,21 @@
          if(ip.eq.6.and.ssensor.ne.0)ssensor = 3 - ssensor !notazione paolo x align
          LS(IP,ntr)      = ssensor+10*sladder 
 
-         if(id.ne.0)then
+c         if(id.ne.0)then
+CCCCCC(10 novembre 2009) PATCH X NUCLEI
+C     non ho capito perche', ma durante il ritracciamento dei nuclei 
+C     (quando una traccia viene trovata ma non e' buona) c'e' qualche variabile 
+C     che non viene reinizializzata correttamente e i cluster esclusi 
+C     dal fit risultano ancora inclusi...
+C
+         cltrx(ip,ntr)   = 0
+         cltry(ip,ntr)   = 0
+c$$$         if(
+c$$$     $        xgood_nt(ip,ntr).eq.1.and.ygood_nt(ip,ntr).eq.1
+c$$$     $        .and.
+c$$$     $        id.ne.0)then
+         if(id.ne.0)then        !patch 30/12/09
+
 c           >>> is a couple
             cltrx(ip,ntr)   = clx(nplanes-ip+1,icp_cp(id))
             cltry(ip,ntr)   = cly(nplanes-ip+1,icp_cp(id))
@@ -3923,7 +3947,9 @@
                ypu(ip,ntr)      = corr
             endif
 
-         elseif(icl.ne.0)then
+c$$$         elseif(icl.ne.0)then
+         endif                  !patch 30/12/09
+         if(icl.ne.0)then       !patch 30/12/09
 
             cl_used(icl) = 1    !tag used clusters