4 modified files
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/DataTrackerHitDriver.java 2014-10-09 23:53:40 UTC (rev 1164)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/DataTrackerHitDriver.java 2014-10-10 05:15:14 UTC (rev 1165)
@@ -5,7 +5,6 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
@@ -230,13 +229,6 @@
// toString());
event.put(this.stripHitOutputCollectionName, stripHits1D, SiTrackerHitStrip1D.class, 0, toString());
if (debug) {
- for (int mod = 0; mod < 2; mod++) {
- for (int layer = 0; layer < 10; layer++) {
- counts[mod][layer] += SvtUtils.getInstance().getSensor(mod, layer).getReadout().getHits(SiTrackerHit.class).size();
- }
- }
- }
- if (debug) {
System.out.println("[ DataTrackerHitDriver ] - " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits.");
}
}
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/MaterialSupervisor.java 2014-10-09 23:53:40 UTC (rev 1164)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/MaterialSupervisor.java 2014-10-10 05:15:14 UTC (rev 1165)
@@ -6,7 +6,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.IGeometryInfo;
import org.lcsim.detector.ILogicalVolume;
@@ -78,9 +77,6 @@
SiStripPlane plane = new SiStripPlane(module);
- if (DEBUG) {
- System.out.printf("%s: %5d %32s %15.2fx%.2f %10.2f %10.3f %10s\n", this.getClass().getSimpleName(), plane.getId(), plane.origin().toString(), plane.getUnmeasuredDimension(), plane.getMeasuredDimension(), plane.getThickness(), plane.getThicknessInRL() * 100, SvtUtils.getInstance().isAxial(module) ? "axial" : "stereo");
- }
_detectorVolumes.add(plane);
}
if (DEBUG) {
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java 2014-10-09 23:53:40 UTC (rev 1164)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java 2014-10-10 05:15:14 UTC (rev 1165)
@@ -1,6 +1,5 @@
package org.hps.recon.tracking;
-//--- hep ---//
import hep.physics.matrix.SymmetricMatrix;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Matrix;
@@ -13,16 +12,14 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.BeamlineConstants;
-import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.solids.Box;
import org.lcsim.detector.solids.Point3D;
import org.lcsim.detector.solids.Polygon3D;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.MCParticle;
import org.lcsim.event.RawTrackerHit;
-//--- org.lcsim ---//
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
@@ -35,6 +32,8 @@
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.swim.Helix;
+import org.hps.conditions.deprecated.BeamlineConstants;
+//===> import org.hps.conditions.deprecated.SvtUtils;
/**
* Assorted helper functions for the track and helix objects in lcsim. Re-use as much of HelixUtils
@@ -338,7 +337,6 @@
Box sensorSolid = (Box) sensor.getGeometry().getLogicalVolume().getSolid();
Polygon3D sensorFace = sensorSolid.getFacesNormalTo(new BasicHep3Vector(0, 0, 1)).get(0);
if (debug) {
- System.out.println("sensorContainsTrack: Sensor: " + SvtUtils.getInstance().getDescription(sensor));
System.out.println("sensorContainsTrack: Track Position: " + trackPosition.toString());
}
@@ -543,7 +541,9 @@
List<TrackerHit> hitsOnTrack = track.getTrackerHits();
for (TrackerHit hit : hitsOnTrack) {
HelicalTrackHit hth = (HelicalTrackHit) hit;
- if (SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit) hth.getRawHits().get(0)).getDetectorElement())) {
+ //===> if (SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit) hth.getRawHits().get(0)).getDetectorElement())) {
+ HpsSiSensor sensor = ((HpsSiSensor) ((RawTrackerHit) hth.getRawHits().get(0)));
+ if(sensor.isTopLayer()){
n[0] = n[0] + 1;
} else {
n[1] = n[1] + 1;
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/TrackerHitUtils.java 2014-10-09 23:53:40 UTC (rev 1164)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/TrackerHitUtils.java 2014-10-10 05:15:14 UTC (rev 1165)
@@ -11,7 +11,8 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.SvtUtils;
+
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.identifier.ExpandedIdentifier;
@@ -20,6 +21,7 @@
import org.lcsim.detector.identifier.IIdentifierDictionary;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
import org.lcsim.event.RawTrackerHit;
@@ -31,7 +33,6 @@
/**
*
* @author Per Hansson <[log in to unmask]>
- * @version $Id: TrackerHitUtils.java,v 1.4 2013/10/15 00:33:53 phansson Exp $
*/
// TODO: Add class documentation.
public class TrackerHitUtils {
@@ -269,7 +270,8 @@
IIdentifierDictionary dictionary = helper.getIdentifierDictionary();
// Fill in the layer number
- id.setValue(dictionary.getFieldIndex("layer"), SvtUtils.getInstance().getLayerNumber(sensor));
+ //===> id.setValue(dictionary.getFieldIndex("layer"), SvtUtils.getInstance().getLayerNumber(sensor));
+ id.setValue(dictionary.getFieldIndex("layer"), ((HpsSiSensor) sensor).getLayerNumber());
// Pack and return the identifier
return helper.pack(id);
SVNspam 0.1