--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f	2007/11/27 15:28:57	1.33
+++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f	2008/11/20 15:06:26	1.35
@@ -713,7 +713,7 @@
       xPAM_B = 0.D0
       yPAM_B = 0.D0
       zPAM_B = 0.D0
-c      print*,'## xyz_PAM: ',icx,icy,sensor,PFAx,PFAy,angx,angy
+cc      print*,'## xyz_PAM: ',icx,icy,sensor,PFAx,PFAy,angx,angy
 
       if(sensor.lt.1.or.sensor.gt.2)then
          print*,'xyz_PAM   ***ERROR*** wrong input '
@@ -805,7 +805,7 @@
 
  20   endif
 
-c$$$      print*,'## stripx,stripy ',stripx,stripy
+cc      print*,'## stripx,stripy ',stripx,stripy
 
 c===========================================================
 C     COUPLE
@@ -1127,13 +1127,25 @@
          resx(ip)  = 1000.
          resy(ip)  = resyPAM
 
+cPP --- old ---
+c$$$         xm(ip) = -100.
+c$$$         ym(ip) = -100.
+c$$$         zm(ip) = (zPAM_A+zPAM_B)/2.
+c$$$         xm_A(ip) = xPAM_A
+c$$$         ym_A(ip) = yPAM_A
+c$$$         xm_B(ip) = xPAM_B
+c$$$         ym_B(ip) = yPAM_B
+cPP --- new ---
          xm(ip) = -100.
          ym(ip) = -100.
-         zm(ip) = (zPAM_A+zPAM_B)/2.
+         zm(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4
          xm_A(ip) = xPAM_A
          ym_A(ip) = yPAM_A
+         zm_A(ip) = zPAM_A
          xm_B(ip) = xPAM_B
          ym_B(ip) = yPAM_B
+         zm_B(ip) = zPAM_B
+cPP -----------
 
 c         zv(ip) = (zPAM_A+zPAM_B)/2.
          
@@ -1158,14 +1170,26 @@
          resx(ip)  = resxPAM
          resy(ip)  = 1000.
 
+cPP --- old ---
+c$$$         xm(ip) = -100.
+c$$$         ym(ip) = -100.
+c$$$         zm(ip) = (zPAM_A+zPAM_B)/2.
+c$$$         xm_A(ip) = xPAM_A
+c$$$         ym_A(ip) = yPAM_A
+c$$$         xm_B(ip) = xPAM_B
+c$$$         ym_B(ip) = yPAM_B
+cPP --- new ---
          xm(ip) = -100.
          ym(ip) = -100.
-         zm(ip) = (zPAM_A+zPAM_B)/2.
+         zm(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4
          xm_A(ip) = xPAM_A
          ym_A(ip) = yPAM_A
+         zm_A(ip) = zPAM_A
          xm_B(ip) = xPAM_B
          ym_B(ip) = yPAM_B
-         
+         zm_B(ip) = zPAM_B
+cPP -----------
+
 c         zv(ip) = (zPAM_A+zPAM_B)/2.
 
       else
@@ -3052,6 +3076,8 @@
       call track_init
       do ip=1,nplanes           !loop on planes
 
+         if(DEBUG.EQ.1)print*,' ........... plane ',ip,' ........... '
+
          xP=XV_STORE(nplanes-ip+1,ibest)
          yP=YV_STORE(nplanes-ip+1,ibest)
          zP=ZV_STORE(nplanes-ip+1,ibest)
@@ -3300,6 +3326,7 @@
 *----- single clusters -----------------------------------------------   
 c            print*,'## ncls(',ip,') ',ncls(ip)
             do ic=1,ncls(ip)    !loop on single clusters
+c               print*,'-',ic,'-'
                icl=cls(ip,ic)
 c               if(cl_used(icl).eq.1.or.     !if the cluster is already used 
                if(cl_used(icl).ne.0.or.     !if the cluster is already used !(3)
@@ -3388,9 +3415,13 @@
 *     ----------------------------
                   xm_A(nplanes-ip+1) = xmm_A
                   ym_A(nplanes-ip+1) = ymm_A
+                  zm_A(nplanes-ip+1) = zmm_A
                   xm_B(nplanes-ip+1) = xmm_B
                   ym_B(nplanes-ip+1) = ymm_B
+                  zm_B(nplanes-ip+1) = zmm_B
                   zm(nplanes-ip+1) = (zmm_A+zmm_B)/2.
+c$$$                  zm(nplanes-ip+1) =
+c$$$     $                 z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4
                   dedxtrk_x(nplanes-ip+1) = dedxmmx !<<<
                   dedxtrk_y(nplanes-ip+1) = dedxmmy !<<<
 *     ----------------------------
@@ -3559,6 +3590,10 @@
         ys(1,ip)=0
         ys(2,ip)=0
         sgnlys(ip)=0
+        sxbad(ip)=0
+        sybad(ip)=0
+        multmaxsx(ip)=0
+        multmaxsy(ip)=0
       enddo
       end
 
@@ -3872,12 +3907,19 @@
          ip=nplanes-npl(VIEW(icl))+1            
          
          if(cl_used(icl).eq.0)then !cluster not included in any track
+
             if(mod(VIEW(icl),2).eq.0)then !=== X views
+
                nclsx = nclsx + 1
                planex(nclsx) = ip
                sgnlxs(nclsx) = sgnl(icl)/mip(VIEW(icl),LADDER(icl))
                if(nsatstrips(icl).gt.0)sgnlxs(nclsx)=-sgnlxs(nclsx)
                clsx(nclsx)   = icl
+               sxbad(nclsx)  = nbadstrips(1,icl)
+               multmaxsx(nclsx) = maxs(icl)+10000*mult(icl)
+               
+cc               print*,icl,' >>>> ',sxbad(nclsx)
+
                do is=1,2
 c                  call xyz_PAM(icl,0,is,'COG1',' ',0.,0.)
 c                  call xyz_PAM(icl,0,is,PFAdef,' ',0.,0.)
@@ -3895,6 +3937,11 @@
                sgnlys(nclsy) = sgnl(icl)/mip(VIEW(icl),LADDER(icl))
                if(nsatstrips(icl).gt.0)sgnlys(nclsy)=-sgnlys(nclsy)
                clsy(nclsy)   = icl
+               sybad(nclsy)  = nbadstrips(1,icl)
+               multmaxsy(nclsy) = maxs(icl)+10000*mult(icl)
+
+cc               print*,icl,' >>>> ',sybad(nclsy)
+
                do is=1,2
 c                  call xyz_PAM(0,icl,is,' ','COG1',0.,0.)
 c                  call xyz_PAM(0,icl,is,' ',PFAdef,0.,0.)