diff -u -r1.27 -r1.28
--- GenericHitPlots.java	13 Feb 2006 22:05:51 -0000	1.27
+++ GenericHitPlots.java	14 Feb 2006 01:31:25 -0000	1.28
@@ -24,18 +24,18 @@

  * subdetector.
  * 
  * @author jeremym

- * @version $Id: GenericHitPlots.java,v 1.27 2006/02/13 22:05:51 jeremy Exp $

+ * @version $Id: GenericHitPlots.java,v 1.28 2006/02/14 01:31:25 jeremy Exp $

  */
 class GenericHitPlots extends AbstractPlots
 {
     ICloud1D _energy;
     ICloud1D _energyEvent;
     ICloud1D _hitAvgEnergy;

-    ICloud1D _hitMinEdep;
-    ICloud1D _hitMinEdepOverTot;
-    ICloud1D _hitMaxEdep;
-    ICloud1D _hitMaxEdepOverTot;
-    ICloud2D _hitMaxVsMinEdep;

+    ICloud1D _hitMinE;
+    ICloud1D _hitMinEOverTotE;
+    ICloud1D _hitMaxE;
+    ICloud1D _hitMaxEOverTotE;
+    ICloud2D _hitMaxVsMinE;

     ICloud2D _hitVsTotE;
     IHistogram1D _layer;
     ICloud1D _hitCount;

@@ -57,15 +57,15 @@

     ICloud1D _hitMinR;
     IHistogram1D _layerEnergy;
     ICloud2D _layerVsR;

-    IHistogram1D _layerAvgHitEdep;

+    IHistogram1D _layerAvgHitE;

     IHistogram2D _layerPercentTotE;
     IHistogram2D _layerPercentHits;
     ICloud1D _layerHitCount;

-    ICloud1D _layerAvgEdep;

+    ICloud1D _layerAvgE;

     ICloud1D _layerAvgNHits;

-    ICloud2D _layerAvgEdepVsAvgNHits;
-    ICloud1D _layerMaxEdep;
-    ICloud1D _layerMinEdep;

+    ICloud2D _layerAvgEVsAvgNHits;
+    ICloud1D _layerMaxE;
+    ICloud1D _layerMinE;

     ICloud1D _layerMaxNHits;
     ICloud1D _layerMinNHits;
     ICloud1D _layerMaxEOverTot;

@@ -135,25 +135,25 @@

         _hitCount.annotation().addItem("xAxisLabel", "Number of Hits in Event");
         _hitCount.annotation().addItem("yAxisLabel", "Number of Events");
 

-        _hitMinEdep = aida().cloud1D("Hit: Min Edep");
-        _hitMinEdep.annotation().addItem("xAxisLabel", "Minimum Hit Energy (GeV)");
-        _hitMinEdep.annotation().addItem("yAxisLabel", "Number of Events");
-
-        _hitMinEdepOverTot = aida().cloud1D("Hit: Min Edep over Total");
-        _hitMinEdepOverTot.annotation().addItem("xAxisLabel", "Hit Minimum Energy / Collection Energy (GeV)");
-        _hitMinEdepOverTot.annotation().addItem("yAxisLabel", "Number of Events");
-
-        _hitMaxEdep = aida().cloud1D("Hit: Max Edep");
-        _hitMaxEdep.annotation().addItem("xAxisLabel", "Max Hit Energy (GeV)");
-        _hitMaxEdep.annotation().addItem("yAxisLabel", "Number of Events");
-
-        _hitMaxEdepOverTot = aida().cloud1D("Hit: Max Edep over Total");
-        _hitMaxEdepOverTot.annotation().addItem("xAxisLabel", "Max Hit Energy over Total Energy (GeV)");
-        _hitMaxEdepOverTot.annotation().addItem("yAxisLabel", "Number of Events");
-
-        _hitMaxVsMinEdep = aida().cloud2D("Hit: Max vs Min Edep");
-        _hitMaxVsMinEdep.annotation().addItem("xAxisLabel", "Max Hit Energy (GeV)");
-        _hitMaxVsMinEdep.annotation().addItem("yAxisLabel", "Min Hit Energy (GeV)");

+        _hitMinE = aida().cloud1D("Hit: Minimum Energy");
+        _hitMinE.annotation().addItem("xAxisLabel", "Minimum Hit Energy (GeV)");
+        _hitMinE.annotation().addItem("yAxisLabel", "Number of Events");
+
+        _hitMinEOverTotE = aida().cloud1D("Hit: Minimum Energy over Total Energy Energy");
+        _hitMinEOverTotE.annotation().addItem("xAxisLabel", "Hit Minimum Energy / Collection Energy (GeV)");
+        _hitMinEOverTotE.annotation().addItem("yAxisLabel", "Number of Events");
+
+        _hitMaxE = aida().cloud1D("Hit: Maximum Energy");
+        _hitMaxE.annotation().addItem("xAxisLabel", "Max Hit Energy (GeV)");
+        _hitMaxE.annotation().addItem("yAxisLabel", "Number of Events");
+
+        _hitMaxEOverTotE = aida().cloud1D("Hit: Maximum Energy over Total");
+        _hitMaxEOverTotE.annotation().addItem("xAxisLabel", "Max Hit Energy over Total Energy (GeV)");
+        _hitMaxEOverTotE.annotation().addItem("yAxisLabel", "Number of Events");
+
+        _hitMaxVsMinE = aida().cloud2D("Hit: Maximum vs Minimum Energy");
+        _hitMaxVsMinE.annotation().addItem("xAxisLabel", "Max Hit Energy (GeV)");
+        _hitMaxVsMinE.annotation().addItem("yAxisLabel", "Min Hit Energy (GeV)");

 
         _hitVsTotE = aida().cloud2D("Event: Energy Total vs Hit Count");
         _hitVsTotE.annotation().addItem("xAxisLabel", "Event Energy Total (GeV)");

@@ -203,29 +203,29 @@

         _layerPercentHits.annotation().addItem("xAxisLabel", "Layer Number");
         _layerPercentHits.annotation().addItem("yAxisLabel", "Fraction of Number of Hits");
 

-        _layerAvgHitEdep = aida().histogram1D("Layer: Average Hit Edep", _nlayers, 0, _nlayers);
-        _layerAvgHitEdep.annotation().addItem("xAxisLabel", "Layer Number");
-        _layerAvgHitEdep.annotation().addItem("yAxisLabel", "Average Hit Energy (GeV)");
-
-        _layerAvgEdep = aida().cloud1D("Layer: Average Energy per Event");
-        _layerAvgEdep.annotation().addItem("xAxisLabel", "Layer Number");
-        _layerAvgEdep.annotation().addItem("yAxisLabel", "Average Energy per Event (GeV)");

+        _layerAvgHitE = aida().histogram1D("Layer: Average Hit Energy", _nlayers, 0, _nlayers);
+        _layerAvgHitE.annotation().addItem("xAxisLabel", "Layer Number");
+        _layerAvgHitE.annotation().addItem("yAxisLabel", "Average Hit Energy (GeV)");
+
+        _layerAvgE = aida().cloud1D("Layer: Average Energy per Event");
+        _layerAvgE.annotation().addItem("xAxisLabel", "Layer Number");
+        _layerAvgE.annotation().addItem("yAxisLabel", "Average Energy per Event (GeV)");

 
         _layerAvgNHits = aida().cloud1D("Layer: Average Number of Hits per Event");
         _layerAvgNHits.annotation().addItem("xAxisLabel", "Average Number of Hits in a Single Layer");
         _layerAvgNHits.annotation().addItem("yAxisLabel", "Number of Events");
 

-        _layerAvgEdepVsAvgNHits = aida().cloud2D("Layer Average Energy vs Average Number of Hits");
-        _layerAvgEdepVsAvgNHits.annotation().addItem("xAxisLabel", "Average Energy in a Single Layer");
-        _layerAvgEdepVsAvgNHits.annotation().addItem("yAxisLabel", "Average Number of Hits in a Single Layer");
-
-        _layerMaxEdep = aida().cloud1D("Layer: Max Edep");
-        _layerMaxEdep.annotation().addItem("xAxisLabel", "Max Energy in a Single Layer");
-        _layerMaxEdep.annotation().addItem("yAxisLabel", "Number of Events");
-
-        _layerMinEdep = aida().cloud1D("Layer: Min Edep");
-        _layerMinEdep.annotation().addItem("xAxisLabel", "Min Energy in a Single Layer");
-        _layerMinEdep.annotation().addItem("yAxisLabel", "Number of Events");        

+        _layerAvgEVsAvgNHits = aida().cloud2D("Layer Average Energy vs Average Number of Hits");
+        _layerAvgEVsAvgNHits.annotation().addItem("xAxisLabel", "Average Energy in a Single Layer");
+        _layerAvgEVsAvgNHits.annotation().addItem("yAxisLabel", "Average Number of Hits in a Single Layer");
+
+        _layerMaxE = aida().cloud1D("Layer: Max Energy in a Single Layer");
+        _layerMaxE.annotation().addItem("xAxisLabel", "Max Energy in a Single Layer");
+        _layerMaxE.annotation().addItem("yAxisLabel", "Number of Events");
+
+        _layerMinE = aida().cloud1D("Layer: Min Edep");
+        _layerMinE.annotation().addItem("xAxisLabel", "Min Energy in a Single Layer");
+        _layerMinE.annotation().addItem("yAxisLabel", "Number of Events");        

 
         _layerMaxNHits = aida().cloud1D("Layer: Max Number of Hits");
         _layerMaxNHits.annotation().addItem("xAxisLabel", "Max Number of Hits in a Single Layer");

@@ -235,11 +235,11 @@

         _layerMinNHits.annotation().addItem("xAxisLabel", "Min Number of Hits in a Single Layer");
         _layerMinNHits.annotation().addItem("yAxisLabel", "Number of Events");
 

-        _layerMaxEOverTot = aida().cloud1D("Layer: Max Edep Over Total Edep");
-        _layerMaxEOverTot.annotation().addItem("xAxisLabel", "Max Single Layer Energy over Total Energy");

+        _layerMaxEOverTot = aida().cloud1D("Layer: Max Energy in a Single Layer Over Total Energy");
+        _layerMaxEOverTot.annotation().addItem("xAxisLabel", "Max Energy in a Single Layer over Total Energy");

         _layerMaxEOverTot.annotation().addItem("yAxisLabel", "Number of Events");
         

-        _layerMinEOverTot = aida().cloud1D("Layer: Min Edep Over Total Edep");

+        _layerMinEOverTot = aida().cloud1D("Layer: Min Energy Over Total Energy");

         _layerMinEOverTot.annotation().addItem("xAxisLabel", "Min Single Layer Energy over Total Energy");
         _layerMinEOverTot.annotation().addItem("yAxisLabel", "Number of Events");
 

@@ -309,7 +309,7 @@

             plot.annotation().addItem("yAxisLabel", "Number of Hits");
 
             plot = aida().cloud1D(layerName + ": Hit Time");

-            plot.annotation().addItem("xAxisLabel", "Time (seconds)");

+            plot.annotation().addItem("xAxisLabel", "Time (log10(seconds))");

             plot.annotation().addItem("yAxisLabel", "Number of Hits");
 
             ICloud2D plot1;

@@ -469,7 +469,7 @@

             aida().cloud2D(layerName + ": Hit XY").fill(x, y);
 
             // Plot layer time

-            aida().cloud1D(layerName + ": Hit Time").fill(time);

+            aida().cloud1D(layerName + ": Hit Time").fill(log10(time));

 
             // Leave layer dir
             cd();

@@ -552,10 +552,10 @@

         _hitMaxR.fill(maxR);
 
         // Plot min edep over total

-        _hitMinEdepOverTot.fill(minE / eventTotE);

+        _hitMinEOverTotE.fill(minE / eventTotE);

 
         // Plot max edep over total

-        _hitMaxEdepOverTot.fill(maxE / eventTotE);

+        _hitMaxEOverTotE.fill(maxE / eventTotE);

 
         // Plot average time
         _timeAvg.fill(log10(totTime));

@@ -572,13 +572,13 @@

         _hitAvgEnergy.fill(hitAvgE);
 
         // Plot min edep

-        _hitMinEdep.fill(minE);

+        _hitMinE.fill(minE);

 
         // Plot max edep

-        _hitMaxEdep.fill(maxE);

+        _hitMaxE.fill(maxE);

 
         // Plot min vs max edep

-        _hitMaxVsMinEdep.fill(maxE, minE);

+        _hitMaxVsMinE.fill(maxE, minE);

 
         // Plot hit count vs total energy
         _hitVsTotE.fill(eventTotE, nhits);

@@ -596,7 +596,7 @@

             // Compute some layer statistics
             layerInfo.setPercentTotalEnergy(eventTotE);
             layerInfo.setPercentNHits(nhits);

-            double layerAvgHitEdep = layerInfo.getEdep() / layerInfo.getNHits();

+            double layerAvgHitEdep = layerInfo.getEnergy() / layerInfo.getNHits();

 
             // Plot fraction of total edep in this layer
             _layerPercentTotE.fill(layerInfo.getLayerNumber(), layerInfo.getPercentTotalEnergy());

@@ -605,18 +605,18 @@

             _layerPercentHits.fill(layerInfo.getLayerNumber(), layerInfo.getPercentNHits());
 
             // Plot average energy in this layer's hit

-            _layerAvgHitEdep.fill(layerInfo.getLayerNumber(), layerAvgHitEdep);

+            _layerAvgHitE.fill(layerInfo.getLayerNumber(), layerAvgHitEdep);

 
             // Update max E

-            if (layerInfo.getEdep() > maxLayerE)

+            if (layerInfo.getEnergy() > maxLayerE)

             {

-                maxLayerE = layerInfo.getEdep();

+                maxLayerE = layerInfo.getEnergy();

             }
 
             // Update min E

-            if (layerInfo.getEdep() < minLayerE)

+            if (layerInfo.getEnergy() < minLayerE)

             {

-                minLayerE = layerInfo.getEdep();

+                minLayerE = layerInfo.getEnergy();

             }
 
             // Update max nhits

@@ -637,10 +637,10 @@

             aida().tree().cd(layerInfo.getDirName());
 
             // Plot layer total E

-            aida().cloud1D(layerName + ": Total Energy").fill(layerInfo.getEdep());

+            aida().cloud1D(layerName + ": Total Energy").fill(layerInfo.getEnergy());

 
             // Plot layer average hit E

-            aida().cloud1D(layerName + ": Average Hit Energy").fill(layerInfo.getAverageHitEdep());

+            aida().cloud1D(layerName + ": Average Hit Energy").fill(layerInfo.getAverageHitEnergy());

 
             // Plot layer total # hits
             aida().cloud1D(layerName + ": Number of Hits").fill(layerInfo.getNHits());

@@ -654,10 +654,10 @@

         }
 
         // Plot max edep in a layer

-        _layerMaxEdep.fill(maxLayerE);

+        _layerMaxE.fill(maxLayerE);

 
         // Plot min edep in a layer

-        _layerMinEdep.fill(minLayerE);

+        _layerMinE.fill(minLayerE);

 
         // Plot max nhits in a layer
         _layerMaxNHits.fill(maxLayerNHits);

@@ -668,7 +668,7 @@

         double avgLayerE = eventTotE / _nlayers;
 
         // Plot average energy in a layer

-        _layerAvgEdep.fill(avgLayerE);

+        _layerAvgE.fill(avgLayerE);

 
         double avgLayerNHits = nhits / _nlayers;
 

@@ -676,7 +676,7 @@

         _layerAvgNHits.fill(avgLayerNHits);
 
         // Plot average layer E vs average layer Nhits

-        _layerAvgEdepVsAvgNHits.fill(avgLayerE, avgLayerNHits);

+        _layerAvgEVsAvgNHits.fill(avgLayerE, avgLayerNHits);

 
         // Plot maxLayerE / eventTotE
         _layerMaxEOverTot.fill(maxLayerE / eventTotE);

@@ -714,7 +714,7 @@

             LayerInfo layer = _layers.get(i);
 
             // Plot average total energy in the layer for nevents

-            _layerAvgTotE.fill(i, layer.getAverageTotalEdep(nevents));

+            _layerAvgTotE.fill(i, layer.getAverageTotalEnergy(nevents));

 
             // Plot average n hits in the layer for nevents
             _layerAvgTotNHits.fill(i, layer.getAverageTotalNHits(nevents));

diff -u -r1.6 -r1.7
--- LayerInfo.java	13 Feb 2006 22:05:51 -0000	1.6
+++ LayerInfo.java	14 Feb 2006 01:31:25 -0000	1.7
@@ -6,7 +6,7 @@

  * Information about a single layer in a Subdetector.
  * 
  * @author jeremym

- * @version $Id: LayerInfo.java,v 1.6 2006/02/13 22:05:51 jeremy Exp $

+ * @version $Id: LayerInfo.java,v 1.7 2006/02/14 01:31:25 jeremy Exp $

  */
 class LayerInfo
 {

@@ -40,13 +40,13 @@

         return "Layer " + _layerNum;
     }
 

-	private void addEdep(double edep)

+	private void addEnergy(double edep)

 	{
 		_edep += edep;
 		_totEdep += edep;
 	}
 

-	public double getEdep()

+	public double getEnergy()

 	{
 		return _edep;
 	}

@@ -82,12 +82,12 @@

 		return _percentNHits;
 	}
 	

-	public double getAverageHitEdep()

+	public double getAverageHitEnergy()

 	{
 		return _edep / _nhits;
 	}
 	

-	public double getAverageTotalEdep(int nevents)

+	public double getAverageTotalEnergy(int nevents)

 	{
 		return _totEdep / ((double)nevents);
 	}

@@ -114,7 +114,7 @@

 
 	public void addHit(GenericHit hit)
 	{

-		addEdep(hit.getEnergy());

+		addEnergy(hit.getEnergy());

 		incrNHits();
 	}
 }

\ No newline at end of file

diff -u -r1.20 -r1.21
--- MCParticlePlots.java	13 Feb 2006 22:05:51 -0000	1.20
+++ MCParticlePlots.java	14 Feb 2006 01:31:25 -0000	1.21
@@ -19,7 +19,7 @@

  * A set of MCParticle plots, including plots of each individual particle type.
  * 
  * @author jeremym

- * @version $Id: MCParticlePlots.java,v 1.20 2006/02/13 22:05:51 jeremy Exp $

+ * @version $Id: MCParticlePlots.java,v 1.21 2006/02/14 01:31:25 jeremy Exp $

  */
 class MCParticlePlots extends AbstractPlots
 {

@@ -436,9 +436,10 @@

                         }
                         if (dauE > 0)
                         {

+                            //System.out.println(energy + " " + dauE);

                             // Plot FS E vs EP Dau E
                             aida().cloud2D(particleName + ": Final State Energy vs Total Energy of Endpoint Daughters").fill(

-                                    particle.getEnergy(), dauE);

+                                    energy, dauE);

                         }
                     }
                 }