--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f	2014/01/17 10:14:38	1.46
+++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f	2014/06/04 07:57:04	1.47
@@ -1046,15 +1046,17 @@
          ipy=npl(VIEW(icy))
          
          if( (nplanes-ipx+1).ne.ip )then
-            print*,'xyzpam: ***WARNING*** cluster ',icx
-     $           ,' does not belong to plane: ',ip
+            print*,'xyzpam: ***WARNING*** cluster icx=',icx
+     $           ,' belongs to plane ',(nplanes-ipx+1)            
+     $           ,' and not ',ip
             icx = -1*icx
             return
          endif
          if( (nplanes-ipy+1).ne.ip )then
-            print*,'xyzpam: ***WARNING*** cluster ',icy
-     $           ,' does not belong to plane: ',ip
-            icy = -1*icy
+            print*,'xyzpam: ***WARNING*** cluster icy=',icy
+     $           ,' belongs to plane ',(nplanes-ipy+1)            
+     $           ,' and not ',ip
+             icy = -1*icy
             return
          endif
 
@@ -1070,8 +1072,10 @@
          zm(ip) = zPAM
          xm_A(ip) = 0.D0
          ym_A(ip) = 0.D0
+         zm_A(ip) = 0.D0
          xm_B(ip) = 0.D0
          ym_B(ip) = 0.D0
+         zm_B(ip) = 0.D0
 
 c         zv(ip) = zPAM
 
@@ -1079,8 +1083,9 @@
 
          ipy=npl(VIEW(icy))
          if( (nplanes-ipy+1).ne.ip )then
-            print*,'xyzpam: ***WARNING*** cluster ',icy
-     $           ,' does not belong to plane: ',ip
+            print*,'xyzpam: ***WARNING*** cluster icy=',icy
+     $           ,' belongs to plane ',(nplanes-ipy+1)            
+     $           ,' and not ',ip
             icy = -1*icy
             return
          endif
@@ -1100,8 +1105,10 @@
          zm(ip) = zPAM
          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
 
 c         zv(ip) = (zPAM_A+zPAM_B)/2.
          
@@ -1110,8 +1117,9 @@
          ipx=npl(VIEW(icx))
 
          if( (nplanes-ipx+1).ne.ip )then
-            print*,'xyzpam: ***WARNING*** cluster ',icx
-     $           ,' does not belong to plane: ',ip
+            print*,'xyzpam: ***WARNING*** cluster icx=',icx
+     $           ,' belongs to plane ',(nplanes-ipx+1)            
+     $           ,' and not ',ip
             icx = -1*icx
             return
          endif
@@ -1131,8 +1139,10 @@
          zm(ip) = zPAM
          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
          
 c         zv(ip) = (zPAM_A+zPAM_B)/2.
 
@@ -1153,8 +1163,10 @@
          zm(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4
          xm_A(ip) = 0.
          ym_A(ip) = 0.
+         zm_A(ip) = 0.
          xm_B(ip) = 0.
          ym_B(ip) = 0.
+         zm_B(ip) = 0.
 
 c         zv(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4