SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.25 -r1.26
--- CalorimeterHitPlots.java	13 Feb 2006 22:05:51 -0000	1.25
+++ CalorimeterHitPlots.java	21 Feb 2006 23:19:32 -0000	1.26
@@ -4,9 +4,9 @@

 import hep.aida.ICloud2D;
 
 import java.util.List;

-import java.util.Map;

-import org.lcsim.event.CalorimeterHit;

+import static java.lang.Math.log10;
+

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;
 import org.lcsim.event.SimCalorimeterHit;

@@ -27,7 +27,7 @@

  * NOTE: Most plots on collections of SimCalorimeterHits are done by GenericHitPlots. 
  * 
  * @author jeremym

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

+ * @version $Id: CalorimeterHitPlots.java,v 1.26 2006/02/21 23:19:32 jeremy Exp $

  */
 class CalorimeterHitPlots extends AbstractPlots
 {

@@ -76,7 +76,7 @@

         _mcpSingleContribPDG.annotation().addItem("yAxisLabel","Number of Hits");
         
         _hitCorrectedEnergy = aida().cloud1D("Hit: Corrected Energy");

-        _hitCorrectedEnergy.annotation().addItem("xAxisLabel","Corrected Energy (GeV)");

+        _hitCorrectedEnergy.annotation().addItem("xAxisLabel","Corrected Energy (log10(GeV))");

         _hitCorrectedEnergy.annotation().addItem("yAxisLabel","Number of Hits");        
         
         _hitRawVsCorrectedEnergy = aida().cloud2D("Hit: Raw vs Corrected Energy");

@@ -185,7 +185,7 @@

                 if (haveSF)
                 {
                     // Plot corrected E

-                    _hitCorrectedEnergy.fill(hit.getCorrectedEnergy());

+                    _hitCorrectedEnergy.fill(log10(hit.getCorrectedEnergy()));

                     
                     // Plot raw vs corrected E
                     _hitRawVsCorrectedEnergy.fill(hit.getRawEnergy(), hit.getCorrectedEnergy());

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.31 -r1.32
--- GenericHitPlots.java	17 Feb 2006 22:23:45 -0000	1.31
+++ GenericHitPlots.java	21 Feb 2006 23:19:32 -0000	1.32
@@ -23,7 +23,7 @@

  * subdetector.
  * 
  * @author jeremym

- * @version $Id: GenericHitPlots.java,v 1.31 2006/02/17 22:23:45 jeremy Exp $

+ * @version $Id: GenericHitPlots.java,v 1.32 2006/02/21 23:19:32 jeremy Exp $

  */
 class GenericHitPlots extends AbstractPlots
 {

@@ -152,23 +152,23 @@

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

-        _hitMinE = aida().cloud1D("Hit: Minimum Energy");
-        _hitMinE.annotation().addItem("xAxisLabel", "Minimum Hit Energy (GeV)");

+        _hitMinE = aida().cloud1D("Hit: Min Energy");
+        _hitMinE.annotation().addItem("xAxisLabel", "Min 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 = aida().cloud1D("Hit: Min Energy over Total Energy");
+        _hitMinEOverTotE.annotation().addItem("xAxisLabel", "(Hit Min Energy) / (Total Energy) (GeV)");

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

-        _hitMaxE = aida().cloud1D("Hit: Maximum Energy");

+        _hitMaxE = aida().cloud1D("Hit: Max 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 = aida().cloud1D("Hit: Max 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 = aida().cloud2D("Hit: Max vs Min Energy");

         _hitMaxVsMinE.annotation().addItem("xAxisLabel", "Max Hit Energy (GeV)");
         _hitMaxVsMinE.annotation().addItem("yAxisLabel", "Min Hit Energy (GeV)");
 

@@ -232,8 +232,8 @@

         _layerAvgNHits.annotation().addItem("xAxisLabel", "Average Number of Hits in a Single Layer");
         _layerAvgNHits.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 = aida().cloud2D("Layer: Average Energy vs Average Number of Hits");
+        _layerAvgEVsAvgNHits.annotation().addItem("xAxisLabel", "Average Energy in a Single Layer (GeV)");

         _layerAvgEVsAvgNHits.annotation().addItem("yAxisLabel", "Average Number of Hits in a Single Layer");
 
         _layerMaxE = aida().cloud1D("Layer: Max Energy in a Single Layer");

@@ -339,7 +339,7 @@

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

-            plot.annotation().addItem("xAxisLabel", "Hit Energy (GeV)");

+            plot.annotation().addItem("xAxisLabel", "Hit Energy (log10(GeV))");

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

@@ -508,7 +508,7 @@

             String layerName = layerInfo.getTitleName();
 
             // Fill layer hit energy

-            aida().cloud1D(layerName + ": Hit Energy").fill(energy);

+            aida().cloud1D(layerName + ": Hit Energy").fill(log10(energy));

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

@@ -588,7 +588,7 @@

         
         // Fill # hits / E
         _hitOverE.fill(((double)nhits) / eventTotE);

-

+        

         // Fill min and max XYZ
         _hitMaxX.fill(maxX);
         _hitMinX.fill(minX);

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.21 -r1.22
--- MCParticlePlots.java	14 Feb 2006 01:31:25 -0000	1.21
+++ MCParticlePlots.java	21 Feb 2006 23:19:33 -0000	1.22
@@ -19,7 +19,7 @@

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

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

+ * @version $Id: MCParticlePlots.java,v 1.22 2006/02/21 23:19:33 jeremy Exp $

  */
 class MCParticlePlots extends AbstractPlots
 {

@@ -379,7 +379,7 @@

                     aida().cloud1D(particleName + ": Momentum").fill(MCParticleUtil.PMagnitude(particle));
 
                     // Plot transverse momentum -> x2 + y2

-                    aida().cloud1D(particleName + ": Transverse Momentum (log10)").fill(

+                    aida().cloud1D(particleName + ": Transverse Momentum").fill(

                             log10(MCParticleUtil.PTransverse(particle)));
 
                     // Plot P cos theta

@@ -418,7 +418,7 @@

                         aida().cloud2D(particleName + ": End Point XZ").fill(eX, eZ);
 
                         // Plot vtx to endpoint distance

-                        aida().cloud1D(particleName + ": Vertex to Endpoint Distance (log10)").fill(vtxEPdist);

+                        aida().cloud1D(particleName + ": Vertex to Endpoint Distance").fill(vtxEPdist);

 
                         // Plot endpoint RZ
                         aida().cloud2D(particleName + ": Endpoint R vs Z").fill(