SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.17 -r1.18
--- GenericHitPlots.java	5 Jan 2006 03:23:05 -0000	1.17
+++ GenericHitPlots.java	26 Jan 2006 20:17:20 -0000	1.18
@@ -16,7 +16,7 @@

 
 /**
  * @author jeremym

- * @version $Id: GenericHitPlots.java,v 1.17 2006/01/05 03:23:05 jeremy Exp $

+ * @version $Id: GenericHitPlots.java,v 1.18 2006/01/26 20:17:20 jeremy Exp $

  */
 class GenericHitPlots extends AbstractPlots
 {

@@ -27,6 +27,8 @@

     ICloud2D _thetaPhi;
     ICloud2D _xy;
     ICloud2D _rz;

+    ICloud2D _zx;
+    ICloud2D _zy;

     IHistogram1D _layer;
     ICloud1D _hitCount;
     ICloud1D _hitAvgEnergy;

@@ -94,13 +96,15 @@

     protected void definePlots()
     {
         cd();

-        _energy           = _aida.cloud1D("Hit Energies");

+        _energy           = _aida.cloud1D("Individual Hit Energy");

         _hitAvgEnergy     = _aida.cloud1D("Hit Average Energy by Event");

-        _time             = _aida.histogram1D("Hit Time", 100, 0, 50);
-        _thetaPhi         = _aida.cloud2D("Hit Theta vs Phi");
-        _xy               = _aida.cloud2D("Hit X vs Y");
-        _rz               = _aida.cloud2D("Hit R vs Z");
-        _layer            = _aida.histogram1D("Hit Layer", _nlayers, 0, _nlayers);

+        _time             = _aida.histogram1D("Time", 100, 0, 50);
+        _thetaPhi         = _aida.cloud2D("Theta vs Phi");
+        _xy               = _aida.cloud2D("X vs Y");
+        _zx               = _aida.cloud2D("Z vs X");        
+        _zy               = _aida.cloud2D("Z vs Y");
+        _rz               = _aida.cloud2D("R vs Z");
+        _layer            = _aida.histogram1D("Layer Number", _nlayers, 0, _nlayers);

         _layerEnergy      = _aida.histogram1D("Layer Energy", _nlayers, 0, _nlayers);
         _energyEvent      = _aida.cloud1D("Event Total Energy");
         _hitCount         = _aida.cloud1D("Event Total Hit Count");

@@ -149,15 +153,21 @@

                 _thetaPhi.fill(HitUtil.getTheta(position), HitUtil.getPhi(position) );
                 
                 /* hit X vs. Y */

-                _xy.fill(hit.getX(), hit.getY() );

+                _xy.fill(hit.getX(), hit.getY() );                
+                
+                /* Z vs. X */
+                _zx.fill(hit.getZ(), hit.getX() );
+                
+                /* Z vs. Y */
+                _zy.fill(hit.getZ(), hit.getY() );

                 
                 /* hit Z vs. cylindrical radius */
                 _rz.fill(hit.getZ(), HitUtil.getCylindricalRadius(position) );
                 

-                /* hit _layer */

+                /* hit layer */

                 _layer.fill(hit.getLayer());
                 

-                /* hit weighted _layer _energy */

+                /* hit weighted layer energy */

                 _layerEnergy.fill(hit.getLayer(), edep);
                 
                 /* incr tot E */