lcsim/src/org/lcsim/contrib/Pelham/Example1

diff -u -r1.1 -r1.2
--- TrackHitHistograms.java	25 Jul 2008 18:29:28 -0000	1.1
+++ TrackHitHistograms.java	25 Jul 2008 22:10:10 -0000	1.2
@@ -76,7 +76,6 @@

             //find the pathlength of the helix directly from the hit
             double pathlength;
             double closer=999999999,difference;

-            double arclength = test.PathMap().get(hit);

             
             List<Double> listd;
             HelixUtils util = new HelixUtils();

@@ -99,22 +98,6 @@

                 pathlength = util.PathToZPlane(fit, hit.z());
                 //System.out.println(arclength+":"+pathlength+"fitmap vs pathcylinderendcap");
             }

-                    
-            
-            /*
-            //find point closest on barrel
-            util.PathToCylinder(fit, r, simr, j);
-           //for endcap for pathlength to given z value
-            util.PathToZPlane(fit, z);
-            util.PointOnHelix(fit, r);
-            
-            HelicalTrackCross cross = new HelicalTrackCross();
-            //HelicalTrackCross From cross you can get two strips
-            //from a strip
-            //u is measuemn
-            //unmeasured coordinite hitutils*/
-            
-            

             
             //varible for easier calculation temp = C*s/2
             double temp = ((calc.getMCOmega()*pathlength)/2);

@@ -139,7 +122,7 @@

             rh = hit.r();
             zh = hit.z();
 

-        if(hit.getLayerIdentifier().startsWith("Tracker"))

+        if(hit.getLayerIdentifier().contains("Tracker"))

             {
                  if(hit.BarrelEndcapFlag().isBarrel())
                     {

@@ -150,7 +133,7 @@

                         aida.histogram1D("MCParticleVSHelicalTrackFit/Residual-Tracker/Barrel/Z/Z-"+hit.getLayerIdentifier()  , 200, -55,55).fill(z-zh);
                     } 
             }

-        if(hit.getLayerIdentifier().startsWith("Tracker"))

+        if(hit.getLayerIdentifier().contains("Tracker"))

             {
                 if(hit.BarrelEndcapFlag().isEndcap())
                     {

@@ -161,7 +144,7 @@

                         aida.histogram1D("MCParticleVSHelicalTrackFit/Residual-Tracker/EndCap/Z/Z-"+hit.getLayerIdentifier()  , 200, -5,5).fill(z-zh);
                     }
             }

-        if(hit.getLayerIdentifier().startsWith("Vertex"))

+        if(hit.getLayerIdentifier().contains("Vertex"))

             {
                   if(hit.BarrelEndcapFlag().isBarrel())
                      {

@@ -172,7 +155,7 @@

                         aida.histogram1D("MCParticleVSHelicalTrackFit/Residual-Vertex/Barrel/Z/Z-"+hit.getLayerIdentifier()  , 200, -55,55).fill(z-zh);
                      }
             }

-        if(hit.getLayerIdentifier().startsWith("Vertex"))

+        if(hit.getLayerIdentifier().contains("Vertex"))

             {
                   if(hit.BarrelEndcapFlag().isEndcap())
                      {

@@ -275,7 +258,7 @@

                       zh   = hit.z();
                       phih = hit.phi();
           

-          if(hit.getLayerIdentifier().startsWith("Tracker"))

+          if(hit.getLayerIdentifier().contains("Tracker"))

           {
                  
                  if(hit.BarrelEndcapFlag().isBarrel())