13 modified files
lcsim-contrib/src/main/java/org/lcsim/contrib/CarstenHensel
diff -u -r1.1.1.1 -r1.2
--- HMatrixAnalyzer.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ HMatrixAnalyzer.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -14,17 +14,20 @@
import hep.aida.ITuple;
import hep.aida.ITupleFactory;
import hep.aida.ref.tree.TreeObjectAlreadyExistException;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
-import org.lcsim.geometry.CalorimeterIDDecoder;
+import org.lcsim.geometry.IDDecoder;
+import org.lcsim.geometry.compact.Segmentation;
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
import org.lcsim.math.chisq.ChisqProb;
import org.lcsim.recon.cluster.fixedcone.FixedConeClusterer;
@@ -52,7 +55,7 @@
private double SAMP_FRAC = 0.012;
private double radiusCut;
private int nLayers;
- private CalorimeterIDDecoder decoder;
+ private IDDecoder decoder;
private boolean attributesSet = false;
private boolean initialized = false;
private ITuple tuple;
@@ -139,7 +142,7 @@
this.eventCounter++;
List<CalorimeterHit> ecalBarrHits = event.get(CalorimeterHit.class,"EcalBarrHits");
List<CalorimeterHit> endcapHits = event.get(CalorimeterHit.class,"EcalEndcapHits");
- this.decoder = (CalorimeterIDDecoder) event.getMetaData(ecalBarrHits).getIDDecoder();
+ this.decoder = event.getMetaData(ecalBarrHits).getIDDecoder();
// create a map of cells keyed on their index
Map<Long, CalorimeterHit> hitMap = new HashMap<Long, CalorimeterHit>();
lcsim-contrib/src/main/java/org/lcsim/contrib/EricBenavidez/EMClusterID
diff -u -r1.1.1.1 -r1.2
--- EMClusterID_NoE.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ EMClusterID_NoE.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -10,19 +10,30 @@
//
// ************************************************************************
-import java.util.*;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
+import static java.lang.Math.sqrt;
+import hep.aida.ITree;
+
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.Cluster;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.MCParticle;
+import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
+import org.lcsim.math.chisq.ChisqProb;
import org.lcsim.recon.cluster.fixedcone.FixedConeClusterer;
import org.lcsim.recon.cluster.util.BasicCluster;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import hep.aida.ITree;
-import static java.lang.Math.sqrt;
-import java.text.DecimalFormat;
-import org.lcsim.math.chisq.ChisqProb;
-import org.lcsim.event.*;
-import java.io.*;
/**
* Reconstruction: EM Clusters
@@ -34,7 +45,7 @@
private String _detName;
private MyCovMatrixTask _task;
private int _nLayers;
- CalorimeterIDDecoder _decoder;
+ IDDecoder _decoder;
private HashMap<Integer,MyCovMatrixBuilder> _cmbs;
private HashMap<Integer,MyCovMatrix> _covs;
@@ -168,7 +179,7 @@
List<CalorimeterHit> collection
= event.get(CalorimeterHit.class,"EcalBarrHits");
- _decoder = (CalorimeterIDDecoder)event.getMetaData(collection).getIDDecoder();
+ _decoder = event.getMetaData(collection).getIDDecoder();
// construct the EM Clusters
// FIXME get these parameters from conditions file
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- DTPhoAcceptDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ DTPhoAcceptDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -1,31 +1,15 @@
package org.lcsim.contrib.SteveMagill;
-import java.util.*;
-import org.lcsim.util.aida.AIDA;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
import org.lcsim.event.Track;
-import org.lcsim.util.hitmap.HitMap;
import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.spacegeom.*;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.MCReconstructedParticle;
-import org.lcsim.event.ParticleID;
-import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.event.ParticleID;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.BaseParticleID;
-import org.lcsim.event.base.BaseReconstructedParticle;
-import hep.physics.particle.properties.ParticlePropertyManager;
-import hep.physics.particle.properties.ParticleType;
+import org.lcsim.spacegeom.SpacePoint;
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
/**
* Checks candidate clusters for closeness to tracks and adjusts
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1 -r1.2
--- GTrackMipClusterDriver.java 12 Aug 2009 18:30:25 -0000 1.1
+++ GTrackMipClusterDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -17,7 +17,6 @@
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
import hep.aida.*;
import org.lcsim.spacegeom.*;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import org.lcsim.util.hitmap.HitMap;
public class GTrackMipClusterDriver extends Driver
@@ -152,7 +151,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 = event.getMetaData(chits).getIDDecoder();
System.out.println("Collection is " +_hitcollnames[i]);
if (_hitcollnames[i].equals("Ceren_EcalBarrDigiHits"))
{
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- PPFANeuHClusterDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ PPFANeuHClusterDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -1,31 +1,14 @@
package org.lcsim.contrib.SteveMagill;
-import java.util.*;
-import org.lcsim.util.aida.AIDA;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
+import java.util.ArrayList;
+import java.util.List;
+
import org.lcsim.event.Cluster;
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
-import org.lcsim.event.Track;
-import org.lcsim.util.hitmap.HitMap;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.spacegeom.*;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.MCReconstructedParticle;
-import org.lcsim.event.ParticleID;
-import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.event.ParticleID;
+import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.BaseParticleID;
-import org.lcsim.event.base.BaseReconstructedParticle;
-import hep.physics.particle.properties.ParticlePropertyManager;
-import hep.physics.particle.properties.ParticleType;
+import org.lcsim.recon.cluster.util.BasicCluster;
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
/**
* Gets Perfect PFA Neutral Hadron clusters from simulation
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- PPFAPhotonClusterDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ PPFAPhotonClusterDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -9,7 +9,6 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
import org.lcsim.event.Track;
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- PPFAPlotDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ PPFAPlotDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -9,7 +9,6 @@
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
import org.lcsim.event.Track;
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- PhoCompDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ PhoCompDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -1,31 +1,16 @@
package org.lcsim.contrib.SteveMagill;
-import java.util.*;
-import org.lcsim.util.aida.AIDA;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.MCParticle;
+import java.util.List;
+
import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
-import org.lcsim.event.Track;
-import org.lcsim.util.hitmap.HitMap;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.spacegeom.*;
+import org.lcsim.event.Cluster;
+import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.MCReconstructedParticle;
-import org.lcsim.event.ParticleID;
+import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.event.ParticleID;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.BaseParticleID;
-import org.lcsim.event.base.BaseReconstructedParticle;
-import hep.physics.particle.properties.ParticlePropertyManager;
-import hep.physics.particle.properties.ParticleType;
+import org.lcsim.recon.cluster.util.BasicCluster;
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
/**
* Defines perfect particle flow objects - perfect charged particles, perfect photons and perfect neutral hadrons
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- TSCDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TSCDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -21,7 +21,6 @@
import org.lcsim.mc.fast.tracking.*;
import hep.aida.*;
import org.lcsim.spacegeom.*;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.base.MCReconstructedParticle;
import org.lcsim.recon.cluster.cheat.CheatCluster;
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- TrMipCompDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TrMipCompDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -1,32 +1,21 @@
package org.lcsim.contrib.SteveMagill;
-import java.util.*;
-import org.lcsim.util.aida.AIDA;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.MCParticle;
+import hep.physics.vec.Hep3Vector;
+
+import java.util.List;
+import java.util.Map;
+
import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
import org.lcsim.event.Track;
-import org.lcsim.util.hitmap.HitMap;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.spacegeom.*;
-import org.lcsim.event.base.*;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.MCReconstructedParticle;
-import org.lcsim.event.ParticleID;
+import org.lcsim.event.base.BaseTrackMC;
import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.event.ParticleID;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.BaseParticleID;
-import org.lcsim.event.base.BaseReconstructedParticle;
-import hep.physics.particle.properties.ParticlePropertyManager;
-import hep.physics.particle.properties.ParticleType;
+import org.lcsim.recon.cluster.util.BasicCluster;
+import org.lcsim.spacegeom.SpacePoint;
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
/**
* Defines perfect particle flow objects - perfect charged particles, perfect photons and perfect neutral hadrons
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- TrShowCompDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TrShowCompDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -1,31 +1,19 @@
package org.lcsim.contrib.SteveMagill;
-import java.util.*;
-import org.lcsim.util.aida.AIDA;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-import org.lcsim.event.Cluster;
-import org.lcsim.event.MCParticle;
+import hep.physics.vec.Hep3Vector;
+
+import java.util.List;
+import java.util.Map;
+
import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.Cluster;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
import org.lcsim.event.Track;
-import org.lcsim.util.hitmap.HitMap;
import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.spacegeom.*;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.*;
-import org.lcsim.event.ParticleID;
-import org.lcsim.recon.cluster.cheat.CheatCluster;
-import org.lcsim.event.ParticleID;
-import org.lcsim.event.ReconstructedParticle;
-import org.lcsim.event.base.BaseParticleID;
-import org.lcsim.event.base.BaseReconstructedParticle;
-import hep.physics.particle.properties.ParticlePropertyManager;
-import hep.physics.particle.properties.ParticleType;
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
/**
* Diagnostic routine to calculate purities and efficiencies per particle and event
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.2 -r1.3
--- TrackMipClusterDriver.java 5 Jan 2009 23:04:49 -0000 1.2
+++ TrackMipClusterDriver.java 15 Sep 2009 23:23:47 -0000 1.3
@@ -17,7 +17,6 @@
import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
import hep.aida.*;
import org.lcsim.spacegeom.*;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import org.lcsim.util.hitmap.HitMap;
public class TrackMipClusterDriver extends Driver
@@ -152,7 +151,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 = event.getMetaData(chits).getIDDecoder();
// System.out.println("Collection is " +_hitcollnames[i]);
if (_hitcollnames[i].equals("EcalBarrDigiHits"))
{
lcsim-contrib/src/main/java/org/lcsim/contrib/SteveMagill
diff -u -r1.1.1.1 -r1.2
--- TrackShowerClusterDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TrackShowerClusterDriver.java 15 Sep 2009 23:23:47 -0000 1.2
@@ -20,7 +20,6 @@
import org.lcsim.mc.fast.tracking.*;
import hep.aida.*;
import org.lcsim.spacegeom.*;
-import org.lcsim.geometry.util.CalorimeterIDDecoder;
import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.base.MCReconstructedParticle;
import org.lcsim.recon.cluster.cheat.CheatCluster;
CVSspam 0.2.8