Author: [log in to unmask]
Date: Mon Jun 1 19:28:50 2015
New Revision: 3074
Log:
add plots, change axis limits to make sense
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/TrackingMonitoring.java Mon Jun 1 19:28:50 2015
@@ -64,6 +64,12 @@
IHistogram1D[] hthBot = new IHistogram1D[nmodules];
IHistogram2D[] xvsyTop = new IHistogram2D[nmodules];
IHistogram2D[] xvsyBot = new IHistogram2D[nmodules];
+ IHistogram2D[] xvsyOnTrackTop = new IHistogram2D[nmodules];
+ IHistogram2D[] xvsyOnTrackBot = new IHistogram2D[nmodules];
+ IHistogram2D[] timevstimeTop = new IHistogram2D[nmodules];
+ IHistogram2D[] timevstimeBot = new IHistogram2D[nmodules];
+ IHistogram2D[] timevstimeOnTrack = new IHistogram2D[nmodules];
+ IHistogram1D[] deltaTOnTrack = new IHistogram1D[nmodules];
IHistogram1D trkYAtECALTop;
IHistogram1D trkYAtECALBot;
@@ -159,10 +165,16 @@
trkYAtECALTop = aida.histogram1D(plotDir + trackCollectionName + "/" + triggerType + "/" + "Track Y at ECAL: Top", 100, 0, 100);
trkYAtECALBot = aida.histogram1D(plotDir + trackCollectionName + "/" + triggerType + "/" + "Track Y at ECAL: Bot", 100, 0, 100);
for (int i = 1; i <= nmodules; i++) {
- xvsyTop[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Top", 50, -100, 100, 50, 0, 40);
- xvsyBot[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Bottom", 50, -100, 100, 50, 0, 40);
+ xvsyTop[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Top", 100, -100, 150, 55, 0, 55);
+ xvsyBot[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Bottom", 100, -100, 150, 55, 0, 55);
+ xvsyOnTrackTop[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Top, Hits On Tracks", 100, -100, 150, 55, 0, 55);
+ xvsyOnTrackBot[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Bottom, Hits On Tracks", 100, -100, 150, 55, 0, 55);
+ timevstimeTop[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Top: Hit Times", 50, -25, 25, 50, -25, 25);
+ timevstimeBot[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + " Bottom: Hit Times", 50, -25, 25, 50, -25, 25);
hthTop[i - 1] = aida.histogram1D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + "Top: Track Hits", 25, 0, 25);
hthBot[i - 1] = aida.histogram1D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + "Bot: Track Hits", 25, 0, 25);
+ timevstimeOnTrack[i - 1] = aida.histogram2D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + ": Hit Times, Hits On Tracks", 50, -25, 25, 50, -25, 25);
+ deltaTOnTrack[i - 1] = aida.histogram1D(plotDir + triggerType + "/" + hthplotDir + "Module " + i + ": Hit Time Differences, Hits On Tracks", 50, -25, 25);
}
trkChi2Pos = aida.histogram1D(plotDir + trackCollectionName + "/" + triggerType + "/" + positronDir + "Track Chi2", 25, 0, 25.0);
@@ -264,25 +276,23 @@
for (TrackerHit hit : hth) {
int module = -99;
int layer = ((RawTrackerHit) hit.getRawHits().get(0)).getLayerNumber();
- if (layer < 2)
- module = 1;
- else if (layer < 4)
- module = 2;
- else if (layer < 6)
- module = 3;
- else if (layer < 8)
- module = 4;
- else if (layer < 10)
- module = 5;
- else
- module = 6;
+ module = layer/2 + 1;
+
+ Collection<TrackerHit> htsList = hittostrip.allFrom(hit);
+ double hitTimes[] = new double[2];
+ for (TrackerHit hts : htsList) {
+ int stripLayer = ((HpsSiSensor) ((RawTrackerHit) hts.getRawHits().get(0)).getDetectorElement()).getLayerNumber();
+ hitTimes[stripLayer%2] = hts.getTime();
+ }
if (hit.getPosition()[1] > 0) {
topHits[module - 1]++;
xvsyTop[module - 1].fill(hit.getPosition()[0], hit.getPosition()[1]);
+ timevstimeTop[module - 1].fill(hitTimes[0],hitTimes[1]);
} else {
botHits[module - 1]++;
xvsyBot[module - 1].fill(hit.getPosition()[0], Math.abs(hit.getPosition()[1]));
+ timevstimeBot[module - 1].fill(hitTimes[0],hitTimes[1]);
}
}
@@ -343,7 +353,11 @@
double meanSeedTime = 0;
for (TrackerHit hit : trk.getTrackerHits()) {
Collection<TrackerHit> htsList = hittostrip.allFrom(hittorotated.from(hit));
+ double hitTimes[] = new double[2];
for (TrackerHit hts : htsList) {
+ int stripLayer = ((HpsSiSensor) ((RawTrackerHit) hts.getRawHits().get(0)).getDetectorElement()).getLayerNumber();
+ hitTimes[stripLayer % 2] = hts.getTime();
+
nStrips++;
meanTime += hts.getTime();
int layer = ((HpsSiSensor) ((RawTrackerHit) hts.getRawHits().get(0)).getDetectorElement()).getLayerNumber();
@@ -352,6 +366,16 @@
meanSeedTime += hts.getTime();
}
}
+ int module = ((RawTrackerHit) hit.getRawHits().get(0)).getLayerNumber() / 2 + 1;
+
+ if (hit.getPosition()[2] > 0) {
+ xvsyOnTrackTop[module - 1].fill(hit.getPosition()[1], hit.getPosition()[2]);
+ } else {
+ xvsyOnTrackBot[module - 1].fill(hit.getPosition()[1], Math.abs(hit.getPosition()[2]));
+ }
+
+ timevstimeOnTrack[module - 1].fill(hitTimes[0], hitTimes[1]);
+ deltaTOnTrack[module - 1].fill(hitTimes[0]- hitTimes[1]);
}
meanTime /= nStrips;
meanSeedTime /= nSeedStrips;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackingReconPlots.java Mon Jun 1 19:28:50 2015
@@ -163,8 +163,8 @@
for (int i = 1; i <= nmodules; i++) {
- xvsyTop[i - 1] = aida.histogram2D("Module " + i + " Top", 50, -100, 100, 50, 0, 50);
- xvsyBot[i - 1] = aida.histogram2D("Module " + i + " Bottom", 50, -100, 100, 50, 0, 50);
+ xvsyTop[i - 1] = aida.histogram2D("Module " + i + " Top", 100, -100, 150, 55, 0, 55);
+ xvsyBot[i - 1] = aida.histogram2D("Module " + i + " Bottom", 100, -100, 150, 55, 0, 55);
hthTop[i - 1] = aida.histogram1D("Module " + i + "Top: Track Hits", 25, 0, 25);
hthBot[i - 1] = aida.histogram1D("Module " + i + "Bot: Track Hits", 25, 0, 25);
plot(plotterHTH, hthTop[i - 1], null, computePlotterRegion(i - 1, true));
|