lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/Occupancy

diff -u -r1.1 -r1.2
--- TrackAnalysisDriver.java	7 May 2009 23:59:14 -0000	1.1
+++ TrackAnalysisDriver.java	8 May 2009 01:10:57 -0000	1.2
@@ -29,15 +29,9 @@

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.event.EventHeader;

-import org.lcsim.event.LCRelation;
-import org.lcsim.event.RelationalTable;

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.event.SimTrackerHit;

-import org.lcsim.event.base.BaseRelationalTable;
-import org.lcsim.fit.helicaltrack.HelicalTrackHit;

 import org.lcsim.geometry.Detector;

-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitPixel;
-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 

@@ -165,101 +159,6 @@

                 i++;
             }
         }

-        List<SiTrackerHitStrip1D> stripHits = event.get(SiTrackerHitStrip1D.class, "StripClusterer_SiTrackerHitStrip1D");
-        List<SiTrackerHitPixel> pixelHits = event.get(SiTrackerHitPixel.class, "PixelClusterer_SiTrackerHitPixel");
-        List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, "RawTrackerHitMaker_RawTrackerHits");
-        List<HelicalTrackHit> hthits = event.get(HelicalTrackHit.class, "HelicalTrackHits");
-        Map<String, Integer> occupancyMap = new HashMap<String, Integer>();
-        for (RawTrackerHit rh : rawHits) {
-            IDetectorElement rhDetE = rh.getDetectorElement();
-
-            String rhDetName = rhDetE.getName();
-//          System.out.println(rhDetName);
-            int rhLayer = rh.getLayerNumber();
-//            String[] shortrhDetName=rhDetName.split("^[A-Z]+_layer[0-9]");
-
-
-            for (String myname : detNames) {
-                if (rhDetName.contains(myname)) {
-                    String detlayer = myname + "_" + rhLayer;
-                    Integer myint = occupancyMap.get(detlayer);
-                    if (myint == null) {
-                        myint = 1;
-                    }
-                    myint++;
-                    occupancyMap.put(detlayer, myint);
-                }
-            }
-        }
-        Set<String> mykeyset = (Set<String>) occupancyMap.keySet();
-        for (String keys : mykeyset) {
-            aida.cloud1D(occDir + keys + " # of hits").fill(occupancyMap.get(keys));
-        }
-        int detNum = 0;
-        int layerNum = 0;
-        for (SiTrackerHitPixel stripCluster : pixelHits) {
-            Hep3Vector strCluPos = stripCluster.getPositionAsVector();
-            double rHit = Math.sqrt(strCluPos.x() * strCluPos.x() + strCluPos.y() * strCluPos.y());
-            double zHit = strCluPos.z();
-            double etaHit = -Math.log(Math.tan(Math.atan2(rHit, zHit) / 2));
-            List<RawTrackerHit> rthList = stripCluster.getRawHits();
-            int nhits = rthList.size();
-            String detlayer = "Foobar";
-            for (RawTrackerHit rth : rthList) {
-                IDetectorElement rhDetE = rth.getDetectorElement();
-                String rhDetName = rhDetE.getName();
-                int rhLayer = rth.getLayerNumber();
-                for (String myname : detNames) {
-                    if (rhDetName.contains(myname)) {
-                        detlayer = myname + "_layer" + rhLayer;
-                    }
-                }
-            }
-//            System.out.println(detlayer);
-            clsizeMap.get(detlayer).fill(etaHit, nhits);
-            aida.cloud1D(occDir + detlayer + " cluster size").fill(nhits);
-//            ClusterSize[detNum][layerNum].fill(etaHit, nhits);
-
-        }
-        for (SiTrackerHitStrip1D stripCluster : stripHits) {
-            Hep3Vector strCluPos = stripCluster.getPositionAsVector();
-            double rHit = Math.sqrt(strCluPos.x() * strCluPos.x() + strCluPos.y() * strCluPos.y());
-            double zHit = strCluPos.z();
-            double etaHit = -Math.log(Math.tan(Math.atan2(rHit, zHit) / 2));
-            List<RawTrackerHit> rthList = stripCluster.getRawHits();
-            int nhits = rthList.size();
-            String detlayer = "Foobar";
-            for (RawTrackerHit rth : rthList) {
-                IDetectorElement rhDetE = rth.getDetectorElement();
-                String rhDetName = rhDetE.getName();
-                int rhLayer = rth.getLayerNumber();
-                for (String myname : detNames) {
-                    if (rhDetName.contains(myname)) {
-                        detlayer = myname + "_layer" + rhLayer;
-                    }
-                }
-            }
-//               System.out.println(detlayer);
-            clsizeMap.get(detlayer).fill(etaHit, nhits);
-            aida.cloud1D(occDir + detlayer + " cluster size").fill(nhits);
-        }
-        for (HelicalTrackHit HelTrHit : hthits) {
-        }
-
-
-        //  Create a relational table that maps TrackerHits to MCParticles
-        RelationalTable hittomc = new BaseRelationalTable(RelationalTable.Mode.MANY_TO_MANY, RelationalTable.Weighting.UNWEIGHTED);
-        List<LCRelation> mcrelations = event.get(LCRelation.class, "HelicalTrackMCRelations");
-        for (LCRelation relation : mcrelations) {
-            hittomc.add(relation.getFrom(), relation.getTo());
-        }
-
-        //  Now loop over all MC Particles
-
-
-
-
-

         return;
     }