lcsim/src/org/lcsim/contrib/seedtracker
diff -N SmearMCHits.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SmearMCHits.java 4 Feb 2008 22:00:41 -0000 1.4
@@ -0,0 +1,51 @@
+/*
+ * SmearMCHits.java
+ *
+ * Created on July 12, 2006, 10:25 AM
+ *
+ * To change this template, choose Tools | Template Manager
+ * and open the template in the editor.
+ */
+
+package org.lcsim.contrib.seedtracker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lcsim.contrib.tracking.TrackerHitCheater;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.SimTrackerHit;
+import org.lcsim.event.TrackerHit;
+import org.lcsim.util.Driver;
+
+/**
+ * Create cheated and smeared TrackerHits from all collections of SimTrackerHits
+ * @author partridge
+ */
+public class SmearMCHits extends Driver{
+
+ TrackerHitCheater cheater = new TrackerHitCheater();
+
+ /** Creates a new instance of SmearMCHits */
+ public SmearMCHits() {
+ }
+
+ /**
+ * Process the current event
+ * @param event EventHeader for this event
+ */
+ public void process(EventHeader event) {
+
+ // Initialize the TrackerHit list
+ List<TrackerHit> allhits = new ArrayList<TrackerHit>();
+ // Get the SimTrackerHit collections
+ List<List<SimTrackerHit>> allgenhits = event.get(SimTrackerHit.class);
+ // Loop over the various hit collections
+ for (List<SimTrackerHit> genhitcol : allgenhits) {
+ List<TrackerHit> hits = cheater.makeTrackerHits(genhitcol);
+ allhits.addAll(hits);
+ }
+ // Put the list of TrackerHits into the event
+ event.put("TrackerHit",allhits,TrackerHit.class,0);
+ }
+}
lcsim/src/org/lcsim/contrib/seedtracker
diff -u -r1.1 -r1.2
--- MultipleScattering.java 4 Feb 2008 20:51:32 -0000 1.1
+++ MultipleScattering.java 4 Feb 2008 22:00:41 -0000 1.2
@@ -126,6 +126,7 @@
double angle = msangle(helix.p(_bfield), radlen);
scatters.add(new ScatterAngle(s, angle));
System.out.println(" Found disk material at s = "+s+" r = "+r+" z = "+disk.z());
+ System.out.println("Disk location: "+disk.z()+" Helix z: "+pos.z());
}
}
}
@@ -149,6 +150,8 @@
double angle = msangle(helix.p(_bfield), radlen);
scatters.add(new ScatterAngle(s, angle));
System.out.println(" Found cyl material at s = "+s+" r = "+r+" z = "+pos.z());
+ double rh = Math.sqrt(Math.pow(pos.x(),2)+Math.pow(pos.y(),2));
+ System.out.println("Cylinder radius: "+r+" Helix r: "+rh);
}
}
}