SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.1 -r1.2
--- AbstractPlots.java	24 Aug 2005 07:42:04 -0000	1.1
+++ AbstractPlots.java	29 Sep 2005 21:08:30 -0000	1.2
@@ -55,17 +55,7 @@

     {
         tree.cd(this.getDir());
     }

-    
-    static AIDA aida()
-    {
-        return aida;
-    }
-    
-    static IPlotter plotter()
-    {
-        return aida().analysisFactory().createPlotterFactory().create();
-    }
-    

+        

     protected void definePlots()
     {
         cd();

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.6 -r1.7
--- CalorimeterHitPlotsDriver.java	24 Aug 2005 07:42:03 -0000	1.6
+++ CalorimeterHitPlotsDriver.java	29 Sep 2005 21:08:30 -0000	1.7
@@ -13,6 +13,11 @@

  */
 public class CalorimeterHitPlotsDriver extends PlotsDriver
 {

+    CalorimeterHitPlotsDriver(SlicDiagnosticsDriver mom)
+    {
+        super(mom);
+    }
+    

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

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.6 -r1.7
--- EventSummaryPlotsDriver.java	24 Aug 2005 07:42:03 -0000	1.6
+++ EventSummaryPlotsDriver.java	29 Sep 2005 21:08:30 -0000	1.7
@@ -23,8 +23,9 @@

  */
 public class EventSummaryPlotsDriver extends PlotsDriver
 {

-    EventSummaryPlotsDriver()
-    {

+    EventSummaryPlotsDriver(SlicDiagnosticsDriver mom)
+    {        
+        super(mom);

         plots.put("",new EventSummaryPlots());
     }
     

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.6 -r1.7
--- GenericHitPlotsDriver.java	24 Aug 2005 07:42:03 -0000	1.6
+++ GenericHitPlotsDriver.java	29 Sep 2005 21:08:30 -0000	1.7
@@ -19,6 +19,11 @@

 {
     double trackerHitCount;
     

+    GenericHitPlotsDriver(SlicDiagnosticsDriver mom)
+    {
+        super(mom);
+    }
+    

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

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.6 -r1.7
--- MCParticlePlotsDriver.java	24 Aug 2005 07:42:03 -0000	1.6
+++ MCParticlePlotsDriver.java	29 Sep 2005 21:08:30 -0000	1.7
@@ -14,8 +14,9 @@

  */
 public class MCParticlePlotsDriver extends PlotsDriver
 {    

-    MCParticlePlotsDriver()

+    MCParticlePlotsDriver(SlicDiagnosticsDriver mom)

     {

+        super(mom);

         plots.put("", new MCParticlePlots());
     }
     

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.2 -r1.3
--- PlotsDriver.java	24 Aug 2005 07:42:04 -0000	1.2
+++ PlotsDriver.java	29 Sep 2005 21:08:30 -0000	1.3
@@ -20,9 +20,12 @@

 {
     protected Map<String, AbstractPlots> plots = new HashMap<String, AbstractPlots>();    
     protected int nevents = 0;

+    SlicDiagnosticsDriver mom;

-    public PlotsDriver()
-    {}

+    public PlotsDriver(SlicDiagnosticsDriver mom)
+    {
+        this.mom = mom;
+    }

     
     protected void process(EventHeader event)
     {

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.10 -r1.11
--- SlicDiagnosticsDriver.java	24 Aug 2005 07:42:04 -0000	1.10
+++ SlicDiagnosticsDriver.java	29 Sep 2005 21:08:30 -0000	1.11
@@ -5,6 +5,7 @@

  */
 package org.lcsim.slic.diagnostics;
 

+import hep.aida.IPlotter;

 import java.io.File;
 import org.freehep.application.Application;
 import org.freehep.application.studio.Studio;

@@ -12,7 +13,6 @@

 import org.freehep.record.source.SequentialRecordSource;
 import org.lcsim.util.Driver;
 import org.lcsim.event.EventHeader;

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

 import org.lcsim.util.aida.AIDA;
 import hep.aida.ITree;
 

@@ -22,38 +22,42 @@

  */
 public class SlicDiagnosticsDriver extends Driver
 {

-    protected AIDA aida = AIDA.defaultInstance();
-    protected ITree tree = aida.tree();

+    private static AIDA aida = AIDA.defaultInstance();
+    private static ITree tree = aida.tree();

     
     private String fileName = null;

-    private String defaultFileName = "slicDiagnostics";

+    private static final String defaultFileName = "slicDiagnostics";

-    int evtCnt = 0;

+    private EventHeader currentEvent = null;
+    
+    private int evtCnt = 0;

     
     public SlicDiagnosticsDriver()
     {
         super();

-        addDefaultSubdrivers();                

+        addDefaultSubdrivers();

         message("org.lcsim.slic.diagnostics.SlicDiagnosticsDriver is loaded.");
     }
     
     private void addDefaultSubdrivers()
     {

-        add(new GenericHitPlotsDriver() );
-        add(new MCParticlePlotsDriver() );
-        add(new CalorimeterHitPlotsDriver() );
-        add(new TrackerHitPlotsDriver() );
-        add(new EventSummaryPlotsDriver() );

+        add(new GenericHitPlotsDriver(this) );
+        add(new MCParticlePlotsDriver(this) );
+        add(new CalorimeterHitPlotsDriver(this) );
+        add(new TrackerHitPlotsDriver(this) );
+        add(new EventSummaryPlotsDriver(this) );

     }
     
     protected void process(EventHeader event)
     {

+        currentEvent = event;

         super.process(event);
         ++evtCnt;
     }
     
     protected void startOfData()
     {

+        evtCnt = 0;

         super.startOfData();
         setFilename();
     }

@@ -63,7 +67,26 @@

         super.endOfData();
         savePlots();
         message("Processed " + "<" + evtCnt + "> events.");

-        evtCnt = 0;

+    }
+    
+    static AIDA aida()
+    {
+        return aida;
+    }
+    
+    static IPlotter plotter()
+    {
+        return aida().analysisFactory().createPlotterFactory().create();
+    }
+    
+    public int getEventCount()
+    {
+        return evtCnt;
+    }
+    
+    public EventHeader getCurrentEvent()
+    {
+        return currentEvent;

     }
     
     /** Set the filename to argument basename. */

@@ -87,7 +110,7 @@

                     {
                         String s = source.getSourceName();
                         int slashPos = s.lastIndexOf("/");

-                        if (slashPos != -1) 

+                        if (slashPos != -1)

                         {
                             s = s.substring(slashPos);
                         }

@@ -123,6 +146,6 @@

     
     private void message(String m)
     {

-        System.out.println("SlicDiagnosticsDriver - " + m);       

+        System.out.println("SlicDiagnosticsDriver - " + m);

     }
 }

\ No newline at end of file

SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.3 -r1.4
--- TrackerHitPlotsDriver.java	24 Aug 2005 07:42:04 -0000	1.3
+++ TrackerHitPlotsDriver.java	29 Sep 2005 21:08:30 -0000	1.4
@@ -14,6 +14,11 @@

  */
 public class TrackerHitPlotsDriver extends PlotsDriver
 {    

+    TrackerHitPlotsDriver(SlicDiagnosticsDriver mom)
+    {
+        super(mom);
+    }
+    

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

SlicDiagnostics/test/org/lcsim/slic/diagnostics

diff -u -r1.3 -r1.4
--- SlicDiagnosticsDriverTest.java	20 Aug 2005 21:19:47 -0000	1.3
+++ SlicDiagnosticsDriverTest.java	29 Sep 2005 21:08:31 -0000	1.4
@@ -33,10 +33,10 @@

         SlicDiagnosticsDriver slicDiag = new SlicDiagnosticsDriver();
         slicDiag.setAidaFileName("SlicDiagnosticsDriverTest");
         

-        slicDiag.add(new CalorimeterHitPlotsDriver());
-        slicDiag.add(new EventSummaryPlotsDriver());
-        slicDiag.add(new MCParticlePlotsDriver());
-        slicDiag.add(new GenericHitPlotsDriver());                

+        slicDiag.add(new CalorimeterHitPlotsDriver(slicDiag));
+        slicDiag.add(new EventSummaryPlotsDriver(slicDiag));
+        slicDiag.add(new MCParticlePlotsDriver(slicDiag));
+        slicDiag.add(new GenericHitPlotsDriver(slicDiag));                

         
         loop.add(slicDiag);
         loop.loop(-1);