hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -u -r1.17 -r1.18
--- SVTHitReconstructionPlots.java 24 May 2012 19:48:40 -0000 1.17
+++ SVTHitReconstructionPlots.java 11 Jun 2012 22:52:43 -0000 1.18
@@ -9,6 +9,7 @@
import java.util.logging.Logger;
import org.lcsim.detector.identifier.IIdentifier;
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.SiTrackerIdentifierHelper;
import org.lcsim.event.EventHeader;
@@ -119,12 +120,12 @@
plotter6.createRegions(5, 4);
for (SiSensor sensor : sensors) {
- IHistogram1D nrawPlot = aida.histogram1D(sensor.getName() + "_raw_hits", 10, 0, 9.0);
- IHistogram1D nrecoPlot = aida.histogram1D(sensor.getName() + "_reco_hits", 10, 0, 9.0);
- IHistogram1D nclustPlot = aida.histogram1D(sensor.getName() + "_cluster_hits", 10, 0, 9.0);
- IHistogram1D clusterSizePlot = aida.histogram1D(sensor.getName() + "_cluster_size", 9, 1, 9.0);
- IHistogram1D clusterAmpPlot = aida.histogram1D(sensor.getName() + "_cluster_amp", 50, 0, 2000.0);
- IHistogram2D clposVsStrip = aida.histogram2D(sensor.getName() + "_cluster_vs_strip", 128, 0, 639, 100, -50, 50);
+ IHistogram1D nrawPlot = aida.histogram1D(sensor.getName() + "_raw_hits", 10, -0.5, 9.5);
+ IHistogram1D nrecoPlot = aida.histogram1D(sensor.getName() + "_reco_hits", 10, -0.5, 9.5);
+ IHistogram1D nclustPlot = aida.histogram1D(sensor.getName() + "_cluster_hits", 10, -0.5, 9.5);
+ IHistogram1D clusterSizePlot = aida.histogram1D(sensor.getName() + "_cluster_size", 9, 0.5, 9.5);
+ IHistogram1D clusterAmpPlot = aida.histogram1D(sensor.getName() + "_cluster_amp", 50, 0, 3000.0);
+ IHistogram2D clposVsStrip = aida.histogram2D(sensor.getName() + "_cluster_vs_strip", 128, 0, 640, 100, -50, 50);
int region = sensorRegionMap.get(sensor.getName());
plotter1.region(region).plot(nrawPlot);
plotter3.region(region).plot(nrecoPlot);
@@ -195,7 +196,7 @@
String sensorName = sensor.getName();
int clusterSize = cluster.getRawHits().size();
aida.histogram1D(sensorName + "_cluster_size").fill(clusterSize);
- double cluAmp = cluster.getdEdx();
+ double cluAmp = cluster.getdEdx()/DopedSilicon.ENERGY_EHPAIR;
aida.histogram1D(sensorName + "_cluster_amp").fill(cluAmp);
double clpos = cluster.getPositionAsVector().y();
RawTrackerHit raw = (RawTrackerHit) cluster.getRawHits().get(0);
@@ -214,6 +215,8 @@
aida.histogram1D(sensorName + "_reco_hits").fill(nreco);
if (clustMap.containsKey(sensor))
aida.histogram1D(sensorName + "_cluster_hits").fill(clustMap.get(sensor));
+ else
+ aida.histogram1D(sensorName + "_cluster_hits").fill(0);
}
}