Commit in hps-java/src/main/java/org/lcsim/hps/users/phansson on MAIN | |||
ECalGainDriver.java | +1 | -16 | 1.4 -> 1.5 |
cleanup
diff -u -r1.4 -r1.5 --- ECalGainDriver.java 14 Aug 2012 00:58:04 -0000 1.4 +++ ECalGainDriver.java 14 Aug 2012 22:35:00 -0000 1.5 @@ -56,7 +56,6 @@
private Integer yList[]; private JButton blankButton; private IHistogram1D pePlots[][][] = new IHistogram1D[47][11][5];
- private IHistogram1D peCrystalPlots[][] = new IHistogram1D[47][11];
private IHistogram2D mpePlot; private IHistogram2D spePlot; private IHistogram2D hitmap;
@@ -136,7 +135,6 @@
} else { pePlots[icol + 23][irow + 5][iE] = aida.histogram1D("E over p x=" + icol + " y=" + irow + " iE=" + iE, 50, 0, 2); }
- peCrystalPlots[icol + 23][irow + 5] = aida.histogram1D("crystal E over p x=" + icol + " y=" + irow, 50, 0, 2);
} } }
@@ -281,18 +279,6 @@
double Ep = E; double Eoverp = Ep / P;
- CalorimeterHit maxHit = null; - for (CalorimeterHit hit : cl.getCalorimeterHits()) { - if (maxHit == null || hit.getRawEnergy() > maxHit.getRawEnergy()) { - maxHit = hit; - } - } - if (maxHit.getRawEnergy()/cl.getEnergy() > 0.6) { - int x = maxHit.getIdentifierFieldValue("ix"); - int y = maxHit.getIdentifierFieldValue("iy"); - peCrystalPlots[x+23][y+5].fill(maxHit.getRawEnergy()/P); - } -
if (debug) { System.out.println("P " + P + " E " + E); }
@@ -364,8 +350,7 @@
for (int x = -23; x <= 23; x++) { // slot for (int y = -5; y <= 5; y++) { // crate if (HPSEcalConditions.physicalToGain(HPSEcalConditions.makePhysicalID(x, y)) != null) {
-// System.out.printf("%d\t%d\t%d\t%f\t%f\n", x, y, pePlots[x + 23][y + 5][0].allEntries(), pePlots[x + 23][y + 5][0].mean(), pePlots[x + 23][y + 5][0].rms()); - System.out.printf("%d\t%d\t%d\t%f\t%f\n", x, y, peCrystalPlots[x + 23][y + 5].allEntries(), peCrystalPlots[x + 23][y + 5].mean(), peCrystalPlots[x + 23][y + 5].rms());
+ System.out.printf("%d\t%d\t%d\t%f\t%f\n", x, y, pePlots[x + 23][y + 5][0].allEntries(), pePlots[x + 23][y + 5][0].mean(), pePlots[x + 23][y + 5][0].rms());
} } }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1