SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.11 -r1.12
--- GenericHitPlots.java	23 Aug 2005 00:03:36 -0000	1.11
+++ GenericHitPlots.java	23 Aug 2005 01:03:42 -0000	1.12
@@ -82,8 +82,8 @@

         hitMaxEdep       = aida.cloud1D(makePlotName("Hit Max Edep"));
         hitMinVsMaxEdep  = aida.cloud2D(makePlotName("Hit Min vs Max Edep"));
         hitVsTotE        = aida.cloud2D(makePlotName("Hit Count vs Total Energy"));

-        layerPercentTotE = aida.histogram2D(makePlotName("Percent of Energy Total by Layer"), nlayers, 0, nlayers, 100, 0, 1.0);
-        layerPercentHits = aida.histogram2D(makePlotName("Percent of Hit Count by Layer"), nlayers, 0, nlayers, 100, 0, 1.0);

+        layerPercentTotE = aida.histogram2D(makePlotName("Layer Percentage of Energy Total"), nlayers, 0, nlayers, 100, 0, 1.0);
+        layerPercentHits = aida.histogram2D(makePlotName("Layer Percentage of Hit Count"), nlayers, 0, nlayers, 100, 0, 1.0);

 //        layerAvgEventE   = aida.histogram2D(makePlotName("Average Event Energy"), nlayers, 0, nlayers);
 //        layerAvgEventNHits = aida.histogram2D(makePlotName("Average Event Hit Count"), nlayers, 0, nlayers);
     }

@@ -195,7 +195,13 @@

                 
                 /* set and fill percent hit count */
                 layerInfo.setPercentNHits(nhits);

-                layerPercentHits.fill(layerInfo.getLayerNumber(), layerInfo.getPercentNHits());

+                layerPercentHits.fill(layerInfo.getLayerNumber(), layerInfo.getPercentNHits());                                
+            }
+            
+            /* reset layers */
+            for ( LayerInfo layerInfo : layers.values() )
+            {
+                layerInfo.reset();

             }
         }
     }

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.1 -r1.2
--- LayerInfo.java	23 Aug 2005 00:03:36 -0000	1.1
+++ LayerInfo.java	23 Aug 2005 01:03:42 -0000	1.2
@@ -13,8 +13,8 @@

     int nhits = 0;
     double percentTotE = 0;
     double percentNHits = 0;

-    double averageE = 0;
-    double averageNHits = 0;

+//    double averageE = 0;
+//    double averageNHits = 0;

     
     public LayerInfo(int layerNum)
     {

@@ -66,23 +66,31 @@

         return percentNHits;
     }
     

-    void setAverageEventEnergy(int nevents)

+    void reset()

     {

-        averageE = edep / (double)nevents;
-    }
-    
-    double getAverageEventEnergy()
-    {
-        return averageE;
-    }
-    
-    void setAverageEventNHits(int nevents)
-    {
-        averageNHits = nhits / (double)nevents;
-    }
-    
-    double getAverageEventNHits()
-    {
-        return averageNHits;
-    }

+        edep = 0;
+        nhits = 0;
+        percentTotE = 0;
+        percentNHits = 0;
+    }
+    
+//    void setAverageEventEnergy(int nevents)
+//    {
+//        averageE = edep / (double)nevents;
+//    }
+//
+//    double getAverageEventEnergy()
+//    {
+//        return averageE;
+//    }
+//
+//    void setAverageEventNHits(int nevents)
+//    {
+//        averageNHits = nhits / (double)nevents;
+//    }
+//
+//    double getAverageEventNHits()
+//    {
+//        return averageNHits;
+//    }

 }

\ No newline at end of file