7 modified files
java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/meeg
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/meeg/LCIOTrackAnalysis.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/meeg/LCIOTrackAnalysis.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -8,9 +8,11 @@
import java.util.Map;
import java.util.Set;
-import org.hps.conditions.deprecated.SvtUtils;
+
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.Identifier;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.MCParticle;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.RelationalTable;
@@ -20,8 +22,9 @@
/**
*
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: LCIOTrackAnalysis.java,v 1.3 2013/10/24 18:11:43 meeg Exp $
*/
+// TODO: This is an exact duplicate of the class in the analysis.example package.
+// One of them should be sandboxed
public class LCIOTrackAnalysis {
protected Track track;
@@ -73,15 +76,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 +105,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/users/src/main/java/org/hps/users/mgraham
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -15,11 +15,12 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.SvtUtils;
+
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.EventQuality;
import org.hps.recon.tracking.TrackUtils;
import org.hps.users.phansson.TrigRateDriver;
-import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
@@ -139,7 +140,9 @@
//htc.setTrackDirection(trk);
Map<String,Double> res_track = TrackUtils.calculateTrackHitResidual(hth, trk, this._includeMS);
boolean isTop = false;
- if(SvtUtils.getInstance().isTopLayer((SiSensor)((RawTrackerHit)hth.getRawHits().get(0)).getDetectorElement())) {
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) hth.getRawHits().get(0)).getDetectorElement();
+ //===> if(SvtUtils.getInstance().isTopLayer((SiSensor)((RawTrackerHit)hth.getRawHits().get(0)).getDetectorElement())) {
+ if(sensor.isTopLayer()) {
isTop = true;
}
int layer = hth.Layer();
java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/DataTrackerFakeHitDriver.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/DataTrackerFakeHitDriver.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -16,7 +16,7 @@
import java.util.List;
import java.util.Set;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.TrackUtils;
import org.hps.recon.tracking.TrackerHitUtils;
@@ -32,6 +32,7 @@
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
import org.lcsim.detector.tracker.silicon.SiStrips;
import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
@@ -278,7 +279,8 @@
if (debug) {
System.out.println(this.getClass().getSimpleName() + ": make a tracker hit and add to this sensor");
}
- if (SvtUtils.getInstance().isTopLayer(sensor)) {
+ //===> if (SvtUtils.getInstance().isTopLayer(sensor)) {
+ if (((HpsSiSensor) sensor).isTopLayer()) {
n_hits_top++;
isTopTrack = true;
} else {
java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/ModuleMPAlignmentInput.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -18,9 +18,9 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.TrackUtils;
-import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
@@ -255,7 +255,9 @@
int layer = hit.Layer();
- int side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? 10000 : 20000;
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) strip.rawhits().get(0)).getDetectorElement();
+ //===> int side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? 10000 : 20000;
+ int side = sensor.isTopLayer() ? 10000 : 20000;
if(_DEBUG) {
@@ -380,12 +382,15 @@
private void PrintHitResiduals(HelicalTrackHit hit) {
- HelicalTrackStrip strip = ((HelicalTrackCross) hit).getStrips().get(0);
- String side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "top" : "bottom";
+ HelicalTrackStrip strip = ((HelicalTrackCross) hit).getStrips().get(0);
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) strip.rawhits().get(0)).getDetectorElement();
+ //===> String side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "top" : "bottom";
+ String side = sensor.isTopLayer() ? "top" : "bottom";
if (_DEBUG) {
System.out.printf("%s: --- Alignment Results for this helical track hit ---\n",this.getClass().getSimpleName());
- String sensor_type = SvtUtils.getInstance().isAxial((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "axial" : "stereo";
+ //===> String sensor_type = SvtUtils.getInstance().isAxial((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "axial" : "stereo";
+ String sensor_type = sensor.isAxial() ? "axial" : "stereo";
System.out.printf("%s: Layer %d in %s at position %s\n",this.getClass().getSimpleName(), hit.Layer(),side, hit.getCorrectedPosition().toString());
System.out.printf("%s: Residuals (x,y,z) : %5.5e %5.5e %5.5e\n",this.getClass().getSimpleName(), _resid[0], _resid[1], _resid[2]);
System.out.printf("%s: Errors (x,y,z) : %5.5e %5.5e %5.5e\n",this.getClass().getSimpleName(), _error[0], _error[1], _error[2]);
java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -22,7 +22,7 @@
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
import org.hps.conditions.deprecated.BeamlineConstants;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.ecal.TriggerData;
import org.hps.recon.ecal.HPSEcalCluster;
import org.hps.recon.tracking.EventQuality;
@@ -36,7 +36,7 @@
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
-import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.event.MCParticle;
@@ -931,10 +931,12 @@
if(this._debug) System.out.printf("%s: found %d strips in clollection, asking strips in the %s\n", this.getClass().getSimpleName(),strips.size(),(top?"top":"bottom"));
for(SiTrackerHitStrip1D strip : strips) {
IDetectorElement de = strip.getSensor();
- SiSensor sensor = (SiSensor) de;
+ HpsSiSensor sensor = (HpsSiSensor) de;
int lyr = _ID.getLayer(de);
- if(!top && SvtUtils.getInstance().isTopLayer(sensor)) continue;
- else if (top && !SvtUtils.getInstance().isTopLayer(sensor)) continue;
+ //===> if(!top && SvtUtils.getInstance().isTopLayer(sensor)) continue;
+ if(!top && sensor.isTopLayer()) continue;
+ //else if (top && !SvtUtils.getInstance().isTopLayer(sensor)) continue;
+ else if (top && !sensor.isTopLayer()) continue;
if(this._debug) System.out.printf("%s: strip \"%s\" at %s is selected\n", this.getClass().getSimpleName(),_ID.getName(de),strip.getPositionAsVector().toString());
if(!map.containsKey(lyr)) {
map.put(lyr, new ArrayList<SiTrackerHitStrip1D>());
java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/StripMPAlignmentInput.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -19,9 +19,10 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.SvtUtils;
+
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.TrackUtils;
-import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
@@ -286,7 +287,9 @@
int layer = strip.layer();
- int side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? 10000 : 20000;
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) strip.rawhits().get(0)).getDetectorElement();
+ //===> int side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? 10000 : 20000;
+ int side = sensor.isTopLayer() ? 10000 : 20000;
if(_DEBUG) {
@@ -388,7 +391,9 @@
_error[2] = res_local.get("wreserr");
double vdiffy = res_local.get("vdiffTrky");
- String side = SvtUtils.getInstance().isTopLayer((SiSensor)((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "top" : "bottom";
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) strip.rawhits().get(0)).getDetectorElement();
+ String side = sensor.isTopLayer() ? "top" : "bottom";
+ //===> String side = SvtUtils.getInstance().isTopLayer((SiSensor)((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "top" : "bottom";
//Fill residuals vs distrance from center of plane in the v directions
aida.profile1D("res_u_vs_ydiff_layer_" + strip.layer() + "_" + side).fill(vdiffy,_resid[0]);
@@ -493,11 +498,14 @@
private void PrintStripResiduals(HelicalTrackStrip strip) {
- String side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "top" : "bottom";
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) strip.rawhits().get(0)).getDetectorElement();
+ String side = sensor.isTopLayer() ? "top" : "bottom";
+ //===> String side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "top" : "bottom";
if (_DEBUG) {
System.out.printf("%s: --- Alignment Results for this Strip ---\n",this.getClass().getSimpleName());
- String sensor_type = SvtUtils.getInstance().isAxial((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "axial" : "stereo";
+ //===> String sensor_type = SvtUtils.getInstance().isAxial((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? "axial" : "stereo";
+ String sensor_type = sensor.isAxial() ? "axial" : "stereo";
System.out.printf("%s: Strip layer %4d is %s in %s at origin %s\n",this.getClass().getSimpleName(), strip.layer(),sensor_type, side, strip.origin().toString());
System.out.printf("%s: u=%s v=%s w=%s\n",this.getClass().getSimpleName(), strip.u().toString(),strip.v().toString(),strip.w().toString());
System.out.printf("%s: Residuals (u,v,w) : %5.5e %5.5e %5.5e\n",this.getClass().getSimpleName(), _resid[0], _resid[1], _resid[2]);
@@ -850,7 +858,9 @@
Hep3Vector corigin = strip.origin();
double vmeas = corigin.y(); //THis is wrong
int layer = strip.layer();
- int side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? 10000 : 20000;
+ HpsSiSensor sensor = (HpsSiSensor) ((RawTrackerHit) strip.rawhits().get(0)).getDetectorElement();
+ int side = sensor.isTopLayer() ? 10000 : 20000;
+ //===> int side = SvtUtils.getInstance().isTopLayer((SiSensor) ((RawTrackerHit)strip.rawhits().get(0)).getDetectorElement()) ? 10000 : 20000;
if(_DEBUG) {
System.out.printf("%s: --- Calculate global derivatives ---\n",this.getClass().getSimpleName());
java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson
--- java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java 2014-10-13 20:28:04 UTC (rev 1177)
+++ java/branches/hps-java_HPSJAVA-88/users/src/main/java/org/hps/users/phansson/TrackingGeometryChecker.java 2014-10-14 08:06:24 UTC (rev 1178)
@@ -3,11 +3,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.deprecated.SvtUtils;
+
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
@@ -35,15 +35,15 @@
// Get all of the sensors composing the SVT and add them to the set of all sensors
IDetectorElement detectorElement = arg0.getDetectorElement().findDetectorElement("Tracker");
IIdentifierHelper helper = detectorElement.getIdentifierHelper();
- List<SiSensor> sensors = new ArrayList<SiSensor>();
- sensors.addAll(detectorElement.findDescendants(SiSensor.class));
+ List<HpsSiSensor> sensors = new ArrayList<HpsSiSensor>();
+ sensors.addAll(detectorElement.findDescendants(HpsSiSensor.class));
System.out.printf("%s: Total number of sensors: %d\n",getClass().getSimpleName(), sensors.size());
IIdentifier sensorIdent;
SiTrackerIdentifierHelper sensorHelper;
String description;
// Loop through all of the sensors and fill the maps
- for (SiSensor sensor : sensors) {
+ for (HpsSiSensor sensor : sensors) {
// Get the sensor identifier
sensorIdent = sensor.getIdentifier();
@@ -60,7 +60,7 @@
System.out.printf("%s: Sensor name %s\n",getClass().getSimpleName(), sensor.getName());
System.out.printf("%s: Sensor position %s\n",getClass().getSimpleName(), sensor.getGeometry().getPosition().toString());
- System.out.printf("%s: Sensor is %s %s \n",getClass().getSimpleName(), SvtUtils.getInstance().isTopLayer(sensor)?"top":"bottom", SvtUtils.getInstance().isAxial(sensor)?"axial":"stereo");
+ System.out.printf("%s: Sensor is %s %s \n",getClass().getSimpleName(), sensor.isTopLayer()?"top":"bottom", sensor.isAxial()?"axial":"stereo");
System.out.printf("%s: layerNumber %d\n",getClass().getSimpleName(), layerNumber);
System.out.printf("%s: moduleNumber %d\n",getClass().getSimpleName(), moduleNumber);
System.out.printf("%s: sideNumber %d\n",getClass().getSimpleName(), sideNumber);
SVNspam 0.1