10 modified files
lcsim/src/org/lcsim/contrib/CosminDeaconu
diff -u -r1.7 -r1.8
--- OuterTrackFinder.java 29 Nov 2007 02:26:00 -0000 1.7
+++ OuterTrackFinder.java 8 Dec 2007 02:39:10 -0000 1.8
@@ -28,7 +28,6 @@
import org.lcsim.geometry.subdetector.MultiLayerTracker;
import org.lcsim.geometry.subdetector.DiskTracker;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.util.TrackerIDDecoder;
import org.lcsim.util.aida.AIDA;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
lcsim/src/org/lcsim/contrib/KFFitter
diff -u -r1.5 -r1.6
--- KFFitterDriver.java 13 Apr 2007 20:32:06 -0000 1.5
+++ KFFitterDriver.java 8 Dec 2007 02:39:10 -0000 1.6
@@ -12,7 +12,6 @@
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.MCParticle;
import org.lcsim.event.base.BaseTrack;
-import org.lcsim.geometry.TrackerIDDecoder;
import org.lcsim.util.aida.AIDA;
import hep.aida.*;
@@ -25,7 +24,7 @@
/**
* Driver for KFFitter package
* @author Fred Blanc and Steve Wagner
- * @version $Id: KFFitterDriver.java,v 1.5 2007/04/13 20:32:06 fblanc Exp $
+ * @version $Id: KFFitterDriver.java,v 1.6 2007/12/08 02:39:10 jeremy Exp $
*/
public class KFFitterDriver extends Driver
lcsim/src/org/lcsim/contrib/onoprien/tracking/digitization
diff -u -r1.1 -r1.2
--- ReadoutSimulationDriver.java 12 Oct 2007 21:52:08 -0000 1.1
+++ ReadoutSimulationDriver.java 8 Dec 2007 02:39:10 -0000 1.2
@@ -3,7 +3,7 @@
import java.util.*;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.converter.compact.DeSubdetector;
+import org.lcsim.detector.converter.compact.SubdetectorDetectorElement;
import org.lcsim.contrib.onoprien.tracking.digitization.algorithms.NoiseGeneratorGaussian;
@@ -30,7 +30,7 @@
* The type of both collections is <tt>HashMap<Sensor, ArrayList<DigiTrackerHit>></tt>.
*
* @author D. Onoprienko
- * @version $Id: ReadoutSimulationDriver.java,v 1.1 2007/10/12 21:52:08 onoprien Exp $
+ * @version $Id: ReadoutSimulationDriver.java,v 1.2 2007/12/08 02:39:10 jeremy Exp $
*/
public class ReadoutSimulationDriver extends Driver {
@@ -108,7 +108,7 @@
for (Sensor sensor : segMan.getSensors()) {
-// String name = sensor.getDetectorElement().findAncestors(DeSubdetector.class).get(0).getSubdetector().getName();
+// String name = sensor.getDetectorElement().findAncestors(SubdetectorDetectorElement.class).get(0).getSubdetector().getName();
// int layer = -1;
// try {
// layer = sensor.getDetectorElement().getIdentifierHelper().getValue(sensor.getDetectorElement().getIdentifier(), "layer");
lcsim/src/org/lcsim/contrib/onoprien/tracking/geom
diff -u -r1.1 -r1.2
--- Navigator.java 30 Oct 2007 02:25:42 -0000 1.1
+++ Navigator.java 8 Dec 2007 02:39:10 -0000 1.2
@@ -1,8 +1,9 @@
package org.lcsim.contrib.onoprien.tracking.geom;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.converter.compact.DeSubdetector;
+import org.lcsim.detector.converter.compact.SubdetectorDetectorElement;
import org.lcsim.detector.identifier.IIdentifierDictionary;
+import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.Subdetector;
@@ -10,13 +11,14 @@
* Utility class that contains helper methods for geometry navigation.
*
* @author D. Onoprienko
- * @version $Id: Navigator.java,v 1.1 2007/10/30 02:25:42 onoprien Exp $
+ * @version $Id: Navigator.java,v 1.2 2007/12/08 02:39:10 jeremy Exp $
*/
public final class Navigator {
// -- Constructors : ----------------------------------------------------------
-
+
public Navigator(Detector detector) {
+ this.detector = detector;
_vtxBarrel = detector.getSubdetector("VertexBarrel");
_vtxEndcap = detector.getSubdetector("VertexEndcap");
_trkBarrel = detector.getSubdetector("TrackerBarrel");
@@ -54,7 +56,17 @@
}
public Subdetector getSubdetector(Sensor sensor) {
- return sensor.getDetectorElement().findAncestors(DeSubdetector.class).get(0).getSubdetector();
+ // Replaced with lookup in Detector by system ID. --JM
+ try {
+ IIdentifierHelper helper = sensor.getDetectorElement().getIdentifierHelper();
+ int sysid = helper.getValue(sensor.getDetectorElement().getIdentifier(), "system");
+ return detector.getSubdetector(sysid);
+ }
+ catch (Exception x)
+ {
+ throw new RuntimeException(x);
+ }
+// return sensor.getDetectorElement().findAncestors(SubdetectorDetectorElement.class).get(0).getSubdetector();
}
public int getSignZ(Sensor sensor) {
@@ -75,5 +87,5 @@
private Subdetector _trkForward;
private Subdetector _trkBarrel;
private Subdetector _trkEndcap;
-
+ private Detector detector;
}
lcsim/src/org/lcsim/contrib/onoprien/tracking/tests
diff -u -r1.3 -r1.4
--- HitConverterTest.java 30 Oct 2007 02:25:43 -0000 1.3
+++ HitConverterTest.java 8 Dec 2007 02:39:10 -0000 1.4
@@ -4,7 +4,7 @@
import hep.aida.*;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.converter.compact.DeSubdetector;
+import org.lcsim.detector.converter.compact.SubdetectorDetectorElement;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.recon.cat.util.NoSuchParameterException;
@@ -44,7 +44,7 @@
*
*
* @author D. Onoprienko
- * @version $Id: HitConverterTest.java,v 1.3 2007/10/30 02:25:43 onoprien Exp $
+ * @version $Id: HitConverterTest.java,v 1.4 2007/12/08 02:39:10 jeremy Exp $
*/
public class HitConverterTest extends Driver {
lcsim/src/org/lcsim/contrib/tracking
diff -u -r1.3 -r1.4
--- AxialBarrelTrackFinder.java 15 Feb 2006 00:28:01 -0000 1.3
+++ AxialBarrelTrackFinder.java 8 Dec 2007 02:39:10 -0000 1.4
@@ -76,7 +76,7 @@
private HashMap<SimTrackerHit,Double> _hit_separation = new HashMap<SimTrackerHit,Double>();
private LCMetaData _metadata = null; //event.getMetaData(hits);
- private IDDecoder _decoder = null; //(TrackerIDDecoder) metadata.getIDDecoder();
+ private IDDecoder _decoder = null; //(IDDecoder) metadata.getIDDecoder();
private AIDA _aida = AIDA.defaultInstance();
lcsim/src/org/lcsim/contrib/tracking
diff -u -r1.4 -r1.5
--- AxialBarrelTrackFinder1.java 9 Jul 2007 22:36:29 -0000 1.4
+++ AxialBarrelTrackFinder1.java 8 Dec 2007 02:39:10 -0000 1.5
@@ -19,7 +19,7 @@
import org.lcsim.detector.converter.compact.DeDetector;
import org.lcsim.geometry.subdetector.MultiLayerTracker;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.util.TrackerIDDecoder;
+import org.lcsim.geometry.IDDecoder;
import org.lcsim.util.aida.AIDA;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
@@ -80,7 +80,8 @@
private HashMap<SimTrackerHit,Double> _hit_separation = new HashMap<SimTrackerHit,Double>();
private LCMetaData _metadata = null; //event.getMetaData(hits);
- private TrackerIDDecoder _decoder = null; //(TrackerIDDecoder) metadata.getIDDecoder();
+ //private IDDecoder _decoder = null; //(IDDecoder) metadata.getIDDecoder();
+ private IDDecoder _decoder = null;
private AIDA _aida = AIDA.defaultInstance();
@@ -126,7 +127,7 @@
// Get the SimTrackerHits and metadata
_hits = event.getSimTrackerHits(_input_hit_collection);
_metadata = event.getMetaData(_hits);
- _decoder = (TrackerIDDecoder) _metadata.getIDDecoder();
+ _decoder = (IDDecoder) _metadata.getIDDecoder();
// Print out number of hits
lcsim/src/org/lcsim/contrib/tracking
diff -u -r1.1 -r1.2
--- AxialBarrelTrackFinderZ.java 18 Jul 2007 22:12:26 -0000 1.1
+++ AxialBarrelTrackFinderZ.java 8 Dec 2007 02:39:10 -0000 1.2
@@ -16,10 +16,10 @@
import org.lcsim.fit.circle.CircleFitter;
import org.lcsim.geometry.Detector;
+import org.lcsim.geometry.IDDecoder;
import org.lcsim.detector.converter.compact.DeDetector;
import org.lcsim.geometry.subdetector.MultiLayerTracker;
import org.lcsim.event.EventHeader.LCMetaData;
-import org.lcsim.geometry.util.TrackerIDDecoder;
import org.lcsim.util.aida.AIDA;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
@@ -80,7 +80,7 @@
private HashMap<SimTrackerHit,Double> _hit_separation = new HashMap<SimTrackerHit,Double>();
private LCMetaData _metadata = null; //event.getMetaData(hits);
- private TrackerIDDecoder _decoder = null; //(TrackerIDDecoder) metadata.getIDDecoder();
+ private IDDecoder _decoder = null; //(IDDecoder) metadata.getIDDecoder();
private AIDA _aida = AIDA.defaultInstance();
@@ -129,7 +129,7 @@
// Get the SimTrackerHits and metadata
_hits = event.getSimTrackerHits(_input_hit_collection);
_metadata = event.getMetaData(_hits);
- _decoder = (TrackerIDDecoder) _metadata.getIDDecoder();
+ _decoder = (IDDecoder) _metadata.getIDDecoder();
// Print out number of hits
lcsim/src/org/lcsim/contrib/uiowa
diff -u -r1.1 -r1.2
--- FuzzyCalorimeterHit.java 19 Nov 2007 21:50:06 -0000 1.1
+++ FuzzyCalorimeterHit.java 8 Dec 2007 02:39:11 -0000 1.2
@@ -1,8 +1,7 @@
package org.lcsim.contrib.uiowa;
-import java.util.*;
-import org.lcsim.event.Cluster;
import org.lcsim.event.CalorimeterHit;
+import org.lcsim.util.event.BaseCalorimeterHit;
/**
* A wrapper around CalorimeterHit which allows a hit to be assigned a weight.
@@ -10,10 +9,12 @@
* Watch out! Regular calibrations won't look at the weight and will over-count
* the hit's energy.
*
- * @version $Id: FuzzyCalorimeterHit.java,v 1.1 2007/11/19 21:50:06 mcharles Exp $
+ * @version $Id: FuzzyCalorimeterHit.java,v 1.2 2007/12/08 02:39:11 jeremy Exp $
*/
-public class FuzzyCalorimeterHit implements CalorimeterHit
+public class FuzzyCalorimeterHit
+extends BaseCalorimeterHit
+implements CalorimeterHit
{
protected CalorimeterHit m_hit;
protected double m_weight;
lcsim/src/org/lcsim/recon/cat
diff -u -r1.1 -r1.2
--- GarfieldTrackFinder.java 6 Apr 2007 21:48:14 -0000 1.1
+++ GarfieldTrackFinder.java 8 Dec 2007 02:39:11 -0000 1.2
@@ -4,7 +4,7 @@
import org.lcsim.recon.cat.util.Const;
import org.lcsim.event.*;
import org.lcsim.util.Driver;
-import org.lcsim.geometry.TrackerIDDecoder;
+import org.lcsim.geometry.IDDecoder;
import org.lcsim.util.aida.AIDA;
/**
@@ -27,7 +27,7 @@
*
* @author E. von Toerne
* @author D. Onoprienko
- * @version $Id: GarfieldTrackFinder.java,v 1.1 2007/04/06 21:48:14 onoprien Exp $
+ * @version $Id: GarfieldTrackFinder.java,v 1.2 2007/12/08 02:39:11 jeremy Exp $
*/
final public class GarfieldTrackFinder extends Driver{
CVSspam 0.2.8
