5 added + 1 removed + 9 modified, total 15 files
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -N EventSummaryPlots.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ EventSummaryPlots.java 29 Jul 2005 02:53:20 -0000 1.1
@@ -0,0 +1,95 @@
+/*
+ * SlicDiagnosticsDriver.java
+ *
+ * Created on July 25, 2005, 4:04 PM
+ */
+
+package org.lcsim.slic.diagnostics;
+
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import org.lcsim.util.aida.AIDA;
+import hep.aida.ICloud1D;
+import hep.aida.ITree;
+
+import org.lcsim.util.Driver;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.SimTrackerHit;
+import org.lcsim.event.SimCalorimeterHit;
+
+/**
+ *
+ * @author jeremym
+ */
+public class EventSummaryPlots extends PlotsBase
+{
+ ICloud1D eventTotalEnergy;
+ ICloud1D eventHits;
+ ICloud1D eventTrackerHits;
+ ICloud1D eventCalorimeterHits;
+ ICloud1D eventTrackerEnergy;
+ ICloud1D eventCalorimeterEnergy;
+
+ double trackerTotalEnergy = 0;
+ double calorimeterTotalEnergy = 0;
+ int trackerHitCount = 0;
+ int calorimeterHitCount = 0;
+
+ EventSummaryPlots()
+ {
+ definePlots();
+ }
+
+ private final void definePlots()
+ {
+ makeAidaDir("/Event");
+ tree.cd("/Event");
+ eventTotalEnergy = aida.cloud1D("event_energy");
+ eventHits = aida.cloud1D("event_hits");
+ eventTrackerHits = aida.cloud1D("event_trackerHits");
+ eventCalorimeterHits = aida.cloud1D("event_calorimeterHits");
+ eventTrackerEnergy = aida.cloud1D("event_trackerEnergy");
+ eventCalorimeterEnergy = aida.cloud1D("event_calorimeterEnergy");
+ tree.cd("..");
+ }
+
+ protected void fill(EventHeader event)
+ {
+ trackerTotalEnergy = calorimeterTotalEnergy = 0;
+ trackerHitCount = calorimeterHitCount = 0;
+
+ /* cal hits */
+ List<List<SimCalorimeterHit>> cals = event.get(SimCalorimeterHit.class);
+ for ( List<SimCalorimeterHit> simCalHits : cals )
+ {
+ for( SimCalorimeterHit hit : simCalHits )
+ {
+ calorimeterHitCount += 1;
+ calorimeterTotalEnergy += hit.getEnergy();
+ }
+ }
+
+ /* trk hits */
+ List<List<SimTrackerHit>> trks = event.get(SimTrackerHit.class);
+ for ( List<SimTrackerHit> simTrkHits : trks )
+ {
+ for( SimTrackerHit hit : simTrkHits )
+ {
+ trackerHitCount += 1;
+ trackerTotalEnergy += hit.getdEdx();
+ }
+ }
+
+ /* event energy */
+ eventTotalEnergy.fill(trackerTotalEnergy + calorimeterTotalEnergy);
+ eventCalorimeterEnergy.fill(calorimeterTotalEnergy);
+ eventTrackerEnergy.fill(trackerTotalEnergy);
+
+ /* event hit counts */
+ eventHits.fill(trackerHitCount + calorimeterHitCount);
+ eventTrackerHits.fill(trackerHitCount);
+ eventCalorimeterHits.fill(calorimeterHitCount);
+ }
+}
\ No newline at end of file
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -N Main.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Main.java 29 Jul 2005 02:53:20 -0000 1.1
@@ -0,0 +1,73 @@
+/*
+ * Main.java
+ *
+ * Created on July 28, 2005, 2:07 PM
+ */
+
+package org.lcsim.slic.diagnostics;
+
+import java.io.File;
+import java.util.List;
+import java.util.ArrayList;
+import org.lcsim.util.loop.LCIOEventSource;
+import org.lcsim.util.loop.LCSimLoop;
+
+/**
+ *
+ * @author jeremym
+ */
+public class Main
+{
+ public static void main(String[] args)
+ {
+ new Main(args);
+ }
+
+ /**
+ * Creates single output AIDA file from list of files on the local filesystem.
+ * Output file is named after the first file in the list.
+ */
+ public Main(String[] args)
+ {
+ if (args.length == 0)
+ {
+ throw new IllegalArgumentException("Argument list is empty.");
+ }
+
+ try
+ {
+ List<File> files = new ArrayList<File>();
+ for ( String arg : args )
+ {
+ File file = new File(arg);
+ files.add(file);
+ }
+
+ LCIOEventSource src = new LCIOEventSource("SlicDiagnostics", files);
+
+ SlicDiagnosticsDriver slicDiag = new SlicDiagnosticsDriver();
+ slicDiag.setFileName(files.get(0).toString());
+
+ /* Add all plot drivers. */
+ GenericHitPlotsDriver genericPlots = new GenericHitPlotsDriver();
+ MCParticlePlotsDriver mcpPlots = new MCParticlePlotsDriver();
+ CalorimeterHitPlotsDriver calPlots = new CalorimeterHitPlotsDriver();
+ EventSummaryPlotsDriver evtPlots = new EventSummaryPlotsDriver();
+
+ slicDiag.add(evtPlots);
+ slicDiag.add(genericPlots);
+ slicDiag.add(mcpPlots);
+ slicDiag.add(calPlots);
+
+ LCSimLoop loop = new LCSimLoop();
+ loop.setLCIORecordSource(src);
+ loop.add(slicDiag);
+ loop.loop(-1);
+ loop.dispose();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Problem running SlicDiagnostics' Main.", e);
+ }
+ }
+}
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -N PlotsBase.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ PlotsBase.java 29 Jul 2005 02:53:20 -0000 1.1
@@ -0,0 +1,32 @@
+/*
+ * PlotsBase.java
+ *
+ * Created on July 28, 2005, 6:59 PM
+ */
+
+package org.lcsim.slic.diagnostics;
+
+import org.lcsim.util.aida.AIDA;
+import hep.aida.ITree;
+
+/**
+ *
+ * @author jeremym
+ */
+abstract public class PlotsBase
+{
+ AIDA aida = org.lcsim.util.aida.AIDA.defaultInstance();
+ ITree tree = aida.tree();
+
+ protected void makeAidaDir(String dir)
+ {
+ try
+ {
+ tree.mkdir(dir);
+ }
+ catch (Exception e)
+ {
+ /* probably it just already exists */
+ }
+ }
+}
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.2 -r1.3
--- CalorimeterHitPlots.java 28 Jul 2005 19:20:14 -0000 1.2
+++ CalorimeterHitPlots.java 29 Jul 2005 02:53:20 -0000 1.3
@@ -10,44 +10,46 @@
import hep.aida.ICloud1D;
import hep.aida.ICloud2D;
import hep.aida.ITree;
+
+import org.lcsim.util.Driver;
+import org.lcsim.event.EventHeader;
import org.lcsim.util.aida.AIDA;
import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.event.MCParticle;
-import org.lcsim.util.Driver;
-import org.lcsim.event.EventHeader;
/**
*
* @author jeremym
*/
-public class CalorimeterHitPlots
-{
- AIDA aida = org.lcsim.util.aida.AIDA.defaultInstance();
- ITree tree = aida.tree();;
-
- /* plots: basic MCP */
+public class CalorimeterHitPlots extends PlotsBase
+{
+ /* cal plots: basic MCP stats */
ICloud1D mcpCountPerHit;
ICloud1D mcpPDG;
- ICloud1D mcpSingleContribPDG;
+ ICloud1D mcpSingleContribPDG;
- String collName;
+ String collName;
/** Creates a new instance of CalorimeterHitPlots */
public CalorimeterHitPlots(LCMetaData meta)
{
- collName = meta.getName();
+ collName = meta.getName();
+
definePlots();
}
- void definePlots()
+ private void definePlots()
{
+ makeAidaDir("/" + collName);
tree.cd("/" + collName);
- mcpCountPerHit = aida.cloud1D(collName + "_MCParticlesPerHit");
- mcpPDG = aida.cloud1D(collName + "_MCParticlesPDGCode");
- mcpSingleContribPDG = aida.cloud1D(collName + "_MCParticlesSingleContributorPDG");
+
+ mcpCountPerHit = aida.cloud1D(collName + "_mcpPerHit");
+ mcpPDG = aida.cloud1D(collName + "_mcpPDGID");
+ mcpSingleContribPDG = aida.cloud1D(collName + "_mcpSingleContribPDGID");
+
tree.cd("..");
- }
+ }
public void fill(List<SimCalorimeterHit> hits)
{
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.1 -r1.2
--- CalorimeterHitPlotsDriver.java 28 Jul 2005 19:20:14 -0000 1.1
+++ CalorimeterHitPlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
@@ -35,11 +35,11 @@
private CalorimeterHitPlots getCalorimeterHitPlots(LCMetaData meta)
{
- if ( calorimeterHitPlots.get(meta.getName()) == null )
+ String name = meta.getName();
+ if ( calorimeterHitPlots.get(name) == null )
{
- calorimeterHitPlots.put(meta.getName(), new CalorimeterHitPlots(meta) );
- }
-
- return calorimeterHitPlots.get(meta.getName());
+ calorimeterHitPlots.put(name, new CalorimeterHitPlots(meta) );
+ }
+ return calorimeterHitPlots.get(name);
}
}
\ No newline at end of file
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.1 -r1.2
--- EventSummaryPlotsDriver.java 28 Jul 2005 19:20:14 -0000 1.1
+++ EventSummaryPlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
@@ -7,15 +7,8 @@
package org.lcsim.slic.diagnostics;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
-import java.io.File;
-
-import org.freehep.application.Application;
-import org.freehep.application.studio.Studio;
-import org.freehep.record.loop.SequentialRecordLoop;
-import org.freehep.record.source.SequentialRecordSource;
import org.lcsim.util.aida.AIDA;
import hep.aida.ICloud1D;
@@ -23,12 +16,8 @@
import org.lcsim.util.Driver;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.event.MCParticle;
-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.event.EventHeader.LCMetaData;
/**
*
@@ -36,79 +25,13 @@
*/
public class EventSummaryPlotsDriver extends Driver
{
- AIDA aida = AIDA.defaultInstance();
- ITree tree = aida.tree();
-
- ICloud1D eventTotalEnergy;
- ICloud1D eventHits;
- ICloud1D eventTrackerHits;
- ICloud1D eventCalorimeterHits;
- ICloud1D eventTrackerEnergy;
- ICloud1D eventCalorimeterEnergy;
-
- double trackerTotalEnergy = 0;
- double calorimeterTotalEnergy = 0;
- int trackerHitCount = 0;
- int calorimeterHitCount = 0;
-
+ EventSummaryPlots plots = new EventSummaryPlots();
+
EventSummaryPlotsDriver()
- {
- definePlots();
- }
-
- private final void definePlots()
- {
- eventTotalEnergy = aida.cloud1D("eventEnergy");
- eventHits = aida.cloud1D("eventHits");
- eventTrackerHits = aida.cloud1D("eventTrackerHits");
- eventCalorimeterHits = aida.cloud1D("eventCalorimeterHits");
- eventTrackerEnergy = aida.cloud1D("eventTrackerEnergy");
- eventCalorimeterEnergy = aida.cloud1D("eventCalorimeterEnergy");
- }
+ {}
protected void process(EventHeader event)
{
- super.process(event);
-
- trackerTotalEnergy = calorimeterTotalEnergy = 0;
- trackerHitCount = calorimeterHitCount = 0;
-
- /* cal hits */
- List<List<SimCalorimeterHit>> cals = event.get(SimCalorimeterHit.class);
- for ( List<SimCalorimeterHit> simCalHits : cals )
- {
- for( SimCalorimeterHit hit : simCalHits )
- {
- calorimeterHitCount += 1;
- calorimeterTotalEnergy += hit.getEnergy();
- }
- }
-
- /* trk hits */
- List<List<SimTrackerHit>> trks = event.get(SimTrackerHit.class);
- for ( List<SimTrackerHit> simTrkHits : trks )
- {
- for( SimTrackerHit hit : simTrkHits )
- {
- trackerHitCount += 1;
- trackerTotalEnergy += hit.getdEdx();
- }
- }
-
- /* fill the plots */
- fill();
- }
-
- public void fill()
- {
- /* event energy */
- eventTotalEnergy.fill(trackerTotalEnergy + calorimeterTotalEnergy);
- eventCalorimeterEnergy.fill(calorimeterTotalEnergy);
- eventTrackerEnergy.fill(trackerTotalEnergy);
-
- /* event hit counts */
- eventTrackerHits.fill(trackerHitCount);
- eventCalorimeterHits.fill(calorimeterHitCount);
- eventHits.fill(trackerHitCount + calorimeterHitCount);
+ plots.fill(event);
}
}
\ No newline at end of file
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.2 -r1.3
--- GenericHit.java 27 Jul 2005 23:21:36 -0000 1.2
+++ GenericHit.java 29 Jul 2005 02:53:20 -0000 1.3
@@ -6,11 +6,6 @@
package org.lcsim.slic.diagnostics;
-import static java.lang.Math.PI;
-import static java.lang.Math.sqrt;
-import static java.lang.Math.atan2;
-import static java.lang.Math.atan;
-
/**
*
* @author jeremym
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.4 -r1.5
--- GenericHitPlots.java 28 Jul 2005 19:20:14 -0000 1.4
+++ GenericHitPlots.java 29 Jul 2005 02:53:20 -0000 1.5
@@ -9,21 +9,14 @@
import hep.aida.ITree;
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.event.SimTrackerHit;
import org.lcsim.geometry.subdetector.SubdetectorIDDecoder;
-
/**
*
* @author jeremym
*/
-class GenericHitPlots
-{
- AIDA aida = org.lcsim.util.aida.AIDA.defaultInstance();
- ITree tree = aida.tree();
-
- String collName;
-
+class GenericHitPlots extends PlotsBase
+{
/* plots */
ICloud1D energy;
ICloud1D energyEvent;
@@ -37,6 +30,8 @@
ICloud1D layerEnergy;
ICloud1D layerHitCount;
+ String collName;
+
int nlayers = 0;
double eventTotEnergy = 0;
@@ -52,31 +47,18 @@
this.collName = meta.getName();
/* set n layers */
- nlayers = ((SubdetectorIDDecoder)meta.getIDDecoder()).getSubdetector().getLayering().getLayerCount();
-
- /* make dir for these plots (if doesn't exist) */
- makeDir();
-
+ nlayers = ((SubdetectorIDDecoder)meta.getIDDecoder()).getSubdetector().getLayering().getLayerCount();
+
/* define plots for this coll */
definePlots();
- }
-
- private void makeDir()
- {
- try
- {
- tree.mkdir("/" + collName);
- }
- catch (Exception e)
- {
- System.out.println("collName already exists: " + collName);
- }
- }
+ }
/* plots for generic hits */
private void definePlots()
{
+ makeAidaDir("/" + collName);
tree.cd("/" + collName);
+
energy = aida.cloud1D(collName + "_hitEnergy");
hitAvgEnergy = aida.cloud1D(collName + "_hitAvgEnergy");
time = aida.cloud1D(collName + "_hitTime");
@@ -86,6 +68,7 @@
layer = aida.histogram1D(collName + "_hitLayer", nlayers, 0, nlayers);
energyEvent = aida.cloud1D(collName + "_eventEnergy");
hitCount = aida.cloud1D(collName + "_eventNumHits");
+
tree.cd("..");
}
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.1 -r1.2
--- GenericHitPlotsDriver.java 28 Jul 2005 19:20:14 -0000 1.1
+++ GenericHitPlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
@@ -5,9 +5,6 @@
import java.util.Map;
import java.util.HashMap;
-import org.lcsim.util.aida.AIDA;
-import hep.aida.ITree;
-
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.util.Driver;
@@ -20,20 +17,14 @@
* @author jeremym
*/
class GenericHitPlotsDriver extends Driver
-{
+{
Map<String, GenericHitPlots> genericHitPlots = new HashMap<String,GenericHitPlots>();
- AIDA aida = org.lcsim.util.aida.AIDA.defaultInstance();
- ITree tree = aida.tree();
-
double trackerHitCount;
/** Creates a new instance of SingleHitCollectionPlots */
public GenericHitPlotsDriver()
- {
- /* set ref to AIDA tree */
- tree = aida.tree();
- }
+ {}
protected void process(EventHeader event)
{
@@ -46,12 +37,13 @@
private GenericHitPlots getGenericHitPlots(LCMetaData meta)
{
- if ( genericHitPlots.get(meta.getName()) == null )
+ String name = meta.getName();
+ if ( genericHitPlots.get(name) == null )
{
- genericHitPlots.put(meta.getName(), new GenericHitPlots(meta) );
+ genericHitPlots.put(name, new GenericHitPlots(meta) );
}
- return genericHitPlots.get(meta.getName());
+ return genericHitPlots.get(name);
}
private void processTrackerCollections(EventHeader event)
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.1 -r1.2
--- MCParticlePlots.java 27 Jul 2005 23:21:36 -0000 1.1
+++ MCParticlePlots.java 29 Jul 2005 02:53:20 -0000 1.2
@@ -22,12 +22,12 @@
*
* @author jeremym
*/
-public class MCParticlePlots
-{
+public class MCParticlePlots extends PlotsBase
+{
AIDA aida = org.lcsim.util.aida.AIDA.defaultInstance();
ITree tree = aida.tree();
- ParticlePropertyProvider McpLkp = ParticlePropertyManager.getParticlePropertyProvider();
+ ParticlePropertyProvider mcpLkp = ParticlePropertyManager.getParticlePropertyProvider();
ICloud1D mcpCount;
ICloud1D mcpTotalEnergyFinalState;
@@ -40,21 +40,15 @@
/** Creates a new instance of MCParticlePlots */
public MCParticlePlots()
{
- try
- {
- tree.mkdir("/MCParticles");
- }
- catch (Exception e)
- {}
-
definePlots();
}
private void definePlots()
{
+ makeAidaDir("/MCParticles");
tree.cd("/MCParticles");
- mcpCount = aida.cloud1D("MCParticle_eventCount");
- mcpTotalEnergyFinalState = aida.cloud1D("MCParticle_eventEnergyFinalStates");
+ mcpCount = aida.cloud1D("mcp_numPerEvent");
+ mcpTotalEnergyFinalState = aida.cloud1D("mcp_finalStateETotPerEvent");
tree.cd("..");
}
@@ -67,11 +61,12 @@
totE = 0;
for ( MCParticle particle : particles)
{
+ /* make plots for each final state particle type */
if ( particle.getGeneratorStatus() == MCParticle.FINAL_STATE )
{
totE += particle.getEnergy();
- String particleName = McpLkp.get(particle.getPDGID()).getName();
+ String particleName = mcpLkp.get(particle.getPDGID()).getName();
try
{
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.1 -r1.2
--- MCParticlePlotsDriver.java 28 Jul 2005 19:20:14 -0000 1.1
+++ MCParticlePlotsDriver.java 29 Jul 2005 02:53:20 -0000 1.2
@@ -1,55 +1,34 @@
package org.lcsim.slic.diagnostics;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
-import java.io.File;
-import org.freehep.application.Application;
-import org.freehep.application.studio.Studio;
-import org.freehep.record.loop.SequentialRecordLoop;
-import org.freehep.record.source.SequentialRecordSource;
-
-import org.lcsim.util.aida.AIDA;
-import hep.aida.ICloud1D;
import org.lcsim.util.Driver;
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.event.SimTrackerHit;
-import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.event.MCParticle;
-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.event.EventHeader.LCMetaData;
/**
*
* @author jeremym
*/
public class MCParticlePlotsDriver extends Driver
-{
- private AIDA aida = AIDA.defaultInstance();
+{
+ MCParticlePlots mcpPlots = new MCParticlePlots();
- MCParticlePlots mcpPlots = new MCParticlePlots();
-
public MCParticlePlotsDriver()
{}
protected void process(EventHeader event)
{
super.process(event);
-
- /* proc MCParticles coll */
- processMCParticleCollection(event);
- }
-
- private void processMCParticleCollection(EventHeader event )
- {
- List<List<MCParticle>> mcpCollections = event.get(MCParticle.class);
-
+
+ /* process the MCP coll */
+ List<List<MCParticle>> mcpCollections = event.get(MCParticle.class);
for ( List<MCParticle> mcp : mcpCollections )
{
mcpPlots.fill(mcp);
}
- }
+ }
}
SlicDiagnostics/src/org/lcsim/slic/diagnostics
diff -u -r1.4 -r1.5
--- SlicDiagnosticsDriver.java 28 Jul 2005 19:20:14 -0000 1.4
+++ SlicDiagnosticsDriver.java 29 Jul 2005 02:53:20 -0000 1.5
@@ -6,10 +6,6 @@
package org.lcsim.slic.diagnostics;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
import java.io.File;
import org.freehep.application.Application;
@@ -19,8 +15,6 @@
import org.lcsim.util.Driver;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.MCParticle;
-import org.lcsim.geometry.IDDecoder;
import org.lcsim.event.EventHeader.LCMetaData;
import org.lcsim.util.aida.AIDA;
@@ -41,7 +35,7 @@
protected void process(EventHeader event)
{
super.process(event);
- }
+ }
/** Set the filename to argument basename with ".slcio" replaced by ".aida". */
public void setFileName(String path)
SlicDiagnostics/test/org/lcsim/slic/diagnostics
diff -N MainTest.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ MainTest.java 29 Jul 2005 02:53:21 -0000 1.1
@@ -0,0 +1,53 @@
+package org.lcsim.slic.diagnostics;
+
+import org.lcsim.slic.diagnostics.Main;
+
+import java.io.File;
+import java.net.URL;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.lcsim.event.EventHeader;
+import org.lcsim.util.cache.FileCache;
+import org.lcsim.util.loop.LCSimLoop;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author jeremym
+ */
+public class MainTest extends TestCase
+{
+ private static final String[] fileURLs =
+ {"http://www.lcsim.org/test/lcio/ZPoleUDS_50evt_SLIC_v1r9p1_sidmay05.slcio"};
+
+ public MainTest(String testName)
+ {
+ super(testName);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(MainTest.class);
+ }
+
+ protected void setUp() throws Exception
+ {}
+
+ public void testMain() throws Exception
+ {
+ String[] localFiles = new String[fileURLs.length];
+ for ( int i=0; i < fileURLs.length; i++ )
+ {
+ URL url = new URL(fileURLs[i]);
+ FileCache cache = new FileCache();
+ File file = cache.getCachedFile(url);
+ localFiles[i] = file.toString();
+ }
+
+ Main.main(localFiles);
+ }
+}
\ No newline at end of file
SlicDiagnostics/test/org/lcsim/slic/diagnostics
diff -N SlicDiagnosticsDriverTest.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SlicDiagnosticsDriverTest.java 29 Jul 2005 02:53:21 -0000 1.1
@@ -0,0 +1,63 @@
+package org.lcsim.slic.diagnostics;
+
+import java.io.File;
+import java.net.URL;
+import org.lcsim.event.EventHeader;
+import org.lcsim.util.cache.FileCache;
+import org.lcsim.util.loop.LCSimLoop;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author jeremym
+ */
+public class SlicDiagnosticsDriverTest extends TestCase
+{
+ private int recordCount = 0;
+
+ private void runTestFile(String s) throws Exception
+ {
+ System.out.println("Running SlicDiagnosticsTest on file: " + s);
+
+ URL url = new URL(s);
+ FileCache cache = new FileCache();
+ File file = cache.getCachedFile(url);
+
+ recordCount = 0;
+ LCSimLoop loop = new LCSimLoop();
+ loop.setLCIORecordSource(file);
+
+ SlicDiagnosticsDriver slicDiag = new SlicDiagnosticsDriver();
+ slicDiag.setFileName("SlicDiagnosticsDriverTest.aida");
+
+ slicDiag.add(new CalorimeterHitPlotsDriver());
+ slicDiag.add(new EventSummaryPlotsDriver());
+ slicDiag.add(new MCParticlePlotsDriver());
+ slicDiag.add(new GenericHitPlotsDriver());
+
+ loop.add(slicDiag);
+ loop.loop(-1);
+ loop.dispose();
+ }
+
+ public void testSlicDiagnostics() throws Exception
+ {
+ runTestFile("http://www.lcsim.org/test/lcio/ZPoleUDS_50evt_SLIC_v1r9p1_sidmay05.slcio");
+ }
+
+ public SlicDiagnosticsDriverTest(String testName)
+ {
+ super(testName);
+ }
+
+ public static Test suite()
+ {
+ return new TestSuite(SlicDiagnosticsDriverTest.class);
+ }
+
+ protected void setUp() throws Exception
+ {}
+}
\ No newline at end of file
SlicDiagnostics/test/org/lcsim/slic/diagnostics
diff -N SlicDiagnosticsTest.java
--- SlicDiagnosticsTest.java 28 Jul 2005 19:20:15 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,77 +0,0 @@
-package org.lcsim.slic.diagnostics;
-
-import java.io.File;
-import java.net.URL;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.cache.FileCache;
-import org.lcsim.util.loop.LCSimLoop;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- *
- * @author jeremym
- */
-public class SlicDiagnosticsTest extends TestCase
-{
- private int recordCount = 0;
-
- SlicDiagnosticsDriver slicDiag;
- GenericHitPlotsDriver genericPlots;
- MCParticlePlotsDriver mcpPlots;
- CalorimeterHitPlotsDriver calPlots;
- EventSummaryPlotsDriver evtPlots;
-
- protected void setUp() throws Exception
- {
- /* main driver */
- slicDiag = new SlicDiagnosticsDriver();
-
- /* subdrivers */
- genericPlots = new GenericHitPlotsDriver();
- mcpPlots = new MCParticlePlotsDriver();
- calPlots = new CalorimeterHitPlotsDriver();
- evtPlots = new EventSummaryPlotsDriver();
-
- /* add subdrivers to main driver */
- slicDiag.add(evtPlots);
- slicDiag.add(genericPlots);
- slicDiag.add(mcpPlots);
- slicDiag.add(calPlots);
- }
-
- private void runTestFile(String s) throws Exception
- {
- System.out.println("Running SlicDiagnosticsTest on file: " + s);
-
- slicDiag.setFileName(s);
-
- URL url = new URL(s);
- FileCache cache = new FileCache();
- File file = cache.getCachedFile(url);
-
- LCSimLoop loop = new LCSimLoop();
- loop.setLCIORecordSource(file);
- loop.add(slicDiag);
- loop.loop(-1);
- loop.dispose();
- }
-
- public void testSlicDiagnostics() throws Exception
- {
- runTestFile("http://www.lcsim.org/test/lcio/ZPoleUDS_50evt_SLIC_v1r9p1_sidmay05.slcio");
- //runTestFile("http://www.lcsim.org/test/lcio/muons_SLIC_v1r9p1_sidmay05.slcio");
- }
-
- public SlicDiagnosticsTest(String testName)
- {
- super(testName);
- }
-
- public static Test suite()
- {
- return new TestSuite(SlicDiagnosticsTest.class);
- }
-}
\ No newline at end of file
CVSspam 0.2.8