15 modified files
lcsim/src/org/lcsim/digisim
diff -u -r1.2 -r1.3
--- CalHitMapDriver.java 12 May 2005 18:42:15 -0000 1.2
+++ CalHitMapDriver.java 18 Jul 2005 19:18:25 -0000 1.3
@@ -9,7 +9,7 @@
* so this class is basically a Driver for the org.lcsim framework.
*
* @author Guilherme Lima
- * @version $Id: CalHitMapDriver.java,v 1.2 2005/05/12 18:42:15 lima Exp $
+ * @version $Id: CalHitMapDriver.java,v 1.3 2005/07/18 19:18:25 tonyj Exp $
* @see CalHitMapMgr
*/
public class CalHitMapDriver extends Driver {
@@ -36,7 +36,7 @@
/** Called for every event - the working horse.
*/
- public void process( EventHeader evt ) {
+ protected void process( EventHeader evt ) {
_mgr.setEvent(evt);
}
lcsim/src/org/lcsim/digisim
diff -u -r1.9 -r1.10
--- DigiSimDriver.java 5 Jul 2005 06:53:50 -0000 1.9
+++ DigiSimDriver.java 18 Jul 2005 19:18:25 -0000 1.10
@@ -13,7 +13,7 @@
* both parameters and events from the framework.
*
* @author Guilherme Lima
- * @version $Id: DigiSimDriver.java,v 1.9 2005/07/05 06:53:50 lima Exp $
+ * @version $Id: DigiSimDriver.java,v 1.10 2005/07/18 19:18:25 tonyj Exp $
*/
public class DigiSimDriver extends Driver {
@@ -82,7 +82,7 @@
}
/** Called for every event - the event loop */
- public void process( EventHeader event ) {
+ protected void process( EventHeader event ) {
// System.out.println("DigiSimDriver::process() "+ _name
// +" in event "+ evt.getEventNumber()
// +" (run "+ evt.getRunNumber() + ") ");
lcsim/src/org/lcsim/digisim
diff -u -r1.5 -r1.6
--- DigiSimMain.java 28 Jun 2005 21:56:10 -0000 1.5
+++ DigiSimMain.java 18 Jul 2005 19:18:25 -0000 1.6
@@ -21,7 +21,7 @@
* The main driver for digitization simulation.
*
* @author Guilherme Lima
- * @version $Id: DigiSimMain.java,v 1.5 2005/06/28 21:56:10 lima Exp $
+ * @version $Id: DigiSimMain.java,v 1.6 2005/07/18 19:18:25 tonyj Exp $
*/
public class DigiSimMain extends Driver {
@@ -39,7 +39,7 @@
}
//
- public void process(final EventHeader event) {
+ protected void process(final EventHeader event) {
// event counter
++ _nevt;
lcsim/src/org/lcsim/digisim
diff -u -r1.6 -r1.7
--- Digitizer.java 5 Jul 2005 06:53:50 -0000 1.6
+++ Digitizer.java 18 Jul 2005 19:18:25 -0000 1.7
@@ -23,7 +23,7 @@
* simulation process for a specific subdetector.
*
* @author Guilherme Lima
- * @version $Id: Digitizer.java,v 1.6 2005/07/05 06:53:50 lima Exp $
+ * @version $Id: Digitizer.java,v 1.7 2005/07/18 19:18:25 tonyj Exp $
*/
class Digitizer {
@@ -368,7 +368,7 @@
/** Called for every event - the event loop */
- public void process( EventHeader evt ) {
+ protected void process( EventHeader evt ) {
++_nEvt;
double lntolog10 = 1/Math.log(10);
lcsim/src/org/lcsim/mc/fast/cluster/ronan
diff -u -r1.4 -r1.5
--- MCFastRonan.java 15 Jul 2005 22:09:27 -0000 1.4
+++ MCFastRonan.java 18 Jul 2005 19:18:26 -0000 1.5
@@ -28,7 +28,7 @@
private final static int PhotonID = 22;
private ClusterResolutionTables clusterParm;
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
if (clusterParm == null)
{
lcsim/src/org/lcsim/mc/fast/reconstructedparticle
diff -u -r1.6 -r1.7
--- MCFastReconstructedParticleDriver.java 15 Jul 2005 22:09:30 -0000 1.6
+++ MCFastReconstructedParticleDriver.java 18 Jul 2005 19:18:26 -0000 1.7
@@ -52,7 +52,7 @@
{
}
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
if (IDEff == null)
lcsim/src/org/lcsim/mc/fast/tracking
diff -u -r1.4 -r1.5
--- MCFastTracking.java 13 May 2005 23:02:59 -0000 1.4
+++ MCFastTracking.java 18 Jul 2005 19:18:26 -0000 1.5
@@ -59,7 +59,7 @@
}
}
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
if (parm == null)
{
lcsim/src/org/lcsim/plugin/web/examples
diff -u -r1.1 -r1.2
--- Analysis101.java 14 Mar 2005 16:11:35 -0000 1.1
+++ Analysis101.java 18 Jul 2005 19:18:27 -0000 1.2
@@ -9,7 +9,7 @@
{
private AIDA aida = AIDA.defaultInstance();
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
// Get the list of MCParticles from the event
List<MCParticle> particles = event.get(MCParticle.class,event.MC_PARTICLES);
lcsim/src/org/lcsim/plugin/web/examples
diff -u -r1.1 -r1.2
--- Simple.java 14 Mar 2005 16:11:35 -0000 1.1
+++ Simple.java 18 Jul 2005 19:18:27 -0000 1.2
@@ -4,7 +4,7 @@
public class Simple extends Driver
{
// This method will be called for each event
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
// Just print the event header to the JAS console
System.out.println(event);
lcsim/src/org/lcsim/recon/cluster/cheat
diff -u -r1.1 -r1.2
--- CheatClusterDriver.java 18 Jul 2005 03:11:09 -0000 1.1
+++ CheatClusterDriver.java 18 Jul 2005 19:18:27 -0000 1.2
@@ -25,7 +25,7 @@
_clusterer = new CheatClusterer();
}
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
//First look for clusters in individual collections
lcsim/src/org/lcsim/recon/cluster/fixedcone
diff -u -r1.1 -r1.2
--- FixedConeClusterDriver.java 18 Jul 2005 03:11:09 -0000 1.1
+++ FixedConeClusterDriver.java 18 Jul 2005 19:18:27 -0000 1.2
@@ -65,7 +65,7 @@
*
* @param event The Event to process
*/
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
List<CalorimeterHit> collection = event.get(CalorimeterHit.class,"EcalBarrHits");
_decoder = (CalorimeterIDDecoder) event.getMetaData(collection).getIDDecoder();
lcsim/src/org/lcsim/recon/cluster/nn
diff -u -r1.1 -r1.2
--- NearestNeighborClusterDriver.java 18 Jul 2005 03:11:09 -0000 1.1
+++ NearestNeighborClusterDriver.java 18 Jul 2005 19:18:27 -0000 1.2
@@ -85,7 +85,7 @@
*
* @param event
*/
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
//First look for clusters in individual collections
lcsim/src/org/lcsim/recon/muon
diff -u -r1.2 -r1.3
--- MuonReco.java 3 Jun 2005 03:08:20 -0000 1.2
+++ MuonReco.java 18 Jul 2005 19:18:28 -0000 1.3
@@ -38,7 +38,7 @@
minMuHits = muHitsCut;
}
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
// Instantiate MuonList object to hold list of muon candidates
lcsim/src/org/lcsim/util
diff -u -r1.7 -r1.8
--- Driver.java 18 Jul 2005 03:32:14 -0000 1.7
+++ Driver.java 18 Jul 2005 19:18:28 -0000 1.8
@@ -19,7 +19,7 @@
public class Driver
{
private static Driver mother = new MotherOfAllDrivers();
- private List drivers = new ArrayList();
+ private List<Driver> drivers = new ArrayList<Driver>();
private Driver parent = mother;
private int histogramLevel = -1;
private Logger logger;
@@ -47,7 +47,7 @@
/**
* Returns a List of all the drivers added to this Driver
*/
- public List drivers()
+ public List<Driver> drivers()
{
return drivers;
}
@@ -115,10 +115,19 @@
}
protected void process(EventHeader event)
{
+ processChildren(event);
+ }
+ /**
+ * Calls the sub-Drivers process() method.
+ * <b>Note:</b> This method is only public so that it can be called from
+ * Jython, see LCSIM-30
+ */
+ public void processChildren(EventHeader event)
+ {
for (int i=0; i<drivers.size(); i++)
{
((Driver) drivers.get(i)).process(event);
- }
+ }
}
public Random getRandom()
{
lcsim/src/org/lcsim/util/loop
diff -u -r1.3 -r1.4
--- LCIODriver.java 15 Jul 2005 02:56:33 -0000 1.3
+++ LCIODriver.java 18 Jul 2005 19:18:28 -0000 1.4
@@ -37,7 +37,7 @@
}
}
- public void process(EventHeader event)
+ protected void process(EventHeader event)
{
try
{
CVSspam 0.2.8