java/branches/hps-java_HPSJAVA-88/analysis/src/main/java/org/hps/analysis/examples
--- java/branches/hps-java_HPSJAVA-88/analysis/src/main/java/org/hps/analysis/examples/LCIOTrackAnalysis.java 2014-10-09 08:02:13 UTC (rev 1158)
+++ java/branches/hps-java_HPSJAVA-88/analysis/src/main/java/org/hps/analysis/examples/LCIOTrackAnalysis.java 2014-10-09 17:03:40 UTC (rev 1159)
@@ -8,7 +8,8 @@
import java.util.Map;
import java.util.Set;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.MCParticle;
@@ -20,7 +21,6 @@
/**
*
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: LCIOTrackAnalysis.java,v 1.3 2013/10/24 18:11:43 meeg Exp $
*/
public class LCIOTrackAnalysis {
@@ -73,15 +73,19 @@
int module = -1;
List<RawTrackerHit> rawHits = cl.getRawHits();
// System.out.println("RawHits: " + rawHits.size());
+ HpsSiSensor sensor = null;
for (RawTrackerHit rawHit : rawHits) {
// System.out.println(rawHit.getCellID());
IIdentifier id = new Identifier(rawHit.getCellID());
- int newLayer = SvtUtils.getInstance().getHelper().getValue(id, "layer");
+ //===> int newLayer = SvtUtils.getInstance().getHelper().getValue(id, "layer");
+ sensor = ((HpsSiSensor) rawHit.getDetectorElement());
+ int newLayer = sensor.getLayerNumber();
if (layer != -1 && layer != newLayer) {
System.out.format("TrackerHit has hits from multiple layers: %d and %d\n", layer, newLayer);
}
layer = newLayer;
- int newModule = SvtUtils.getInstance().getHelper().getValue(id, "module");
+ //===> int newModule = SvtUtils.getInstance().getHelper().getValue(id, "module");
+ int newModule = sensor.getModuleNumber();
if (module != -1 && module != newModule) {
System.out.format("TrackerHit has hits from multiple modules: %d and %d\n", module, newModule);
}
@@ -98,7 +102,8 @@
_hitLocationPerLayer.put(layer, new BasicHep3Vector(cl.getPosition()));
_nhitsNew++;
- boolean isAxial = SvtUtils.getInstance().isAxial(SvtUtils.getInstance().getSensor(module, layer - 1));
+ //===> boolean isAxial = SvtUtils.getInstance().isAxial(SvtUtils.getInstance().getSensor(module, layer - 1));
+ boolean isAxial = sensor.isAxial();
if (isAxial) {
_nAxialhits++;
} else {
java/branches/hps-java_HPSJAVA-88/analysis/src/main/java/org/hps/analysis/examples
--- java/branches/hps-java_HPSJAVA-88/analysis/src/main/java/org/hps/analysis/examples/TrackAnalysis.java 2014-10-09 08:02:13 UTC (rev 1158)
+++ java/branches/hps-java_HPSJAVA-88/analysis/src/main/java/org/hps/analysis/examples/TrackAnalysis.java 2014-10-09 17:03:40 UTC (rev 1159)
@@ -1,17 +1,5 @@
-/*
- * TrackAnalysis.java
- *
- * Created on October 16, 2008, 6:09 PM
- *
- */
package org.hps.analysis.examples;
-import hep.physics.matrix.BasicMatrix;
-import hep.physics.matrix.SymmetricMatrix;
-import hep.physics.vec.BasicHep3Matrix;
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -19,13 +7,20 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+
+import hep.physics.matrix.BasicMatrix;
+import hep.physics.matrix.SymmetricMatrix;
+import hep.physics.vec.BasicHep3Matrix;
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import hep.physics.vec.VecOp;
+
import org.apache.commons.math3.linear.Array2DRowRealMatrix;
import org.apache.commons.math3.linear.ArrayRealVector;
import org.apache.commons.math3.linear.EigenDecomposition;
import org.apache.commons.math3.linear.RealMatrix;
-import org.hps.conditions.deprecated.SvtUtils;
-import static org.hps.recon.tracking.CoordinateTransformations.transformVectorToTracking;
-import org.hps.recon.tracking.TrackerHitUtils;
+
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.MCParticle;
@@ -39,10 +34,15 @@
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+//===> import org.hps.conditions.deprecated.SvtUtils;
+import static org.hps.recon.tracking.CoordinateTransformations.transformVectorToTracking;
+import org.hps.recon.tracking.TrackerHitUtils;
+
/**
*
* @author Richard Partridge & Matt Graham
*/
+// TODO: This class needs to be cleaned up
public class TrackAnalysis {
private enum HelixPar {
@@ -235,12 +235,14 @@
for (RawTrackerHit rawHit : rawHits) {
// System.out.println(rawHit.getCellID());
IIdentifier id = new Identifier(rawHit.getCellID());
- int newLayer = SvtUtils.getInstance().getHelper().getValue(id, "layer");
+ //===> int newLayer = SvtUtils.getInstance().getHelper().getValue(id, "layer");
+ int newLayer = ((HpsSiSensor) rawHit.getDetectorElement()).getLayerNumber();
if (layer != -1 && layer != newLayer) {
System.out.format("TrackerHit has hits from multiple layers: %d and %d\n", layer, newLayer);
}
layer = newLayer;
- int newModule = SvtUtils.getInstance().getHelper().getValue(id, "module");
+ //===> int newModule = SvtUtils.getInstance().getHelper().getValue(id, "module");
+ int newModule = ((HpsSiSensor) rawHit.getDetectorElement()).getModuleNumber();
if (module != -1 && module != newModule) {
System.out.format("TrackerHit has hits from multiple modules: %d and %d\n", module, newModule);
}