lcsim/src/org/lcsim/fit/helicaltrack

diff -u -r1.29 -r1.30
--- HelicalTrackHitDriver.java	9 Dec 2008 22:22:35 -0000	1.29
+++ HelicalTrackHitDriver.java	20 Jan 2009 19:18:26 -0000	1.30
@@ -107,7 +107,7 @@

     @Override
     public void process(EventHeader event) {
         super.process(event);

-        

+

         //  Initialize the list of HelicalTrackHits and vector with local z direction
         List<HelicalTrackHit> helhits = new ArrayList<HelicalTrackHit>();
         Hep3Vector lz = new BasicHep3Vector(0., 0., 1.);

@@ -142,14 +142,6 @@

                         throw new RuntimeException("Detector Container is empty!");
                     } else {
                         IDetectorElement de = cont.get(0);

-//                        String detname = ID.getName(de);
-//                        int lyr = ID.getLayer(de);
-//                        BarrelEndcapFlag be = ID.getBarrelEndcapFlag(de);
-                        
-                        //Kludgy fix for layer numbering in sid01
-//                        if (!(detname.indexOf("Vertex") ==-1 && detname.indexOf("Vtx") == -1) && be.isEndcap()) {
-//                            if (event.getDetectorName().indexOf("planar")==-1) lyr/=2;
-//                         }

                         HelicalTrackHit hthit = new HelicalTrack3DHit(pos, cov, hit.getdEdx(), hit.getTime(), hit.getRawHits(),
                                 ID.getName(de), ID.getLayer(de), ID.getBarrelEndcapFlag(de));
                         

lcsim/src/org/lcsim/fit/helicaltrack

diff -u -r1.3 -r1.4
--- HitIdentifier.java	5 Dec 2008 20:25:30 -0000	1.3
+++ HitIdentifier.java	20 Jan 2009 19:18:26 -0000	1.4
@@ -38,10 +38,10 @@

         String detname = getName(de);
         BarrelEndcapFlag beflag = getBarrelEndcapFlag(de);
         int layer = getLayer(de);

-        return detname+layer+beflag;

+        return Identifier(detname, layer, beflag);

     }
     

-    public String Identifier(String detname, int layer, BarrelEndcapFlag beflag) {

+    public static String Identifier(String detname, int layer, BarrelEndcapFlag beflag) {

         String identifier = detname + layer + beflag;
         return identifier;
     }

@@ -51,7 +51,6 @@

         while (de.getParent().getParent() != null) de = de.getParent();
         //  Find the name of this detector
         String detname = de.getName();

-        //System.out.println(detname);

         return detname;
     }