lcsim/src/org/lcsim/plugin/browser
diff -u -r1.8 -r1.9
--- CalorimeterHitTableModel.java 5 May 2010 18:09:03 -0000 1.8
+++ CalorimeterHitTableModel.java 1 Feb 2013 01:56:10 -0000 1.9
@@ -12,7 +12,7 @@
class CalorimeterHitTableModel extends CellIDTableModel
{
private static final String[] defaultColumns =
- { "id", "type", "energy (GeV)", "X (mm)", "Y (mm)", "Z (mm)", "time (ns)" };
+ { "id", "type", "raw E (GeV)", "corr E (GeV)", "E error", "X (mm)", "Y (mm)", "Z (mm)", "time (ns)" };
CalorimeterHitTableModel()
{
@@ -48,14 +48,22 @@
case 0:
return hit.getType();
case 1:
- return hit.getCorrectedEnergy();
+ try {
+ return hit.getRawEnergy();
+ } catch (Exception e) {
+ return 0.;
+ }
case 2:
- return hit.getPosition()[0];
+ return hit.getCorrectedEnergy();
case 3:
- return hit.getPosition()[1];
+ return hit.getEnergyError();
case 4:
- return hit.getPosition()[2];
+ return hit.getPosition()[0];
case 5:
+ return hit.getPosition()[1];
+ case 6:
+ return hit.getPosition()[2];
+ case 7:
return hit.getTime();
default:
return " ";