12 modified files
lcsim/src/org/lcsim/job
diff -u -r1.2 -r1.3
--- JobControlDriver.java 31 Aug 2009 17:56:30 -0000 1.2
+++ JobControlDriver.java 15 Sep 2009 23:23:21 -0000 1.3
@@ -10,8 +10,10 @@
* Your driver needs to call <code>super.process()</code>
* in its <code>process()</code> method for this to work.
*
- * The other sections of the xml file besides <drivers>
- * will be ignored.
+ * The only sections that will be used are <drivers>,
+ * <execute>, <control>, and <define>. The <code>numberOfEvents</code>
+ * parameter will be ignored. Non-standard jar files need
+ * to be added to the ~/.JAS3/extensions directory.
*
* @author jeremym
*/
@@ -19,6 +21,8 @@
{
JobControlManager mgr = new JobControlManager();
+ private boolean wasSetup = false;
+
public JobControlDriver()
{}
@@ -29,6 +33,10 @@
public void setup(File steering)
{
+ if (wasSetup)
+ return;
+ else
+ wasSetup = true;
mgr.setup(steering);
for (Driver driver : mgr.getDriverExecList())
{
lcsim/src/org/lcsim/job
diff -u -r1.25 -r1.26
--- JobControlManager.java 15 Sep 2009 18:59:18 -0000 1.25
+++ JobControlManager.java 15 Sep 2009 23:23:21 -0000 1.26
@@ -80,6 +80,7 @@
Element root;
Map<String,Double> constants = new HashMap<String,Double>();
JDOMExpressionFactory factory;
+ JobControlManager instance;
/**
* Default no-argument constructor.
@@ -88,7 +89,7 @@
{
//findAvailableDrivers();
}
-
+
/**
* Simple frontend method taking the name of the XML steering file.
* @param args The command line arguments.
@@ -170,6 +171,15 @@
}
/**
+ * Get the <code>LCSimLoop</code> of this JobManager.
+ * @return The LCSimLoop.
+ */
+ public LCSimLoop getLCSimLoop()
+ {
+ return loop;
+ }
+
+ /**
* Return a list of Drivers to be executed. This could be used to call them
* from an external framework like JAS3. The list will be empty unless the
* <code>setup()</code> method has been called.
@@ -621,8 +631,7 @@
// Running in JAS. Jars need to already be on classpath.
if (Studio.getApplication() != null)
{
- FreeHEPLookup fhl = ((Studio) Studio.getApplication()).getLookup();
- //DynamicClassLoader dcl = (DynamicClassLoader)fhl.lookup(DynamicClassLoader.class);
+ FreeHEPLookup fhl = ((Studio) Studio.getApplication()).getLookup();
loader = ((DynamicClassLoader)fhl.lookup(DynamicClassLoader.class)).getClassLoader();
}
// Running in batch.
lcsim/src/org/lcsim/recon/cat
diff -u -r1.1 -r1.2
--- EmcalMipStubs.java 6 Apr 2007 21:48:14 -0000 1.1
+++ EmcalMipStubs.java 15 Sep 2009 23:23:21 -0000 1.2
@@ -1,18 +1,15 @@
package org.lcsim.recon.cat;
+import java.util.ArrayList;
import java.util.List;
-import org.lcsim.recon.cat.util.Const;
-import org.lcsim.event.Cluster;
+
import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
-//import org.lcsim.recon.cluster.nn.NearestNeighborClusterDriver;
+import org.lcsim.geometry.IDDecoder;
+import org.lcsim.recon.cat.util.Const;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.mc.fast.tracking.*;
-//import hep.physics.*;
-import java.util.*;
-import org.lcsim.geometry.CalorimeterIDDecoder;
-import org.lcsim.recon.cluster.util.BasicCluster;
/**
* creates a list of <code>MipStub</code> which is
@@ -24,7 +21,7 @@
*
* @author E. von Toerne
* @author K. Yamanaka
- * @version $Id: EmcalMipStubs.java,v 1.1 2007/04/06 21:48:14 onoprien Exp $
+ * @version $Id: EmcalMipStubs.java,v 1.2 2009/09/15 23:23:21 jeremy Exp $
*/
final public class EmcalMipStubs extends Driver {
@@ -100,7 +97,7 @@
int cnum=0;
List<List<Cluster>> clusterSets = event.get(Cluster.class);
List<CalorimeterHit> hitsBar = event.get(CalorimeterHit.class,"EcalBarrHits");
- CalorimeterIDDecoder theCell = (CalorimeterIDDecoder) event.getMetaData(hitsBar).getIDDecoder();
+ IDDecoder theCell = event.getMetaData(hitsBar).getIDDecoder();
for (List<Cluster> clusters : clusterSets) {
//CalorimeterIDDecoder theCell = (CalorimeterIDDecoder) event.getMetaData(clusters).getIDDecoder();
@@ -158,12 +155,12 @@
}
/** Interface to U. Iowa MipStub algorithm. */
- public MipStub createUIowaMipstub(CalorimeterIDDecoder theCell, Cluster c) {
+ public MipStub createUIowaMipstub(IDDecoder theCell, Cluster c) {
// needs to be implemented
return createMipStubSimple(theCell, c);
}
- public MipStub createMipStubFromFit(CalorimeterIDDecoder theCell, Cluster c) {
+ public MipStub createMipStubFromFit(IDDecoder theCell, Cluster c) {
int i;
int nHit = c.getCalorimeterHits().size();
cir.calculate(0.,0.,strtP[0],strtP[1],endP[0],endP[1]);
@@ -191,7 +188,7 @@
return new MipStub(tempBase,tempDir,newTrk.hel.kappa(),nHit, isEndcap(c),this.minLayer, c);
}
- public MipStub createMipStubKyoko(CalorimeterIDDecoder theCell, Cluster c) {
+ public MipStub createMipStubKyoko(IDDecoder theCell, Cluster c) {
double[] base = new double[]{0,0,0};
double[] dir = new double[]{0,0,0};
double[] ddir = new double[]{0,0,0}; // added this on July 2004
@@ -338,7 +335,7 @@
/** KSU default algorithm to create a MipStub from an ECAL cluster. */
- public MipStub createMipStub(CalorimeterIDDecoder theCell, Cluster c) {
+ public MipStub createMipStub(IDDecoder theCell, Cluster c) {
double kappa = 0.;
int nHit = c.getCalorimeterHits().size();
int iCount = 0;
@@ -415,7 +412,7 @@
}
/** simple approach to create a MipStub from an ECAL cluster uses Start and Endpoint of cluster */
- public MipStub createMipStubSimple(CalorimeterIDDecoder theCell, Cluster c) {
+ public MipStub createMipStubSimple(IDDecoder theCell, Cluster c) {
double kappa = 0.;
int nHit = c.getCalorimeterHits().size();
int iCount = 0;
@@ -439,7 +436,7 @@
}
}
- public MipStub createMipStubStraight(CalorimeterIDDecoder theCell, Cluster c) {
+ public MipStub createMipStubStraight(IDDecoder theCell, Cluster c) {
double kappa = 0.;
int nHit = c.getCalorimeterHits().size();
int iCount = 0;
@@ -456,7 +453,7 @@
}
}
- private void setStartEndPoint(CalorimeterIDDecoder theCell, Cluster c, boolean isEndcap){
+ private void setStartEndPoint(IDDecoder theCell, Cluster c, boolean isEndcap){
int i;
List<CalorimeterHit> cHits = c.getCalorimeterHits();
double lngth;
lcsim/src/org/lcsim/recon/cluster/clumpfinder
diff -u -r1.6 -r1.7
--- ClumpFinder.java 14 May 2008 21:11:56 -0000 1.6
+++ ClumpFinder.java 15 Sep 2009 23:23:21 -0000 1.7
@@ -1,24 +1,24 @@
package org.lcsim.recon.cluster.clumpfinder;
-import java.lang.String;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
-import java.util.HashMap;
import java.util.Set;
-import java.util.HashSet;
+import java.util.Vector;
-import org.lcsim.util.lcio.LCIOConstants;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-import org.lcsim.event.Cluster;
-import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.Cluster;
+import org.lcsim.event.EventHeader;
import org.lcsim.geometry.IDDecoder;
-import org.lcsim.util.decision.*;
+import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.recon.cluster.util.ClusterSizeDecision;
-import org.lcsim.util.hitmap.HitMap;
import org.lcsim.recon.cluster.util.Clusterer;
+import org.lcsim.util.Driver;
+import org.lcsim.util.decision.DecisionMakerSingle;
+import org.lcsim.util.decision.DummyDecisionMakerSingle;
+import org.lcsim.util.decision.ListFilter;
+import org.lcsim.util.hitmap.HitMap;
+import org.lcsim.util.lcio.LCIOConstants;
/**
* A Driver which finds dense clumps within clusters.
@@ -29,7 +29,7 @@
* or more for each hit. This is hard-coded at the moment, but
* should become a user-definable in a later version.
*
- * @version $Id: ClumpFinder.java,v 1.6 2008/05/14 21:11:56 mcharles Exp $
+ * @version $Id: ClumpFinder.java,v 1.7 2009/09/15 23:23:21 jeremy Exp $
*/
public class ClumpFinder extends Driver implements Clusterer
@@ -169,7 +169,7 @@
protected void recursivelyAddNeighbours(CalorimeterHit seedHit, BasicCluster clump, List<CalorimeterHit> unusedHits, Set<CalorimeterHit> hitsUsedInClump)
{
org.lcsim.geometry.IDDecoder id = seedHit.getIDDecoder();
- org.lcsim.geometry.CalorimeterIDDecoder idCAL = (org.lcsim.geometry.CalorimeterIDDecoder) (id);
+ IDDecoder idCAL = (IDDecoder) (id);
idCAL.setID(seedHit.getCellID());
if (!idCAL.supportsNeighbours()) {
throw new AssertionError("Can't get neighbours!");
lcsim/src/org/lcsim/recon/cluster/clumpfinder
diff -u -r1.3 -r1.4
--- HighHitDensityDecision.java 14 May 2008 21:11:56 -0000 1.3
+++ HighHitDensityDecision.java 15 Sep 2009 23:23:21 -0000 1.4
@@ -1,22 +1,12 @@
package org.lcsim.recon.cluster.clumpfinder;
-import java.lang.String;
import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.HashMap;
import java.util.HashSet;
+import java.util.Set;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-import org.lcsim.event.Cluster;
-import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.geometry.IDDecoder;
-
-import org.lcsim.util.decision.*;
+import org.lcsim.util.decision.DecisionMakerSingle;
/**
* A DecisionMaker for CalorimeterHit objects which requires them to
@@ -24,7 +14,7 @@
* Eventually this should be made more flexible and moved outside
* the "structural" package.
*
- * @version $Id: HighHitDensityDecision.java,v 1.3 2008/05/14 21:11:56 mcharles Exp $
+ * @version $Id: HighHitDensityDecision.java,v 1.4 2009/09/15 23:23:21 jeremy Exp $
*/
public class HighHitDensityDecision implements DecisionMakerSingle<CalorimeterHit>
@@ -62,7 +52,7 @@
{
// Find hits within m_dist:
org.lcsim.geometry.IDDecoder id = seedHit.getIDDecoder();
- org.lcsim.geometry.CalorimeterIDDecoder idCAL = (org.lcsim.geometry.CalorimeterIDDecoder) (id);
+ IDDecoder idCAL = (IDDecoder) (id);
idCAL.setID(seedHit.getCellID());
if (!idCAL.supportsNeighbours()) {
throw new AssertionError("Can't get neighbours!");
lcsim/src/org/lcsim/recon/cluster/mipfinder
diff -u -r1.1 -r1.2
--- DoubleHit.java 2 Jan 2006 21:45:19 -0000 1.1
+++ DoubleHit.java 15 Sep 2009 23:23:21 -0000 1.2
@@ -1,9 +1,7 @@
package org.lcsim.recon.cluster.mipfinder;
import org.lcsim.event.CalorimeterHit;
-import java.util.Vector;
import org.lcsim.geometry.IDDecoder;
-import org.lcsim.geometry.CalorimeterIDDecoder;
/**
Double Hit. Designed for use with
@@ -11,7 +9,7 @@
@author Wolfgang F. Mader ([log in to unmask])
- @version $Id: DoubleHit.java,v 1.1 2006/01/02 21:45:19 mcharles Exp $
+ @version $Id: DoubleHit.java,v 1.2 2009/09/15 23:23:21 jeremy Exp $
Modification Log:
-- 07/22/2004 Version 1.0
@@ -45,7 +43,7 @@
int dLayer = 1;
int dU = 1;
int dV = 1;
- CalorimeterIDDecoder id = (CalorimeterIDDecoder) h.getIDDecoder();
+ IDDecoder id = (IDDecoder) h.getIDDecoder();
id.setID(h.getCellID());
long[] neighbours = id.getNeighbourIDs(dLayer, dU, dV);
lcsim/src/org/lcsim/recon/cluster/mipfinder
diff -u -r1.3 -r1.4
--- MIPClusterBuilder.java 5 Jun 2008 17:00:02 -0000 1.3
+++ MIPClusterBuilder.java 15 Sep 2009 23:23:21 -0000 1.4
@@ -1,17 +1,17 @@
package org.lcsim.recon.cluster.mipfinder;
-import java.util.List;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.Hashtable;
-import java.util.Vector;
+import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import java.util.Set;
-import java.util.Collection;
+import java.util.Vector;
import org.lcsim.event.CalorimeterHit;
-import org.lcsim.geometry.IDDecoder;
import org.lcsim.event.Cluster;
-import org.lcsim.geometry.CalorimeterIDDecoder;
+import org.lcsim.geometry.IDDecoder;
+import org.lcsim.geometry.compact.Segmentation;
/**
@@ -153,7 +153,7 @@
int dLayer = 1;
int dU = 1;
int dV = 1;
- CalorimeterIDDecoder id = (CalorimeterIDDecoder) h.getIDDecoder();
+ IDDecoder id = (IDDecoder) h.getIDDecoder();
id.setID(h.getCellID());
long[] neighbours = id.getNeighbourIDs(dLayer, dU, dV);
lcsim/src/org/lcsim/recon/cluster/nn
diff -u -r1.7 -r1.8
--- NearestNeighborClusterDriver.java 8 Nov 2007 23:16:40 -0000 1.7
+++ NearestNeighborClusterDriver.java 15 Sep 2009 23:23:21 -0000 1.8
@@ -9,7 +9,6 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.geometry.CalorimeterIDDecoder;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.util.Driver;
import org.lcsim.event.Cluster;
lcsim/src/org/lcsim/recon/cluster/nn
diff -u -r1.10 -r1.11
--- NearestNeighborClusterer.java 14 Sep 2007 13:59:12 -0000 1.10
+++ NearestNeighborClusterer.java 15 Sep 2009 23:23:21 -0000 1.11
@@ -10,7 +10,6 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.Cluster;
import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.geometry.CalorimeterIDDecoder;
import org.lcsim.recon.cluster.util.*;
import org.lcsim.util.hitmap.HitMap;
import org.lcsim.util.Driver;
lcsim/src/org/lcsim/recon/pfa/structural
diff -u -r1.1 -r1.2
--- TrackMipClusterDriver.java 12 Dec 2008 22:27:59 -0000 1.1
+++ TrackMipClusterDriver.java 15 Sep 2009 23:23:21 -0000 1.2
@@ -18,8 +18,8 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.geometry.Detector;
+import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.spacegeom.SpacePoint;
import org.lcsim.util.Driver;
@@ -159,7 +159,7 @@
for (int i=0; i<_hitcollnames.length; i++)
{
List<CalorimeterHit> chits = event.get(CalorimeterHit.class,_hitcollnames[i]);
- CalorimeterIDDecoder caldecoder = (CalorimeterIDDecoder) event.getMetaData(chits).getIDDecoder();
+ IDDecoder caldecoder = (IDDecoder) event.getMetaData(chits).getIDDecoder();
// System.out.println("Collection is " +_hitcollnames[i]);
if (_hitcollnames[i] == "EcalBarrDigiHits")
{
lcsim/src/org/lcsim/util/heprep
diff -u -r1.8 -r1.9
--- CalorimeterHitConverter.java 24 Aug 2007 20:07:40 -0000 1.8
+++ CalorimeterHitConverter.java 15 Sep 2009 23:23:21 -0000 1.9
@@ -2,23 +2,22 @@
import hep.graphics.heprep.HepRepFactory;
import hep.graphics.heprep.HepRepInstance;
+import hep.graphics.heprep.HepRepInstanceTree;
import hep.graphics.heprep.HepRepPoint;
import hep.graphics.heprep.HepRepType;
import hep.graphics.heprep.HepRepTypeTree;
-import hep.graphics.heprep.HepRepInstanceTree;
+
import java.awt.Color;
import java.util.List;
+
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.CalorimeterIDDecoder;
-import org.lcsim.util.lcio.LCIOConstants;
-import org.lcsim.util.lcio.LCIOUtil;
/**
*
* @author tonyj
- * @version $Id: CalorimeterHitConverter.java,v 1.8 2007/08/24 20:07:40 jeremy Exp $
+ * @version $Id: CalorimeterHitConverter.java,v 1.9 2009/09/15 23:23:21 jeremy Exp $
*/
class CalorimeterHitConverter implements HepRepCollectionConverter
{
lcsim/src/org/lcsim/util/heprep
diff -u -r1.8 -r1.9
--- ZvVertexConverter.java 28 Mar 2006 23:50:25 -0000 1.8
+++ ZvVertexConverter.java 15 Sep 2009 23:23:21 -0000 1.9
@@ -12,23 +12,19 @@
import java.util.List;
import org.lcsim.constants.Constants;
-import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.CalorimeterIDDecoder;
import org.lcsim.geometry.Detector;
import org.lcsim.recon.vertexing.zvtop4.ZvTrack;
import org.lcsim.recon.vertexing.zvtop4.ZvVertex;
import org.lcsim.spacegeom.SpacePoint;
-import org.lcsim.util.lcio.LCIOConstants;
-import org.lcsim.util.lcio.LCIOUtil;
import org.lcsim.util.swim.HelixSwimmer;
/**
* Representation of the Candidate vertices before fitting
*
* @author jstrube
- * @version $Id: ZvVertexConverter.java,v 1.8 2006/03/28 23:50:25 jstrube Exp $
+ * @version $Id: ZvVertexConverter.java,v 1.9 2009/09/15 23:23:21 jeremy Exp $
*
*/
public class ZvVertexConverter implements HepRepCollectionConverter {
CVSspam 0.2.8