LISTSERV 16.5 - LCD-CVS Archives

* Driver that initializes Crux PFA package and provides miscellaneous services to other classes. * Current functionality:<ul> * <li>Provides access to {@link CalGeometry} object that handles various geometry related tasks required by other classes.

-package org.lcsim.contrib.onoprien.crux; - -import java.util.*; - -import hep.physics.vec.Hep3Vector; -import org.lcsim.detector.IDetectorElement; -import org.lcsim.detector.IDetectorElementVisitor; -import org.lcsim.event.CalorimeterHit; -import org.lcsim.geometry.IDDecoder; -import org.lcsim.geometry.Detector; -import org.lcsim.geometry.Subdetector; -import org.lcsim.geometry.subdetector.BarrelEndcapFlag; - -import org.lcsim.contrib.onoprien.util.job.JobEvent; -import org.lcsim.contrib.onoprien.util.job.JobEventListener; -import org.lcsim.contrib.onoprien.util.job.JobManager; -import org.lcsim.contrib.onoprien.util.swim.Surface; -import org.lcsim.contrib.onoprien.util.swim.Trajectory; -import org.lcsim.contrib.onoprien.util.swim.ZDisk; -import org.lcsim.contrib.onoprien.util.swim.ZCylinder; - -import org.lcsim.contrib.onoprien.crux.geom.CalGeometryConfig; -import org.lcsim.contrib.onoprien.crux.geom.CalLayer; -import org.lcsim.contrib.onoprien.crux.geom.CalModule; - -import static org.lcsim.contrib.onoprien.crux.geom.CalModule.Attribute.*; - -/** - * Crux package custom configuration class. - * - * This class is intended to be a single location where all the ugly detector-specific - * or running mode specific code is placed. {@link CruxManager} creates a single instance - * of this class. Its {@link #detectorChanged detectorChanged(CruxEvent)} method is called - * by the framework once the event processing starts. During event processing, - * any client class has access to <tt>CruxConfig</tt> singleton through {@link CruxManager#getConfig()}. - * - * Current content: - * <ul> - * <li>Names of digitized hits collections coming from DigiSim - * <li>How the calorimeter is split into modules, modules into layers, and related services. - * Creation of <tt>CruxCalModules</tt> and <tt>CruxCalLayers</tt>. The implementation of - * this part is extremely ugly at the moment due to bugs and missing functionality in the - * org.lcsim geometry system. - * </ul> - * - * @author D. Onoprienko - * @version $Id: CruxConfig.java,v 1.4 2009/02/19 20:46:07 onoprien Exp $ - */ -public class CruxConfig implements JobEventListener, CalGeometryConfig { - -// -- Constructors : ---------------------------------------------------------- - - private CruxConfig() { - - JobManager.defaultInstance().addListener(this); - - digiHitColNamesConstruct(); - - moduleConstruct(); - } - - static public CruxConfig defaultInstance() { - return (_def == null) ? _def = new CruxConfig() : _def ; - } - -// -- Initialization : -------------------------------------------------------- - - public void detectorChanged(JobEvent jEvent) { - - moduleInit(jEvent); - - } - -// -- Digitized calorimeter hits collection names : --------------------------- - - protected void digiHitColNamesConstruct() { - _digiHitColNames = new String[]{"EcalBarrDigiHits","EcalEndcapDigiHits","HcalBarrDigiHits","HcalEndcapDigiHits"}; - } - - public String[] getDigiHitCollectionNames() { - return _digiHitColNames; - } - - protected String[] _digiHitColNames; - -// -- Division of calorimeter into modules : ---------------------------------- - - protected void moduleConstruct() { - } - - protected void moduleInit(JobEvent jEvent) { - - // create modules - - CalModule eBar = new CalModule("ECAL_BARREL", EnumSet.of(ECAL, BARREL, ENTRY), "EMBarrel"); - CalModule hBar = new CalModule("HCAL_BARREL", EnumSet.of(HCAL, BARREL, EXIT), "HADBarrel"); - CalModule eSouthEnd = new CalModule("ECAL_ENDCAP_SOUTH", EnumSet.of(ECAL, ENDCAP, SOUTH, ENTRY), "EMEndcap"); - CalModule eNorthEnd = new CalModule("ECAL_ENDCAP_NORTH", EnumSet.of(ECAL, ENDCAP, NORTH, ENTRY), "EMEndcap"); - CalModule hSouthEnd = new CalModule("HCAL_ENDCAP_SOUTH", EnumSet.of(HCAL, ENDCAP, SOUTH, EXIT), "HADEndcap"); - CalModule hNorthEnd = new CalModule("HCAL_ENDCAP_NORTH", EnumSet.of(HCAL, ENDCAP, NORTH, EXIT), "HADEndcap"); - - _modules = new ArrayList<CalModule>(6); - Collections.addAll(_modules, eBar, hBar, eSouthEnd, eNorthEnd, hSouthEnd, hNorthEnd); - - // neighbors - - List<CalModule> emptyList = Collections.emptyList(); - _previousModules = new ArrayList<List<CalModule>>(6); - Collections.addAll( _previousModules, - emptyList, - new ArrayList<CalModule>(Arrays.asList(new CalModule[]{eBar})), - emptyList, - emptyList, - new ArrayList<CalModule>(Arrays.asList(new CalModule[]{eSouthEnd})), - new ArrayList<CalModule>(Arrays.asList(new CalModule[]{eNorthEnd})) - ); - _nextModules = new ArrayList<List<CalModule>>(6); - Collections.addAll(_nextModules, - new ArrayList<CalModule>(Arrays.asList(new CalModule[]{hBar})), - emptyList, - new ArrayList<CalModule>(Arrays.asList(new CalModule[]{hSouthEnd})), - new ArrayList<CalModule>(Arrays.asList(new CalModule[]{hNorthEnd})), - emptyList, - emptyList - ); - - // assign DetectorElements - - Detector det = jEvent.getDetector(); - int idOffset = 0; - int moduleID = 0; - for (CalModule module : _modules) { - Subdetector sd = det.getSubdetector(module.getSubdetectorName()); - final List<IDetectorElement> deList = new ArrayList<IDetectorElement>(50); - sd.getDetectorElement().traverseDescendantsPreOrder(new IDetectorElementVisitor() { - public void visit(IDetectorElement de) { - String name = de.getName(); - if (name.contains("layer") || name.contains("sensor")) { - deList.add(de); - } - } - public boolean isDone() {return false;} - }); - TreeMap<Integer, IDetectorElement> deMap = new TreeMap<Integer, IDetectorElement>(); - for (IDetectorElement de : deList) { - String name = de.getName(); - if (module.isBarrel() || - ((name.contains("negative") && module.isSouth()) || (name.contains("positive") && module.isNorth()))) { - name = name.replaceFirst(".*layer",""); - name = name.replaceFirst(".*sensor",""); - int layer = Integer.parseInt(name); - deMap.put(layer, de); - } - } - ArrayList<CalLayer> layerList = new ArrayList<CalLayer>(deMap.size()); - int ordinal = 0; - for (Map.Entry<Integer, IDetectorElement> entry : deMap.entrySet()) { - int layer = entry.getKey(); - int id = idOffset + layer; - layerList.add(new CalLayer(module, entry.getValue(), ordinal, id, layer)); - ordinal++; - } - module.initialize(moduleID++, sd, layerList); - idOffset += layerList.size(); - } - } - - /** - * Looks up <tt>CalModule</tt> the hit belongs to. - */ - public CalModule getModule(CalorimeterHit hit) { - IDDecoder decoder = hit.getIDDecoder(); - decoder.setID(hit.getCellID()); - Subdetector subDet = decoder.getSubdetector(); - if (subDet == _modules.get(0).getSubdetector()) { - return _modules.get(0); - } else if (subDet == _modules.get(1).getSubdetector()) { - return _modules.get(1); - } else { - BarrelEndcapFlag flag = decoder.getBarrelEndcapFlag(); - if (subDet == _modules.get(2).getSubdetector()) { - return (flag.isEndcapSouth()) ? _modules.get(2) : _modules.get(3) ; - } else { - return (flag.isEndcapSouth()) ? _modules.get(4) : _modules.get(5) ; - } - } - } - - /** Returns a list of all modules. */ - public List<CalModule> getModules() { - return Collections.unmodifiableList(_modules); - } - - /** - * Returns a list of layers the specified trajectory might cross after coming out of the - * given layer - more likely first. The origing of the trajectory should belong to the - * specified layer - no checking is done. - * Current implementation: next layer in the same subdetector. Need to handle - * transitions between barrel and endcap, curling. - */ - public List<CalLayer> findNeighbors(CalLayer layer, Trajectory trajectory) { - Surface surface = layer.getReferenceSurface(); - Hep3Vector dir = trajectory.getDirection(); - Hep3Vector pos = trajectory.getPosition(); - double dirSign; - if (surface instanceof ZDisk) { - dirSign = dir.z()*pos.z(); - } else { - dirSign = pos.x()*dir.x() + pos.y()*dir.y(); - } - int iDirSign = (int) Math.signum(dirSign); - CalModule module = layer.getModule(); - CalLayer nextLayer = module.getLayerByOrdinal(layer.getLayerOrdinal()+iDirSign); - ArrayList<CalLayer> out = new ArrayList<CalLayer>(); - if (nextLayer == null) { - if (iDirSign > 0) { - List<CalModule> nextModules = _nextModules.get(module.getID()); - for (CalModule mod : nextModules) out.add(mod.getLayerByOrdinal(0)); - } else { - List<CalModule> nextModules = _previousModules.get(module.getID()); - for (CalModule mod : nextModules) out.add(mod.getLayerByOrdinal(mod.getLayers().size()-1)); - } - } else { - out.add(nextLayer); - } - return out; - } - - protected ArrayList<CalModule> _modules; - protected ArrayList<List<CalModule>> _previousModules; - protected ArrayList<List<CalModule>> _nextModules; - -// -- Private parts : --------------------------------------------------------- - - static private CruxConfig _def; -}

* Used by track finder cheaters and tracking performance analysis classes. * In addition to cuts implemented by {@link Definition}, this definition allowes * cats based on Monte Carlo truth information accessible through {@link MCTruthCrux}

+package org.lcsim.contrib.onoprien.crux.geom; + +import java.util.*; + +import hep.physics.vec.Hep3Vector; +import org.lcsim.detector.IDetectorElement; +import org.lcsim.detector.IDetectorElementVisitor; +import org.lcsim.event.CalorimeterHit; +import org.lcsim.geometry.IDDecoder; +import org.lcsim.geometry.Detector; +import org.lcsim.geometry.Subdetector; +import org.lcsim.geometry.subdetector.BarrelEndcapFlag; + +import org.lcsim.contrib.onoprien.util.job.JobEvent; +import org.lcsim.contrib.onoprien.util.job.JobEventListener; +import org.lcsim.contrib.onoprien.util.job.JobManager; +import org.lcsim.contrib.onoprien.util.swim.Surface; +import org.lcsim.contrib.onoprien.util.swim.Trajectory; +import org.lcsim.contrib.onoprien.util.swim.ZDisk; +import org.lcsim.contrib.onoprien.util.swim.ZCylinder; + +import static org.lcsim.contrib.onoprien.crux.geom.CalModule.Attribute.*; + +/** + * Default implementation of {@link CalGeometry}. + * Optimized implementations can be written for particular detectors to improve performance. + * + * @author D. Onoprienko + * @version $Id: DefaultCalGeometry.java,v 1.1 2009/03/19 06:08:03 onoprien Exp $ + */ +public class DefaultCalGeometry extends CalGeometry implements JobEventListener { + +// -- Private parts : --------------------------------------------------------- + + private ArrayList<CalModule> _modules; + private ArrayList<List<CalModule>> _previousModules; + private ArrayList<List<CalModule>> _nextModules; + + +// -- Constructors and initialization : --------------------------------------- + + public DefaultCalGeometry() { + JobManager.defaultInstance().addListener(this); + } + + public void detectorChanged(JobEvent jEvent) { + moduleInit(jEvent); + super.detectorChanged(jEvent); + } + + +// -- Implementing CalGeometry : ---------------------------------------------- + + /** Returns an unmodifiable list of calorimeter modules, ordered by module ID. */ + public List<CalModule> getModules() { + return Collections.unmodifiableList(_modules); + } + + /** + * Returns a list of layers the specified trajectory might cross after coming out of the + * given layer - more likely first. The origin of the trajectory should belong to the + * specified layer - no checking is done. + */ + public List<CalLayer> nextLayers(CalLayer layer, Trajectory trajectory) { + Surface surface = layer.getReferenceSurface(); + Hep3Vector dir = trajectory.getDirection(); + Hep3Vector pos = trajectory.getPosition(); + double dirSign; + if (surface instanceof ZDisk) { + dirSign = dir.z()*pos.z(); + } else { + dirSign = pos.x()*dir.x() + pos.y()*dir.y(); + } + int iDirSign = (int) Math.signum(dirSign); + CalModule module = layer.getModule(); + CalLayer nextLayer = module.getLayerByOrdinal(layer.getLayerOrdinal()+iDirSign); + ArrayList<CalLayer> out = new ArrayList<CalLayer>(); + if (nextLayer == null) { + if (iDirSign > 0) { + List<CalModule> nextModules = _nextModules.get(module.getID()); + for (CalModule mod : nextModules) out.add(mod.getLayerByOrdinal(0)); + } else { + List<CalModule> nextModules = _previousModules.get(module.getID()); + for (CalModule mod : nextModules) out.add(mod.getLayerByOrdinal(mod.getLayers().size()-1)); + } + } else { + out.add(nextLayer); + } + return out; + } + + /** + * Returns a list of layers the specified trajectory might cross next - more likely first. + */ + public List<CalLayer> nextLayers(Trajectory trajectory) { + throw new UnsupportedOperationException(); + } + + +// -- Division of calorimeter into modules : ---------------------------------- + + protected void moduleInit(JobEvent jEvent) { + + // create modules + + CalModule eBar = new CalModule("ECAL_BARREL", EnumSet.of(ECAL, BARREL, ENTRY), "EMBarrel"); + CalModule hBar = new CalModule("HCAL_BARREL", EnumSet.of(HCAL, BARREL, EXIT), "HADBarrel"); + CalModule eSouthEnd = new CalModule("ECAL_ENDCAP_SOUTH", EnumSet.of(ECAL, ENDCAP, SOUTH, ENTRY), "EMEndcap"); + CalModule eNorthEnd = new CalModule("ECAL_ENDCAP_NORTH", EnumSet.of(ECAL, ENDCAP, NORTH, ENTRY), "EMEndcap"); + CalModule hSouthEnd = new CalModule("HCAL_ENDCAP_SOUTH", EnumSet.of(HCAL, ENDCAP, SOUTH, EXIT), "HADEndcap"); + CalModule hNorthEnd = new CalModule("HCAL_ENDCAP_NORTH", EnumSet.of(HCAL, ENDCAP, NORTH, EXIT), "HADEndcap"); + + _modules = new ArrayList<CalModule>(6); + Collections.addAll(_modules, eBar, hBar, eSouthEnd, eNorthEnd, hSouthEnd, hNorthEnd); + + // neighbors + + List<CalModule> emptyList = Collections.emptyList(); + _previousModules = new ArrayList<List<CalModule>>(6); + Collections.addAll( _previousModules, + emptyList, + new ArrayList<CalModule>(Arrays.asList(new CalModule[]{eBar})), + emptyList, + emptyList, + new ArrayList<CalModule>(Arrays.asList(new CalModule[]{eSouthEnd})), + new ArrayList<CalModule>(Arrays.asList(new CalModule[]{eNorthEnd})) + ); + _nextModules = new ArrayList<List<CalModule>>(6); + Collections.addAll(_nextModules, + new ArrayList<CalModule>(Arrays.asList(new CalModule[]{hBar})), + emptyList, + new ArrayList<CalModule>(Arrays.asList(new CalModule[]{hSouthEnd})), + new ArrayList<CalModule>(Arrays.asList(new CalModule[]{hNorthEnd})), + emptyList, + emptyList + ); + + // assign DetectorElements + + Detector det = jEvent.getDetector(); + int idOffset = 0; + int moduleID = 0; + for (CalModule module : _modules) { + Subdetector sd = det.getSubdetector(module.getSubdetectorName()); + final List<IDetectorElement> deList = new ArrayList<IDetectorElement>(50); + sd.getDetectorElement().traverseDescendantsPreOrder(new IDetectorElementVisitor() { + public void visit(IDetectorElement de) { + String name = de.getName(); + if (name.contains("layer") || name.contains("sensor")) { + deList.add(de); + } + } + public boolean isDone() {return false;} + }); + TreeMap<Integer, IDetectorElement> deMap = new TreeMap<Integer, IDetectorElement>(); + for (IDetectorElement de : deList) { + String name = de.getName(); + if (module.isBarrel() || + ((name.contains("negative") && module.isSouth()) || (name.contains("positive") && module.isNorth()))) { + name = name.replaceFirst(".*layer",""); + name = name.replaceFirst(".*sensor",""); + int layer = Integer.parseInt(name); + deMap.put(layer, de); + } + } + ArrayList<CalLayer> layerList = new ArrayList<CalLayer>(deMap.size()); + int ordinal = 0; + for (Map.Entry<Integer, IDetectorElement> entry : deMap.entrySet()) { + int layer = entry.getKey(); + int id = idOffset + layer; + layerList.add(new CalLayer(module, entry.getValue(), ordinal, id, layer)); + ordinal++; + } + module.initialize(moduleID++, sd, layerList); + idOffset += layerList.size(); + } + } + +}

lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux/geom

CalGeometry.java 1.3 -> 1.4

diff -u -r1.3 -r1.4
--- CalGeometry.java	19 Feb 2009 20:46:08 -0000	1.3
+++ CalGeometry.java	19 Mar 2009 06:08:03 -0000	1.4
@@ -3,6 +3,10 @@

 import java.util.*;
 
 import hep.physics.vec.Hep3Vector;

+import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.IGeometryInfo;
+import org.lcsim.detector.solids.ISolid;
+import org.lcsim.detector.solids.Tube;

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.IDDecoder;

@@ -11,6 +15,9 @@

 import org.lcsim.contrib.onoprien.util.job.JobEventListener;
 import org.lcsim.contrib.onoprien.util.job.JobManager;
 import org.lcsim.contrib.onoprien.util.swim.Trajectory;

+import org.lcsim.contrib.onoprien.util.swim.Surface;
+import org.lcsim.contrib.onoprien.util.swim.ZCylinder;
+import org.lcsim.contrib.onoprien.util.swim.ZDisk;

 
 /**
  * Provides various calorimeter geometry related services to other classes.

@@ -18,112 +25,116 @@

  * calling <tt>JobManager.defaultInstance().get(CalGeometry.class)</tt>.
  * 
  * @author D. Onoprienko

- * @version $Id: CalGeometry.java,v 1.3 2009/02/19 20:46:08 onoprien Exp $

+ * @version $Id: CalGeometry.java,v 1.4 2009/03/19 06:08:03 onoprien Exp $

*/

-public class CalGeometry implements JobEventListener {

+abstract public class CalGeometry implements JobEventListener {

-  static public CalGeometry defaultInstance() {
-    return new CalGeometry();
-  }

+// -- Private parts :  ---------------------------------------------------------
+
+  private Detector _detector;
+  private HashMap<IDetectorElement, CalLayer> _de2cl;

   
 // -- Constructors and initialization :  ---------------------------------------

-  private CalGeometry() {

+  public CalGeometry() {

     JobManager.defaultInstance().addListener(this);
   }

-  public void setConfig(CalGeometryConfig config) {
-    if (_config != null) throw new IllegalStateException("Geometry config has already been set.");
-    _config = config;
-    JobManager jobManager = JobManager.defaultInstance();
-    jobManager.addListener(this, config);
-  }
-

   public void detectorChanged(JobEvent jEvent) {

-    if (_config == null) throw new IllegalStateException("Geometry config has not been set.");

     _detector = jEvent.getDetector();

-    _modules = new ArrayList(_config.getModules());

+    for (CalModule module : getModules()) {
+      for (CalLayer layer : module.getLayers()) {
+        _de2cl.put(layer.getDetectorElement(), layer);
+      }
+    }

+
+
+// -- Abstract methods :  ------------------------------------------------------

+  /** Returns an unmodifiable list of calorimeter modules, ordered by module ID. */
+  abstract public List<CalModule> getModules();
+
+  /**
+   * Returns a list of layers the specified trajectory might cross after coming out of the
+   * given layer - more likely first. The origin of the trajectory should belong to the
+   * specified layer - no checking is done.
+   */
+  abstract public List<CalLayer> nextLayers(CalLayer layer, Trajectory trajectory);
+
+  /**
+   * Returns a list of layers the specified trajectory might cross next - more likely first.
+   */
+  abstract public List<CalLayer> nextLayers(Trajectory trajectory);
+
+

 // -- Getters :  ---------------------------------------------------------------

   /** Returns currently used <tt>Detector</tt> object. */
   public Detector getDetector() {
     return _detector;
   }

-  /** Returns an unmodifiable list of calorimeter modules. */
-  public List<CalModule> getModules() {
-    return Collections.unmodifiableList(_modules);
-  }
-

   /** Returns calorimeter module the given hit belongs to. */
   public CalModule getModule(CalorimeterHit hit) {

-    return _config.getModule(hit);

+    return getLayer(hit).getModule();

+
+  /** Returns calorimeter layer the specified hit belongs to. */

   public CalLayer getLayer(CalorimeterHit hit) {

-    IDDecoder dec = hit.getIDDecoder();
-    dec.setID(hit.getCellID());
-    int iLayer = dec.getLayer();
-    CalModule module = getModule(hit);
-    return module.getLayerByDecoded(iLayer);
-  }
-  
-  /** Returns <tt>true</tt> id the given hit belongs to EM calorimeter. */
-  public boolean isECal(CalorimeterHit hit) {
-    return getModule(hit).isECal();
-  }
-  
-  /** Returns <tt>true</tt> id the given hit belongs to hadronic calorimeter. */
-  public boolean isHCal(CalorimeterHit hit) {
-    return getModule(hit).isHCal();

+    return getLayer(hit.getDetectorElement());

   
 // -- Trajectory propagation :  ------------------------------------------------

/**

-   * Returns a list of layers the specified trajectory might cross after coming out of the 
-   * given layer - more likely first. The origin of the trajectory should belong to the
-   * specified layer - no checking is done.

+   * Propagates the given trajectory to the given calorimeter layer.
+   * Returns the point where the trajectory intersects the layer's reference surface.
+   * Origin of the supplied <tt>Trajectory</tt> is set to that point.
+   * If the trajectory does not cross the specified layer, <tt>null</tt> is returned
+   * and the trajectory is not changed.

*/

-  public List<CalLayer> findNeighbors(CalLayer layer, Trajectory trajectory) {
-    return _config.findNeighbors(layer, trajectory);

+  public Hep3Vector propagateToLayer(Trajectory trajectory, CalLayer layer) {
+    throw new UnsupportedOperationException();  // FIXME

   }
 
   /**
    * Propagates the given trajectory from the specified layer to the next calorimeter layer it crosses.
    * <tt>CalLayer</tt> object associated with that layer is returned, and
    * the origin of the supplied <tt>Trajectory</tt> is set to a point where it

-   * crosses that layer's reference surface.

+   * crosses that layer's reference surface. If the trajectory leaves the calorimeter,
+   * <tt>null</tt> is returned and the trajectory is not changed.

    */
   public CalLayer propagateToNextLayer(CalLayer currentLayer, Trajectory trajectory) {

-    List<CalLayer> nextLayers = findNeighbors(currentLayer, trajectory);

+    List<CalLayer> nextLayers = nextLayers(currentLayer, trajectory);

     for (CalLayer candidate : nextLayers) {
       Hep3Vector pos = propagateToLayer(trajectory, candidate);
       if (pos != null) return candidate;
     }
     return null;
   }

/**

-   * Propagates the given trajectory to the next calorimeter layer it crosses.

+   * Propagates the given trajectory from outside the calorimeter to its entry layer.

    * <tt>CalLayer</tt> object associated with that layer is returned, and
    * the origin of the supplied <tt>Trajectory</tt> is set to a point where it

-   * crosses that layer's reference surface.

+   * crosses that layer's reference surface. The origin of the specified trajectory
+   * is assumed to be outside the calorimeter, no checking is done. If the trajectory
+   * does not enter calorimeter, <tt>null</tt> is returned and the trajectory is not changed.

*/

-  public CalLayer propagateToNextLayer(Trajectory trajectory) {

+  public CalLayer propagateToCalorimeter(Trajectory trajectory) {

     throw new UnsupportedOperationException();  // FIXME
   }

/**

-   * Propagates the given trajectory to the given calorimeter layer.
-   * Returns the point where the trajectory intersects the layer's reference surface.
-   * Origin of the supplied <tt>Trajectory</tt> is set to that point.
-   * If the trajectory does not cross the specified layer, <tt>null</tt> is returned
-   * and the trajectory is not changed.
-   */  
-  public Hep3Vector propagateToLayer(Trajectory trajectory, CalLayer layer) {

+   * Propagates the given trajectory to the next calorimeter layer it crosses.
+   * <tt>CalLayer</tt> object associated with that layer is returned, and
+   * the origin of the supplied <tt>Trajectory</tt> is set to a point where it
+   * crosses that layer's reference surface. If the trajectory does not cross any
+   * calorimeter layers, <tt>null</tt> is returned and the trajectory is not changed.
+   */
+  public CalLayer propagateToNextLayer(Trajectory trajectory) {

     throw new UnsupportedOperationException();  // FIXME
   }

@@ -132,11 +143,38 @@

   public Hep3Vector getClosestPointOnLayer(Hep3Vector point, CalLayer layer) {
     throw new UnsupportedOperationException();  // FIXME
   }

-  
-// -- Private parts :  ---------------------------------------------------------
-  
-  private CalGeometryConfig _config;

-  private Detector _detector;
-  private ArrayList<CalModule> _modules;

+
+// -- Protected helper methods :  ----------------------------------------------
+
+  protected CalLayer getLayer(IDetectorElement de) {
+    return _de2cl.get(de);
+  }
+
+  /**
+   * Creates and returns reference surface object corresponding to the specified detector element.
+   */
+  protected Surface createReferenceSurface(IDetectorElement detEl) {
+    IGeometryInfo gInfo = detEl.getGeometry();
+    ISolid solid = gInfo.getLogicalVolume().getSolid();
+    if (solid instanceof Tube) {
+      Tube tube = (Tube) solid;
+      double rMin = tube.getInnerRadius();
+      double rMax = tube.getOuterRadius();
+      double zHalf = tube.getZHalfLength();
+      Hep3Vector pos = gInfo.getPosition();
+      double z = pos.z();
+      if (pos.x() > Double.MIN_VALUE || pos.y() > Double.MIN_VALUE) {
+        throw new IllegalArgumentException("Cannot create reference surface for Tube at position "+ pos);
+      }
+      if (Math.abs(z)  < zHalf) { // barrel cylinder
+        return new ZCylinder((rMin+rMax)/2., z-zHalf, z+zHalf);
+      } else { // endcap disk
+        return new ZDisk(z, rMin, rMax);
+      }
+    } else {
+      throw new IllegalArgumentException("Creating reference surfaces for solids other than Tube is not implemented");
+    }
+  }
+

-package org.lcsim.contrib.onoprien.crux.geom; - -import java.util.*; - -import org.lcsim.event.CalorimeterHit; - -import org.lcsim.contrib.onoprien.util.job.JobEventListener; -import org.lcsim.contrib.onoprien.util.swim.Trajectory; - -/** - * Calorimeter geometry configuration. - * - * @author D. Onoprienko - * @version $Id: CalGeometryConfig.java,v 1.1.1.1 2008/12/10 22:03:06 jeremy Exp $ - */ -public interface CalGeometryConfig extends JobEventListener { - - /** Returns a list of all modules. */ - List<CalModule> getModules(); - - /** Looks up <tt>CalModule</tt> the hit belongs to. */ - CalModule getModule(CalorimeterHit hit); - - /** - * Returns a list of layers the specified trajectory might cross after coming out of the - * given layer - more likely first. The origin of the trajectory should belong to the - * specified layer - no checking is done. - */ - List<CalLayer> findNeighbors(CalLayer layer, Trajectory trajectory); - -}

- * <dt>"OUTPUT_MAP_NAME"</dt> <dd>Name of output collection. - * Default: <tt>null</tt> (must be specified before this driver can be used).</dd> - * <dt>"GEOMETRY_CONFIG"</dt> <dd>{@link CalGeometryConfig} object to be used by this driver. - * Default: <tt>null</tt> (must be set before this driver can be used).</dd>

+ * <dt>"INPUT_HITS"</dt> <dd>Names of input collections of calorimeter hits. + * Default: none (must be specified before this driver can be used).</dd> + * <dt>"OUTPUT_HITS"</dt> <dd>Name of output collection. + * Default: none (must be specified before this driver can be used).</dd> + * <dt>"GEOMETRY"</dt> <dd>{@link CalGeometry} object to be used by this driver. + * Default: none (must be set before this driver can be used).</dd>

+ if (name.equalsIgnoreCase("INPUT_HITS")) { + _inHitsName = new String[values.length]; + for (int i=0; i<values.length; i++) _inHitsName[i] = (String) values[i]; + } else if (name.equalsIgnoreCase("OUTPUT_HITS")) {

- } else if (name.equalsIgnoreCase("GEOMETRY_CONFIG")) { - CalGeometryConfig geomConfig = (CalGeometryConfig) value; - JobManager.defaultInstance().get(CalGeometry.class).setConfig(geomConfig);

+ } else if (name.equalsIgnoreCase("GEOMETRY")) { + CalGeometry geom = (CalGeometry) value; + JobManager jobMan = JobManager.defaultInstance(); + jobMan.put(CalGeometry.class, geom); + jobMan.addListener(this, geom);

Commit in `lcsim-contrib/src/main/java/org/lcsim/contrib/onoprien/crux` on MAIN
`CruxManager.java`	+4	-10	1.3 -> 1.4
`CruxConfig.java`		-236	1.4 removed
`analysis/DefinitionCrux.java`	+2	-4	1.1 -> 1.2
`/IDefinition.java`	+3	-2	1.1 -> 1.2
`geom/DefaultCalGeometry.java`	+179		added 1.1
`/CalGeometry.java`	+102	-64	1.3 -> 1.4
`/CalLayer.java`	+5	-3	1.2 -> 1.3
`/CalGeometryConfig.java`		-31	1.1.1.1 removed
`recon/CalorimeterDriver.java`	+20	-15	1.2 -> 1.3
	+315	-365