SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.2 -r1.3
--- CalorimeterHitPlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
+++ CalorimeterHitPlotsDriver.java 1 Aug 2005 06:34:50 -0000 1.3
@@ -16,10 +16,7 @@
public class CalorimeterHitPlotsDriver extends Driver
{
Map<String, CalorimeterHitPlots> calorimeterHitPlots = new HashMap<String,CalorimeterHitPlots>();
-
- public CalorimeterHitPlotsDriver()
- {}
-
+
protected void process(EventHeader event)
{
super.process(event);
@@ -28,8 +25,9 @@
for ( List<SimCalorimeterHit> simCalorimeterHits : simCalorimeterHitCollections)
{
LCMetaData meta = event.getMetaData(simCalorimeterHits);
- CalorimeterHitPlots calPlots = getCalorimeterHitPlots(meta);
- calPlots.fill(simCalorimeterHits);
+ CalorimeterHitPlots calPlots = getCalorimeterHitPlots(meta);
+ calPlots.setSimCalorimeterHitList(simCalorimeterHits);
+ calPlots.fill();
}
}
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.2 -r1.3
--- EventSummaryPlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
+++ EventSummaryPlotsDriver.java 1 Aug 2005 06:34:51 -0000 1.3
@@ -28,10 +28,14 @@
EventSummaryPlots plots = new EventSummaryPlots();
EventSummaryPlotsDriver()
- {}
+ {
+ super();
+ }
protected void process(EventHeader event)
{
- plots.fill(event);
+ super.process(event);
+ plots.setEventHeader(event);
+ plots.fill();
}
}
\ No newline at end of file
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.2 -r1.3
--- GenericHitPlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
+++ GenericHitPlotsDriver.java 1 Aug 2005 06:34:51 -0000 1.3
@@ -16,18 +16,16 @@
*
* @author jeremym
*/
-class GenericHitPlotsDriver extends Driver
+public class GenericHitPlotsDriver extends Driver
{
Map<String, GenericHitPlots> genericHitPlots = new HashMap<String,GenericHitPlots>();
double trackerHitCount;
-
- /** Creates a new instance of SingleHitCollectionPlots */
- public GenericHitPlotsDriver()
- {}
-
+
protected void process(EventHeader event)
- {
+ {
+ super.process(event);
+
/* proc tracker colls */
processTrackerCollections(event);
@@ -54,7 +52,8 @@
LCMetaData meta = event.getMetaData(simTrackerHits);
GenericHitPlots plots = getGenericHitPlots(meta);
List<GenericHit> hits = makeTrackerHits(simTrackerHits, meta);
- plots.fill(hits);
+ plots.setGenericHitList(hits);
+ plots.fill();
}
}
@@ -66,7 +65,8 @@
LCMetaData meta = event.getMetaData(simCalorimeterHits);
GenericHitPlots plots = getGenericHitPlots(meta);
List<GenericHit> hits = makeCalorimeterHits(simCalorimeterHits, meta);
- plots.fill(hits);
+ plots.setGenericHitList(hits);
+ plots.fill();
}
}
@@ -123,4 +123,4 @@
trackerHit.getTime()
);
}
-}
+}
\ No newline at end of file
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.2 -r1.3
--- MCParticlePlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
+++ MCParticlePlotsDriver.java 1 Aug 2005 06:34:51 -0000 1.3
@@ -16,10 +16,7 @@
public class MCParticlePlotsDriver extends Driver
{
MCParticlePlots mcpPlots = new MCParticlePlots();
-
- public MCParticlePlotsDriver()
- {}
-
+
protected void process(EventHeader event)
{
super.process(event);
@@ -28,7 +25,8 @@
List<List<MCParticle>> mcpCollections = event.get(MCParticle.class);
for ( List<MCParticle> mcp : mcpCollections )
{
- mcpPlots.fill(mcp);
+ mcpPlots.setMCParticleList(mcp);
+ mcpPlots.fill();
}
}
}
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.5 -r1.6
--- SlicDiagnosticsDriver.java 29 Jul 2005 02:53:20 -0000 1.5
+++ SlicDiagnosticsDriver.java 1 Aug 2005 06:34:51 -0000 1.6
@@ -3,7 +3,6 @@
*
* Created on July 25, 2005, 4:04 PM
*/
-
package org.lcsim.slic.diagnostics;
import java.io.File;
@@ -17,6 +16,7 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.util.aida.AIDA;
+import hep.aida.ITree;
/**
*
@@ -24,26 +24,46 @@
*/
public class SlicDiagnosticsDriver extends Driver
{
- AIDA aida = AIDA.defaultInstance();
- String fileName = null;
- String defaultFileName = "slicDiagnostics.aida";
+ protected AIDA aida = AIDA.defaultInstance();
+ protected ITree tree = aida.tree();
+
+ private String fileName = null;
+ private String defaultFileName = "slicDiagnostics";
public SlicDiagnosticsDriver()
- {}
+ {
+ super();
+ addDefaultSubdrivers();
+ System.out.println("Loaded SlicDiagnosticsDriver.");
+ }
+
+ private void addDefaultSubdrivers()
+ {
+ add(new GenericHitPlotsDriver() );
+ add(new MCParticlePlotsDriver() );
+ add(new CalorimeterHitPlotsDriver() );
+ add(new EventSummaryPlotsDriver() );
+ }
/** Call child drivers. */
protected void process(EventHeader event)
{
- super.process(event);
- }
+ super.process(event);
+ }
+
+ protected void startOfData()
+ {
+ super.startOfData();
+ setFilename();
+ }
/** Set the filename to argument basename with ".slcio" replaced by ".aida". */
- public void setFileName(String path)
+ public void setAidaFileName(String path)
{
fileName = (new File(path)).getName().replace(".slcio",".aida");
}
- protected void startOfData()
+ private void setFilename()
{
if ( fileName == null )
{
@@ -57,28 +77,37 @@
SequentialRecordSource source = loop.getRecordSource();
if ( source != null )
{
- fileName = source.getSourceName();
+ setAidaFileName( source.getSourceName() );
}
}
}
/* set filename to default */
- if ( fileName == null )
+ if ( fileName == null )
{
- fileName = defaultFileName;
+ setAidaFileName( defaultFileName );
}
- }
+ }
}
protected void endOfData()
{
- try
- {
- aida.saveAs(fileName);
- }
- catch (Exception e)
+ super.endOfData();
+ savePlots();
+ }
+
+ private void savePlots()
+ {
+ if ( Application.getApplication() == null)
{
- throw new RuntimeException("Problem committing tree.", e);
+ try
+ {
+ aida.saveAs(fileName);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Problem saving tree to " + fileName + ".", e);
+ }
}
- }
-}
+ }
+}
\ No newline at end of file
