Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASDigi on MAIN
MyDigiHitMaker.java+43-11.1 -> 1.2
TrackerHitDriver_sATLAS.java+4-41.1 -> 1.2
+47-5
2 modified files
Latest updates

lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASDigi
MyDigiHitMaker.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MyDigiHitMaker.java	20 Feb 2009 22:43:52 -0000	1.1
+++ MyDigiHitMaker.java	6 Mar 2009 23:52:59 -0000	1.2
@@ -4,8 +4,17 @@
  */
 package org.lcsim.contrib.Partridge.sATLASDigi;
 
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import java.util.HashMap;
 import java.util.List;
 //import org.lcsim.recon.tracking.digitization.sistripsim.TrackerHitDriver_User;
+import java.util.Map;
+import org.lcsim.contrib.Partridge.TrackingTest.LOIEffFake;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.TrackerHit;
+import org.lcsim.fit.helicaltrack.HelicalTrackHit;
 import org.lcsim.recon.vertexing.pixsim.PixilatedSensorManager;
 import org.lcsim.recon.vertexing.pixsim.SensorOption;
 import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver;
@@ -14,6 +23,7 @@
 import org.lcsim.recon.tracking.seedtracker.SeedTracker;
 import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
 import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
 
 /**
  *
@@ -21,6 +31,8 @@
  */
 public class MyDigiHitMaker extends Driver {
 
+    private AIDA aida = AIDA.defaultInstance();
+
     public MyDigiHitMaker() {
 
         //Initialize Nick's Pixel hit making code
@@ -32,6 +44,7 @@
         add(thd);
 
         HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
+        System.out.println("Strip Hit Name: "+thd.getStripHits1DName());
         hitdriver.addCollection(((TrackerHitDriver_sATLAS) thd).getStripHits1DName(), HitType.Digitized);
         hitdriver.addCollection("RecVtxBarrHits", HitType.Base);
         hitdriver.addCollection("RecVtxEndcapHits", HitType.Base);
@@ -40,11 +53,40 @@
         add(hitdriver);
 
         //  Retrieve the track finder's strategy list
-        String sfile = "sATLASBarrel-SM08.xml";
+        String sfile = "sATLASFull-SM08.xml";
         List<SeedStrategy> slist = StrategyXMLUtils.getStrategyListFromResource(
                 StrategyXMLUtils.getDefaultStrategiesPrefix() + sfile);
 
         SeedTracker st = new SeedTracker(slist);
         add(st);
+
+        add(new LOIEffFake());
+    }
+
+    @Override
+    public void process(EventHeader event) {
+
+        super.process(event);
+
+        //  Get the magnetic field
+        Hep3Vector IP = new BasicHep3Vector(0., 0., 0.);
+        double bfield = event.getDetector().getFieldMap().getField(IP).z();
+
+        List<HelicalTrackHit> hitlist = (List<HelicalTrackHit>) event.get("HelicalTrackHits");
+
+        Map<String, Integer> cnts = new HashMap<String, Integer>();
+
+        for (HelicalTrackHit hit : hitlist) {
+            String identifier = hit.getLayerIdentifier();
+            Integer hits = 0;
+            if (!cnts.containsKey(identifier)) cnts.put(identifier, hits);
+            hits = cnts.get(identifier);
+            hits++;
+            cnts.put(identifier, hits);
+        }
+
+        for (String identifier : cnts.keySet()) {
+            aida.cloud1D("Hits in Layer "+identifier).fill(cnts.get(identifier));
+        }
     }
 }

lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/sATLASDigi
TrackerHitDriver_sATLAS.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- TrackerHitDriver_sATLAS.java	20 Feb 2009 22:43:52 -0000	1.1
+++ TrackerHitDriver_sATLAS.java	6 Mar 2009 23:52:59 -0000	1.2
@@ -30,15 +30,15 @@
         _trackerhit_driver.addReadout("SCTShortBarrHits");
         _trackerhit_driver.addReadout("SCTLongBarrHits");
         //_trackerhit_driver.addReadout("VtxEndcapHits");
-//        _trackerhit_driver.addReadout("SCTShortEndcapHits");
-//        _trackerhit_driver.addReadout("SCTLongEndcapHits");
+        _trackerhit_driver.addReadout("SCTShortEndcapHits");
+        _trackerhit_driver.addReadout("SCTLongEndcapHits");
 
         //_trackerhit_driver.addElementToProcess("VtxPixelBarrel");
         _trackerhit_driver.addElementToProcess("SCTShortBarrel");
         _trackerhit_driver.addElementToProcess("SCTLongBarrel");
         //_trackerhit_driver.addElementToProcess("VtxPixelEndcap");
-//        _trackerhit_driver.addElementToProcess("SCTShortEndcap");
-//        _trackerhit_driver.addElementToProcess("SCTLongEndcap");
+        _trackerhit_driver.addElementToProcess("SCTShortEndcap");
+        _trackerhit_driver.addElementToProcess("SCTLongEndcap");
  
         
         super.add( _trackerhit_driver );
CVSspam 0.2.8