SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.27 -r1.28
--- CalorimeterHitPlots.java	16 Mar 2006 02:36:26 -0000	1.27
+++ CalorimeterHitPlots.java	21 Mar 2006 19:13:54 -0000	1.28
@@ -27,7 +27,7 @@

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

- * @version $Id: CalorimeterHitPlots.java,v 1.27 2006/03/16 02:36:26 jeremy Exp $

+ * @version $Id: CalorimeterHitPlots.java,v 1.28 2006/03/21 19:13:54 jeremy Exp $

  */
 class CalorimeterHitPlots extends AbstractPlots
 {

@@ -184,9 +184,8 @@

 
                 if (haveSF)
                 {

-                    // Plot corrected E
-                    //_hitCorrectedEnergy.fill(log10(hit.getCorrectedEnergy()));
-		    _hitCorrectedEnergy.fill(log10(hit.getCorrectedEnergy()));

+                    // Plot corrected E                    
+                    _hitCorrectedEnergy.fill(hit.getCorrectedEnergy());

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

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.23 -r1.24
--- MCParticlePlots.java	16 Mar 2006 02:35:22 -0000	1.23
+++ MCParticlePlots.java	21 Mar 2006 19:13:54 -0000	1.24
@@ -20,7 +20,7 @@

  * A set of MCParticle plots, including plots for each particle type by PDGID.
  * 
  * @author jeremym

- * @version $Id: MCParticlePlots.java,v 1.23 2006/03/16 02:35:22 jeremy Exp $

+ * @version $Id: MCParticlePlots.java,v 1.24 2006/03/21 19:13:54 jeremy Exp $

  */
 class MCParticlePlots extends AbstractPlots
 {

@@ -116,7 +116,7 @@

     protected void fill(EventHeader event)
     {
         super.fill(event);

-        fill(event.get(MCParticle.class).get(0));

+        fill(event.get(MCParticle.class, getCollectionName() ));

     }
 
     /** Get or create a MCParticleType Info by PDGID */

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.10 -r1.11
--- MCParticlePlotsDriver.java	16 Mar 2006 02:35:22 -0000	1.10
+++ MCParticlePlotsDriver.java	21 Mar 2006 19:13:55 -0000	1.11
@@ -10,22 +10,15 @@

  * Driver for MCParticlePlots.
  * 
  * @author jeremym

- * @version $Id: MCParticlePlotsDriver.java,v 1.10 2006/03/16 02:35:22 jeremy Exp $

+ * @version $Id: MCParticlePlotsDriver.java,v 1.11 2006/03/21 19:13:55 jeremy Exp $

  */
 public class MCParticlePlotsDriver extends PlotsDriver
 {    
     MCParticlePlotsDriver(SlicDiagnosticsDriver mom)
     {
         super(mom);

-        //_plots.put("", new MCParticlePlots());

     }

-    
-    //protected void process(EventHeader event)
-    //{
-    //    super.process(event);
-    //    _plots.get("").fill(event);
-    //}    
-    

+        

     protected void process(EventHeader event)
     {
         super.process(event);

@@ -35,7 +28,7 @@

         {
             LCMetaData meta = event.getMetaData(particles);
             MCParticlePlots mcpPlots = getMCParticlePlots(meta);

-            mcpPlots.fill(event);

+            mcpPlots.fill(event);           

         }
     }