LISTSERV 16.5 - LCD-CVS Archives

+ * 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.

* 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.

lcsim/src/org/lcsim/recon/cat

EmcalMipStubs.java 1.1 -> 1.2

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;

+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;

protected void recursivelyAddNeighbours(CalorimeterHit seedHit, BasicCluster clump, List<CalorimeterHit> unusedHits, Set<CalorimeterHit> hitsUsedInClump) { org.lcsim.geometry.IDDecoder id = seedHit.getIDDecoder();

Commit in `lcsim/src/org/lcsim` on MAIN
`job/JobControlDriver.java`	+10	-2	1.2 -> 1.3
`/JobControlManager.java`	+12	-3	1.25 -> 1.26
`recon/cat/EmcalMipStubs.java`	+14	-17	1.1 -> 1.2
`recon/cluster/clumpfinder/ClumpFinder.java`	+13	-13	1.6 -> 1.7
`/HighHitDensityDecision.java`	+4	-14	1.3 -> 1.4
`recon/cluster/mipfinder/DoubleHit.java`	+2	-4	1.1 -> 1.2
`/MIPClusterBuilder.java`	+7	-7	1.3 -> 1.4
`recon/cluster/nn/NearestNeighborClusterDriver.java`		-1	1.7 -> 1.8
`/NearestNeighborClusterer.java`		-1	1.10 -> 1.11
`recon/pfa/structural/TrackMipClusterDriver.java`	+2	-2	1.1 -> 1.2
`util/heprep/CalorimeterHitConverter.java`	+4	-5	1.8 -> 1.9
`/ZvVertexConverter.java`	+1	-5	1.8 -> 1.9
	+69	-74