diff -u -r1.2 -r1.3
--- EventSummaryPlots.java	1 Aug 2005 06:33:51 -0000	1.2
+++ EventSummaryPlots.java	4 Aug 2005 01:39:50 -0000	1.3
@@ -83,7 +83,7 @@

             for( SimCalorimeterHit hit : simCalHits )
             {
                 calorimeterHitCount += 1;

-                calorimeterTotalEnergy += hit.getEnergy();

+                calorimeterTotalEnergy += hit.getRawEnergy();

             }
         }
         

diff -u -r1.3 -r1.4
--- EventSummaryPlotsDriver.java	1 Aug 2005 06:34:51 -0000	1.3
+++ EventSummaryPlotsDriver.java	4 Aug 2005 01:39:50 -0000	1.4
@@ -27,11 +27,6 @@

 {
     EventSummaryPlots plots = new EventSummaryPlots();
 

-    EventSummaryPlotsDriver()
-    {
-        super();
-    }
-    

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

diff -u -r1.3 -r1.4
--- GenericHitPlotsDriver.java	1 Aug 2005 06:34:51 -0000	1.3
+++ GenericHitPlotsDriver.java	4 Aug 2005 01:39:50 -0000	1.4
@@ -101,7 +101,7 @@

         return new GenericHit(
                 GenericHit.HitType.CALORIMETER,
                 meta.getName(),

-                calorimeterHit.getEnergy(),

+                calorimeterHit.getRawEnergy(),

                 calorimeterHit.getPosition(),
                 layer,
                 calorimeterHit.getTime()

diff -u -r1.3 -r1.4
--- MCParticlePlotsDriver.java	1 Aug 2005 06:34:51 -0000	1.3
+++ MCParticlePlotsDriver.java	4 Aug 2005 01:39:50 -0000	1.4
@@ -14,7 +14,7 @@

  * @author jeremym
  */
 public class MCParticlePlotsDriver extends Driver

-{    

+{

     MCParticlePlots mcpPlots = new MCParticlePlots();
         
     protected void process(EventHeader event)

@@ -29,4 +29,4 @@

             mcpPlots.fill();
         }
     }    

-}

+}

\ No newline at end of file

diff -u -r1.1 -r1.2
--- Runner.java	1 Aug 2005 06:33:09 -0000	1.1
+++ Runner.java	4 Aug 2005 01:39:50 -0000	1.2
@@ -20,7 +20,7 @@

  *
  * @author jeremym
  *

- * Helper class to run SlicDiagnostics on a file or list of files.

+ * Helper class to run SlicDiagnosticsDriver on a file or list of files.

  *
  * For multiple input files, it will automatically name the output AIDA file 
  * after the first one in the list.

@@ -108,12 +108,15 @@

         {
             loop.loop(-1);
         }

+        catch (org.freehep.record.loop.NoLoopRecordException nlre)
+        {
+            /* ignore this */
+        }

         catch (Exception e)
         {
             System.out.println(e.getMessage());
         }
         

-//        System.out.println("DONE");

         loop.dispose();
         
         this.fileList.clear();

diff -u -r1.1 -r1.2
--- RunnerTest.java	1 Aug 2005 06:35:26 -0000	1.1
+++ RunnerTest.java	4 Aug 2005 01:39:51 -0000	1.2
@@ -30,12 +30,7 @@

     {
         return new TestSuite(RunnerTest.class);
     }

-    
-//    protected void setUp() throws Exception
-//    {    
-//        
-//    }
-    

+        

     public void testSingleFile() throws Exception
     {        
         FileCache cache = new FileCache();