11 modified files
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.2 -r1.3
--- ExampleDriverSiD01.java 26 Jan 2009 20:50:37 -0000 1.2
+++ ExampleDriverSiD01.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -2,8 +2,7 @@
import java.util.logging.Level;
-import org.lcsim.units.clhep.SystemOfUnits;
-
+import org.lcsim.contrib.onoprien.util.constants.Units;
import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.vsegment.algorithm.ChargeCollectorDemo;
@@ -33,7 +32,7 @@
* An example driver that runs tracker hit processing.
*
* @author D. Onoprienko
- * @version $Id: ExampleDriverSiD01.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: ExampleDriverSiD01.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class ExampleDriverSiD01 extends Driver {
@@ -89,14 +88,14 @@
ClustererNearestNeighbor clusterer = new ClustererNearestNeighbor();
clusterDriver.set("CLUSTERER", clusterer);
- HitMakerSmear hitMakerPixels = new HitMakerSmear(5.*SystemOfUnits.micrometer, 5.*SystemOfUnits.micrometer, 0.);
+ HitMakerSmear hitMakerPixels = new HitMakerSmear(5.*Units.micrometer, 5.*Units.micrometer, 0.);
clusterDriver.set("HIT_MAKER", hitMakerPixels, new SensorFilter() {
public boolean pass(Sensor sensor) {
return sensor.getType().getHitType() == ITrackerHit.Type.PIXEL;
}
});
- HitMakerSmear hitMakerStrips = new HitMakerSmear(7.*SystemOfUnits.micrometer, -1., 0.);
+ HitMakerSmear hitMakerStrips = new HitMakerSmear(7.*Units.micrometer, -1., 0.);
clusterDriver.set("HIT_MAKER", hitMakerStrips, new SensorFilter() {
public boolean pass(Sensor sensor) {
return sensor.getType().getHitType() == ITrackerHit.Type.STRIP;
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.2 -r1.3
--- ExampleDriverSiD02.java 26 Jan 2009 20:50:37 -0000 1.2
+++ ExampleDriverSiD02.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -2,8 +2,7 @@
import java.util.logging.Level;
-import org.lcsim.units.clhep.SystemOfUnits;
-
+import org.lcsim.contrib.onoprien.util.constants.Units;
import org.lcsim.contrib.onoprien.util.job.Driver;
import org.lcsim.contrib.onoprien.vsegment.algorithm.ChargeCollectorDemo;
@@ -30,7 +29,7 @@
* An example driver that runs tracker hit processing.
*
* @author D. Onoprienko
- * @version $Id: ExampleDriverSiD02.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: ExampleDriverSiD02.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class ExampleDriverSiD02 extends Driver {
@@ -86,14 +85,14 @@
ClustererNearestNeighbor clusterer = new ClustererNearestNeighbor();
clusterDriver.set("CLUSTERER", clusterer);
- HitMakerSmear hitMakerPixels = new HitMakerSmear(5.*SystemOfUnits.micrometer, 5.*SystemOfUnits.micrometer, 0.);
+ HitMakerSmear hitMakerPixels = new HitMakerSmear(5.*Units.micrometer, 5.*Units.micrometer, 0.);
clusterDriver.set("HIT_MAKER", hitMakerPixels, new SensorFilter() {
public boolean pass(Sensor sensor) {
return sensor.getType().getHitType() == ITrackerHit.Type.PIXEL;
}
});
- HitMakerSmear hitMakerStrips = new HitMakerSmear(7.*SystemOfUnits.micrometer, -1., 0.);
+ HitMakerSmear hitMakerStrips = new HitMakerSmear(7.*Units.micrometer, -1., 0.);
clusterDriver.set("HIT_MAKER", hitMakerStrips, new SensorFilter() {
public boolean pass(Sensor sensor) {
return sensor.getType().getHitType() == ITrackerHit.Type.STRIP;
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.1.1.1 -r1.2
--- SegmenterSiD01.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ SegmenterSiD01.java 27 Jan 2009 20:48:55 -0000 1.2
@@ -1,6 +1,6 @@
package org.lcsim.contrib.onoprien.vsegment;
-import org.lcsim.units.clhep.SystemOfUnits;
+import org.lcsim.contrib.onoprien.util.constants.Units;
import org.lcsim.contrib.onoprien.vsegment.geom.segmenter.CylindricalBarrelSegmenter;
import org.lcsim.contrib.onoprien.vsegment.geom.segmenter.DiskTrackerToWedgesSegmenter;
@@ -14,7 +14,7 @@
* (org.lcsim.onoprien.tracking).
*
* @author D. Onoprienko
- * @version $Id: SegmenterSiD01.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: SegmenterSiD01.java,v 1.2 2009/01/27 20:48:55 onoprien Exp $
*/
public class SegmenterSiD01 extends SubdetectorBasedSegmenter {
@@ -28,32 +28,32 @@
sdName = "VertexBarrel";
CylindricalBarrelSegmenter vtxBarrelSegmenter = new CylindricalBarrelSegmenter(sdName);
- vtxBarrelSegmenter.setStripLength(25.*SystemOfUnits.micrometer);
- vtxBarrelSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ vtxBarrelSegmenter.setStripLength(25.*Units.micrometer);
+ vtxBarrelSegmenter.setStripWidth(25.*Units.micrometer);
setSegmenter(sdName, vtxBarrelSegmenter);
// 10 cm x 25 um strips in outer Tracker Barrel
sdName = "TrackerBarrel";
CylindricalBarrelSegmenter trackerBarrelSegmenter = new CylindricalBarrelSegmenter(sdName);
- trackerBarrelSegmenter.setStripLength(10.*SystemOfUnits.cm);
- trackerBarrelSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ trackerBarrelSegmenter.setStripLength(10.*Units.cm);
+ trackerBarrelSegmenter.setStripWidth(25.*Units.micrometer);
setSegmenter(sdName, trackerBarrelSegmenter);
// 25 um pixels in VTX Endcap
sdName = "VertexEndcap";
DiskTrackerToRingsSegmenter vtxEndcapSegmenter = new DiskTrackerToRingsSegmenter(sdName);
- vtxEndcapSegmenter.setStripLength(25.*SystemOfUnits.micrometer);
- vtxEndcapSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ vtxEndcapSegmenter.setStripLength(25.*Units.micrometer);
+ vtxEndcapSegmenter.setStripWidth(25.*Units.micrometer);
setSegmenter(sdName, vtxEndcapSegmenter);
// 15 degrees stereo wedges in Forward Tracker
sdName = "TrackerForward";
DiskTrackerToWedgesSegmenter trackerForwardSegmenter = new DiskTrackerToWedgesSegmenter(sdName);
- trackerForwardSegmenter.setStripLength(10.*SystemOfUnits.cm);
- trackerForwardSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ trackerForwardSegmenter.setStripLength(10.*Units.cm);
+ trackerForwardSegmenter.setStripWidth(25.*Units.micrometer);
trackerForwardSegmenter.setNumberOfPhiSlices(24);
setSegmenter(sdName, trackerForwardSegmenter);
@@ -62,7 +62,7 @@
sdName = "TrackerEndcap";
DiskTrackerToWedgesSegmenter trackerEndcapSegmenter = new DiskTrackerToWedgesSegmenter(sdName);
trackerEndcapSegmenter.setNumberOfRadialSlices(new int[]{3,5,8,10, 10});
- trackerEndcapSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ trackerEndcapSegmenter.setStripWidth(25.*Units.micrometer);
trackerEndcapSegmenter.setNumberOfPhiSlices(24);
setSegmenter(sdName, trackerEndcapSegmenter);
}
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment
diff -u -r1.1.1.1 -r1.2
--- SegmenterSiD02_01.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ SegmenterSiD02_01.java 27 Jan 2009 20:48:55 -0000 1.2
@@ -1,6 +1,6 @@
package org.lcsim.contrib.onoprien.vsegment;
-import org.lcsim.units.clhep.SystemOfUnits;
+import org.lcsim.contrib.onoprien.util.constants.Units;
import org.lcsim.contrib.onoprien.vsegment.geom.segmenter.CylindricalBarrelSegmenter;
import org.lcsim.contrib.onoprien.vsegment.geom.segmenter.DiskTrackerToWedgesSegmenter;
@@ -14,7 +14,7 @@
* org.lcsim.recon.tracking.seedtracker.ReconTracking.SiD02ReconSegmenter v 1.1 2008/10/16 21:41:18.
*
* @author D. Onoprienko
- * @version $Id: SegmenterSiD02_01.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: SegmenterSiD02_01.java,v 1.2 2009/01/27 20:48:55 onoprien Exp $
*/
public class SegmenterSiD02_01 extends SubdetectorBasedSegmenter {
@@ -28,32 +28,32 @@
sdName = "VertexBarrel";
CylindricalBarrelSegmenter vtxBarrelSegmenter = new CylindricalBarrelSegmenter(sdName);
- vtxBarrelSegmenter.setStripLength(20.*SystemOfUnits.micrometer);
- vtxBarrelSegmenter.setStripWidth(20.*SystemOfUnits.micrometer);
+ vtxBarrelSegmenter.setStripLength(20.*Units.micrometer);
+ vtxBarrelSegmenter.setStripWidth(20.*Units.micrometer);
setSegmenter(sdName, vtxBarrelSegmenter);
// 10 cm x 25 um strips in outer Tracker Barrel
sdName = "TrackerBarrel";
CylindricalBarrelSegmenter trackerBarrelSegmenter = new CylindricalBarrelSegmenter(sdName);
- trackerBarrelSegmenter.setStripLength(9.15*SystemOfUnits.cm);
- trackerBarrelSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ trackerBarrelSegmenter.setStripLength(9.15*Units.cm);
+ trackerBarrelSegmenter.setStripWidth(25.*Units.micrometer);
setSegmenter(sdName, trackerBarrelSegmenter);
// 20 um pixels in VTX Endcap
sdName = "VertexEndcap";
DiskTrackerToRingsSegmenter vtxEndcapSegmenter = new DiskTrackerToRingsSegmenter(sdName);
- vtxEndcapSegmenter.setStripLength(20.*SystemOfUnits.micrometer);
- vtxEndcapSegmenter.setStripWidth(20.*SystemOfUnits.micrometer);
+ vtxEndcapSegmenter.setStripLength(20.*Units.micrometer);
+ vtxEndcapSegmenter.setStripWidth(20.*Units.micrometer);
setSegmenter(sdName, vtxEndcapSegmenter);
// 20 um pixels in Forward Tracker
sdName = "TrackerForward";
DiskTrackerToRingsSegmenter trackerForwardSegmenter = new DiskTrackerToRingsSegmenter(sdName);
- trackerForwardSegmenter.setStripLength(20.*SystemOfUnits.micrometer);
- trackerForwardSegmenter.setStripWidth(20.*SystemOfUnits.micrometer);
+ trackerForwardSegmenter.setStripLength(20.*Units.micrometer);
+ trackerForwardSegmenter.setStripWidth(20.*Units.micrometer);
setSegmenter(sdName, trackerForwardSegmenter);
// 12 degrees stereo wedges in outer Tracker Endcap
@@ -61,7 +61,7 @@
sdName = "TrackerEndcap";
DiskTrackerToWedgesSegmenter trackerEndcapSegmenter = new DiskTrackerToWedgesSegmenter(sdName);
trackerEndcapSegmenter.setNumberOfRadialSlices(new int[]{3,6,9,12});
- trackerEndcapSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
+ trackerEndcapSegmenter.setStripWidth(25.*Units.micrometer);
trackerEndcapSegmenter.setNumberOfPhiSlices(30);
setSegmenter(sdName, trackerEndcapSegmenter);
}
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/geom/segmenter
diff -u -r1.1.1.1 -r1.2
--- CylindricalBarrelSegmenter.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ CylindricalBarrelSegmenter.java 27 Jan 2009 20:48:55 -0000 1.2
@@ -2,16 +2,12 @@
import java.util.*;
-import hep.physics.vec.BasicHep3Vector;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.IGeometryInfo;
-import org.lcsim.detector.ILogicalVolume;
-import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.solids.Tube;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.vsegment.geom.AbstractSegmenter;
import org.lcsim.contrib.onoprien.vsegment.geom.RegionSegmenter;
@@ -28,7 +24,7 @@
*
*
* @author D.Onoprienko
- * @version $Id: CylindricalBarrelSegmenter.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: CylindricalBarrelSegmenter.java,v 1.2 2009/01/27 20:48:55 onoprien Exp $
*/
public class CylindricalBarrelSegmenter extends RegionSegmenter {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/geom/segmenter
diff -u -r1.1.1.1 -r1.2
--- DiskTrackerToRingsSegmenter.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ DiskTrackerToRingsSegmenter.java 27 Jan 2009 20:48:55 -0000 1.2
@@ -9,14 +9,11 @@
import org.lcsim.geometry.Subdetector;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.IGeometryInfo;
-import org.lcsim.detector.ILogicalVolume;
-import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.IRotation3D;
import org.lcsim.detector.Transform3D;
import org.lcsim.detector.Translation3D;
import org.lcsim.detector.Rotation3D;
import org.lcsim.detector.solids.Tube;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.vsegment.geom.AbstractSegmenter;
import org.lcsim.contrib.onoprien.vsegment.geom.RegionSegmenter;
@@ -37,7 +34,7 @@
* {@link #setStereoAngle(double angle)}.
*
* @author D.Onoprienko
- * @version $Id: DiskTrackerToRingsSegmenter.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $
+ * @version $Id: DiskTrackerToRingsSegmenter.java,v 1.2 2009/01/27 20:48:55 onoprien Exp $
*/
public class DiskTrackerToRingsSegmenter extends RegionSegmenter {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/process
diff -u -r1.2 -r1.3
--- CalibrationDriver.java 26 Jan 2009 20:50:37 -0000 1.2
+++ CalibrationDriver.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -4,7 +4,6 @@
import static java.util.logging.Level.*;
import org.lcsim.event.EventHeader;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.ListMap;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
@@ -20,7 +19,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: CalibrationDriver.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: CalibrationDriver.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class CalibrationDriver extends Driver implements VSEventListener {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/process
diff -u -r1.2 -r1.3
--- ClusteringDriver.java 26 Jan 2009 20:50:37 -0000 1.2
+++ ClusteringDriver.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -4,7 +4,6 @@
import static java.util.logging.Level.*;
import org.lcsim.event.EventHeader;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.ListMap;
import org.lcsim.contrib.onoprien.util.job.Driver;
@@ -19,7 +18,7 @@
* Driver that handles clustering of tracker pulses.
*
* @author D. Onoprienko
- * @version $Id: ClusteringDriver.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: ClusteringDriver.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class ClusteringDriver extends Driver implements VSEventListener {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/process
diff -u -r1.2 -r1.3
--- DigitizationDriver.java 26 Jan 2009 20:50:37 -0000 1.2
+++ DigitizationDriver.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -4,7 +4,6 @@
import static java.util.logging.Level.*;
import org.lcsim.event.EventHeader;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.ListMap;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
@@ -20,7 +19,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: DigitizationDriver.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: DigitizationDriver.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class DigitizationDriver extends Driver implements VSEventListener {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/process
diff -u -r1.2 -r1.3
--- NoiseGenerationDriver.java 26 Jan 2009 20:50:37 -0000 1.2
+++ NoiseGenerationDriver.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -4,7 +4,6 @@
import static java.util.logging.Level.*;
import org.lcsim.event.EventHeader;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.ListMap;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
@@ -20,7 +19,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: NoiseGenerationDriver.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: NoiseGenerationDriver.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class NoiseGenerationDriver extends Driver implements VSEventListener {
lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/vsegment/process
diff -u -r1.2 -r1.3
--- ReadoutSimulationDriver.java 26 Jan 2009 20:50:37 -0000 1.2
+++ ReadoutSimulationDriver.java 27 Jan 2009 20:48:55 -0000 1.3
@@ -4,7 +4,6 @@
import static java.util.logging.Level.*;
import org.lcsim.event.EventHeader;
-import org.lcsim.units.clhep.SystemOfUnits;
import org.lcsim.contrib.onoprien.util.ListMap;
import org.lcsim.contrib.onoprien.util.NoSuchParameterException;
@@ -22,7 +21,7 @@
*
*
* @author D.Onoprienko
- * @version $Id: ReadoutSimulationDriver.java,v 1.2 2009/01/26 20:50:37 onoprien Exp $
+ * @version $Id: ReadoutSimulationDriver.java,v 1.3 2009/01/27 20:48:55 onoprien Exp $
*/
public class ReadoutSimulationDriver extends Driver {
CVSspam 0.2.8
