lcsim/src/org/lcsim/recon/pfa/structural

diff -u -r1.2 -r1.3
--- TrackMipClusterDriver.java	15 Sep 2009 23:23:21 -0000	1.2
+++ TrackMipClusterDriver.java	7 May 2010 19:04:55 -0000	1.3
@@ -19,13 +19,16 @@

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

-import org.lcsim.geometry.subdetector.CylindricalCalorimeter;

 import org.lcsim.recon.cluster.util.BasicCluster;
 import org.lcsim.spacegeom.SpacePoint;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 import org.lcsim.util.hitmap.HitMap;
 import org.lcsim.util.swim.HelixSwimmer;

+import org.lcsim.geometry.compact.Subdetector;
+import org.lcsim.geometry.subdetector.*;
+import org.lcsim.recon.util.CalorimeterInformation;
+import org.lcsim.geometry.Calorimeter.CalorimeterType;

 
 public class TrackMipClusterDriver extends Driver
 {

@@ -41,24 +44,12 @@

    private  int _numbhadlayers;
    private int _numechadlayers;
 //    The EM calorimeter hits, by layer in barrel, endcap

-   private List[] _emBLayerHits;
-   private List[] _emECLayerHits;
-//    The HAD calorimeter hits, by layer in barrel, endcap
-   private List[] _hadBLayerHits;
-   private List[] _hadECLayerHits;
-//    The radii of the barrel calorimeter layers
-   private double[] _emBRadii;
-   private double[] _hadBRadii;

    private double[] BRadii = new double[100];
    private double[] ECZs = new double[100];
 //    modified Barrel helix swimmer for org.lcsim test
 //   private Helix[] _emBSwimmers; //EM
 //   private Helix[] _hadBSwimmers; //HAD
 //   Z extent of the central barrel calorimeters.

-   private double _embZ; //EM Barrel Z
-   private double[] _emecZ; //EM Endcap Z
-   private double _hadbZ; //HAD barrel z
-   private double[] _hadecZ; // HAD endcap z

    private double _dminE;
    private double _dminH;
    private double _dminTrC;

@@ -70,6 +61,7 @@

 //   private SpacePoint trackspacept;
    private double zField;
 //   private String[] _hitmapnames;

+   private CalorimeterInformation ci;

    
    public TrackMipClusterDriver(double dminE, double dminH, double dminTrC, double mincd)
    {

@@ -81,6 +73,7 @@

    
     protected void process(EventHeader event)
     {

+        if(ci == null)ci = CalorimeterInformation.instance();

         super.process(event);  // executes all added drivers
         
 //      Initialize things here

@@ -96,41 +89,45 @@

 //            System.out.println("B Field " + zField + " Tesla");
             
             //  Setup layer counts and distances for barrel, endcap

-            CylindricalCalorimeter emb = ((CylindricalCalorimeter) det.getSubdetectors().get("EMBarrel"));
-            _embZ = emb.getZMin();
-            _numbemlayers = emb.getLayering().getLayerCount();
-//            System.out.println("EM Barrel Layers " +_numbemlayers);

+            _numbemlayers = ci.getNLayers(CalorimeterType.EM_BARREL);
+            _numbhadlayers = ci.getNLayers(CalorimeterType.HAD_BARREL);
+            _numecemlayers = ci.getNLayers(CalorimeterType.EM_ENDCAP);
+            _numechadlayers = ci.getNLayers(CalorimeterType.HAD_ENDCAP);
+            Subdetector s = ci.getSubdetector(CalorimeterType.EM_BARREL);
+            double ebr0 = ci.getRMin(CalorimeterType.EM_BARREL);
+            if(s instanceof CylindricalBarrelCalorimeter)
+            {
+                ebr0 = 0.;
+            }

             for (int i=0; i<_numbemlayers; ++i)
             {

-                BRadii[i]=emb.getLayering().getDistanceToLayerSensorMid(i);

+                BRadii[i]= ebr0 + s.getLayering().getDistanceToLayerSensorMid(i);

 //                System.out.println("EM Barrel Layer Number " +i+ " EM Barrel Radius " + BRadii[i]);
             }
             

-            CylindricalCalorimeter emec = ((CylindricalCalorimeter) det.getSubdetectors().get("EMEndcap"));
-            _numecemlayers = emec.getLayering().getLayerCount();
-//            System.out.println("EM EC Layers " +_numecemlayers);

+            s = ci.getSubdetector(CalorimeterType.EM_ENDCAP);

             for (int i=0; i<_numecemlayers; ++i)
             {

-                ECZs[i] = emec.getLayering().getDistanceToLayerSensorMid(i);

+                ECZs[i] = s.getLayering().getDistanceToLayerSensorMid(i);

 //                System.out.println("EM Endcap Layer Number " +i+ " EM Endcap Z " +_emecZ[i]);
             }
 

-            CylindricalCalorimeter hadb = ((CylindricalCalorimeter) det.getSubdetectors().get("HADBarrel"));       
-            _hadbZ = hadb.getZMin();
-            _numbhadlayers = hadb.getLayering().getLayerCount();
-//            System.out.println("HAD Barrel Layers " +_numbhadlayers);   

+            s = ci.getSubdetector(CalorimeterType.HAD_BARREL);
+            ebr0 = ci.getRMin(CalorimeterType.HAD_BARREL);
+            if(s instanceof CylindricalBarrelCalorimeter)
+            {
+                ebr0 = 0.;
+            }

             for (int i=0; i<_numbhadlayers; ++i)
             {

-                BRadii[i+_numbemlayers]=hadb.getLayering().getDistanceToLayerSensorMid(i);

+                BRadii[i+_numbemlayers]= ebr0 + s.getLayering().getDistanceToLayerSensorMid(i);

 //                System.out.println("HAD Barrel Layer Number " +i+ " HAD Barrel Radius " + BRadii[i+_numbemlayers]);
             }
             

-            CylindricalCalorimeter hadec = ((CylindricalCalorimeter) det.getSubdetectors().get("HADEndcap"));       
-            _numechadlayers = hadec.getLayering().getLayerCount();
-//            System.out.println("HAD Endcap Layers " +_numechadlayers); 

+            s = ci.getSubdetector(CalorimeterType.HAD_ENDCAP);

             for (int i=0; i<_numechadlayers; ++i)
             {

-                ECZs[i+_numecemlayers] = hadec.getLayering().getDistanceToLayerSensorMid(i);

+                ECZs[i+_numecemlayers] = s.getLayering().getDistanceToLayerSensorMid(i);

 //                System.out.println("HAD Endcap Layer Number " +i+ " HAD Endcap Z " +_hadecZ[i]);
             }
         

@@ -161,7 +158,7 @@

             List<CalorimeterHit> chits = event.get(CalorimeterHit.class,_hitcollnames[i]);
             IDDecoder caldecoder = (IDDecoder) event.getMetaData(chits).getIDDecoder();                  
 //            System.out.println("Collection is " +_hitcollnames[i]);

-            if (_hitcollnames[i] == "EcalBarrDigiHits")

+            if (_hitcollnames[i] == ci.getDigiCollectionName(CalorimeterType.EM_BARREL))

             {
                 for (CalorimeterHit chit : chits)
                 {

@@ -182,7 +179,7 @@

                     nhitsEMB++;
                     nhitsBTotCAL++;
                 }

-            } else if (_hitcollnames[i] == "HcalBarrDigiHits")

+            } else if (_hitcollnames[i] == ci.getDigiCollectionName(CalorimeterType.HAD_BARREL))

             {
                 for (CalorimeterHit chit : chits)
                 {

@@ -203,7 +200,7 @@

                     nhitsHADB++;
                     nhitsBTotCAL++;
                 }

-            } else if (_hitcollnames[i] == "EcalEndcapDigiHits")

+            } else if (_hitcollnames[i] == ci.getDigiCollectionName(CalorimeterType.EM_ENDCAP))

             {
                 for (CalorimeterHit chit : chits)
                 {

@@ -224,7 +221,7 @@

                     nhitsEMEC++;
                     nhitsECTotCAL++;
                 }

-            } else if (_hitcollnames[i] == "HcalEndcapDigiHits")

+            } else if (_hitcollnames[i] == ci.getDigiCollectionName(CalorimeterType.HAD_ENDCAP))

             {
                 for (CalorimeterHit chit : chits)
                 {