SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.29 -r1.30
--- GenericHitPlots.java	17 Feb 2006 01:27:43 -0000	1.29
+++ GenericHitPlots.java	17 Feb 2006 19:42:07 -0000	1.30
@@ -6,15 +6,15 @@

 import hep.aida.IHistogram1D;
 import hep.aida.IHistogram2D;
 

-import java.util.HashMap;

+import java.util.LinkedHashMap;

 import java.util.List;
 import java.util.Map;
 

+import org.lcsim.event.EventHeader;
+import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.geometry.Layered;
 import org.lcsim.geometry.Subdetector;
 import org.lcsim.geometry.layer.Layer;

-import org.lcsim.event.EventHeader;
-import org.lcsim.event.EventHeader.LCMetaData;

 
 /**
  * A set of diagnostic plots on lists of GenericHits. These include

@@ -23,7 +23,7 @@

  * subdetector.
  * 
  * @author jeremym

- * @version $Id: GenericHitPlots.java,v 1.29 2006/02/17 01:27:43 jeremy Exp $

+ * @version $Id: GenericHitPlots.java,v 1.30 2006/02/17 19:42:07 jeremy Exp $

  */
 class GenericHitPlots extends AbstractPlots
 {

@@ -376,7 +376,7 @@

     List<GenericHit> _hits;
 
     // Map of layer number to LayerInfo

-    Map<Integer, LayerInfo> _layers = new HashMap<Integer, LayerInfo>();

+    Map<Integer, LayerInfo> _layers = new LinkedHashMap<Integer, LayerInfo>();

 
     // Type of hits, i.e. SimCalorimeterHit or SimTrackerHit
     GenericHit.HitType _hitType = null;

@@ -674,9 +674,18 @@

             
             // Increment cum N hits by this layer's hits
             cumn += layerNHits;

+            double fn = ((double)cumn) / ((double)nhits);

             
             // Increment cum E by this layer's E
             cume += layerE;

+            double fe = cume / eventTotE;
+            
+            System.out.println("layer="+layerNumber);
+            //System.out.println("cume="+cume);
+            //System.out.println("fe="+fe);
+            //System.out.println("cumn="+cumn);
+            //System.out.println("fn="+fn);
+            //System.out.println();

             
             // Update max E
             if (layerE > maxLayerE)

@@ -702,12 +711,10 @@

                 minLayerNHits = layerNHits;
             }
             

-            // Fill cumulative E per layer
-            double fe = cume / eventTotE;            

+            // Fill cumulative E per layer                        

             _layerCumE.fill(layerNumber, fe);            
             

-            // Fill cumulative N hits per layer            
-            double fn = ((double)cumn) / ((double)nhits);            

+            // Fill cumulative N hits per layer                                   

             _layerCumNHits.fill(layerNumber, fn);
             
             // Fill percentage of total hit count in this layer

@@ -745,6 +752,9 @@

             aida().cloud1D(layerName + ": Fraction of Total Energy").fill(layerInfo.getPercentTotalEnergy());
             cd();
         }

+        
+        System.out.println();
+        System.out.println();

 
         // Fill max edep in a layer
         _layerMaxE.fill(maxLayerE);