LISTSERV 16.5 - LCD-CVS Archives

lcsim/src/org/lcsim/recon/pfa/identifier

CheatTrackClusterMatcher.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- CheatTrackClusterMatcher.java	16 Jan 2008 21:12:15 -0000	1.1
+++ CheatTrackClusterMatcher.java	8 Mar 2010 19:38:30 -0000	1.2
@@ -16,11 +16,16 @@

 import org.lcsim.util.swim.HelixSwimmer;
 import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
 import org.lcsim.geometry.Detector;

-import org.lcsim.recon.pfa.identifier.TrackClusterMatcher;

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

 
 public class CheatTrackClusterMatcher extends Driver implements TrackClusterMatcher
 {
     String m_mcListName;

+    protected CalorimeterInformation ci;
+    protected Subdetector emb;
+    protected Subdetector eme;

 
     public CheatTrackClusterMatcher(String mcList) {
 	m_mcListName = mcList;

@@ -105,13 +110,13 @@

 		CalorimeterHit innermostHitInECAL = findInnermostHitInECAL(hits);
 		if (innermostHitInECAL != null) {
 		    // There is an ECAL innermost hit...

-		    int layer = getLayer(innermostHitInECAL);

+		    int layer = getVLayer(innermostHitInECAL);

 		    // Check if in first two layers
 		    if (layer < 2) {
 			clustersWithHitsInFirstTwoLayers.add(clus);
 		    }
 		    // Check if is current innermost cluster

-		    if (clusterWithInnermostHitLayer == null || layer < getLayer(globalInnermostHitInECAL)) {

+		    if (clusterWithInnermostHitLayer == null || layer < getVLayer(globalInnermostHitInECAL)) {

 			globalInnermostHitInECAL = innermostHitInECAL;
 			clusterWithInnermostHitLayer = clus;
 		    }

@@ -120,12 +125,12 @@

 		    String printme = new String("DEBUG: Scanned a cluster with "+hits.size()+" hits: ");
 		    if (innermostHitInECAL != null) {
 			printme += " Has ECAL hit(s). Innermost hit in layer ";

-			printme += getLayer(innermostHitInECAL);
-			if (getLayer(innermostHitInECAL) < 2) {

+			printme += getVLayer(innermostHitInECAL);
+			if (getVLayer(innermostHitInECAL) < 2) {

 			    printme += " which is in first two layers";
 			}
 			if (clusterWithInnermostHitLayer == clus) {

-			    printme += " so this is the innermost cluster (global innermost hit layer="+getLayer(globalInnermostHitInECAL)+")";

+			    printme += " so this is the innermost cluster (global innermost hit layer="+getVLayer(globalInnermostHitInECAL)+")";

 			}
 		    } else {
 			printme += " No ECAL hits.";

@@ -198,14 +203,12 @@

 		for (Cluster clus : clustersWithHitsInFirstTwoLayers) {
 		    List<CalorimeterHit> hits = clustersWithContributions.get(clus);
 		    CalorimeterHit innermostHitInECAL = findInnermostHitInECAL(hits);

-		    if (m_debug) { System.out.println("DEBUG: Cluster with "+hits.size()+" / "+clus.getCalorimeterHits().size()+" hits matched, and first ECAL hit in layer "+getLayer(innermostHitInECAL)+" of "+innermostHitInECAL.getSubdetector().getName()); }
-		    CalorimeterHit nearestHitInClusterToInterceptPoint = null;

+		    if (m_debug) { System.out.println("DEBUG: Cluster with "+hits.size()+" / "+clus.getCalorimeterHits().size()+" hits matched, and first ECAL hit in layer "+getVLayer(innermostHitInECAL)+" of "+innermostHitInECAL.getSubdetector().getName()); }

 		    for (CalorimeterHit hit : hits) {

-			int layer = getLayer(hit);

+			int layer = getVLayer(hit);

 			if (layer==0 || layer==1) {

-			    org.lcsim.geometry.Subdetector subdet = hit.getSubdetector();
-			    String name = subdet.getName();
-			    if (name.compareTo("EMBarrel") == 0 || name.compareTo("EMEndcap") == 0) {

+			    Subdetector subdet = hit.getSubdetector();
+			    if (subdet == emb || subdet == eme) {

 				// EM -- OK
 				double distance = proximity(trackPoint, hit);
 				if (m_debug) { System.out.println("DEBUG:    Hit in ECAL layer "+layer+" distance from intercept point: "+distance); }

@@ -237,13 +240,12 @@

     protected CalorimeterHit findInnermostHitInECAL(List<CalorimeterHit> hits) {
 	CalorimeterHit innermostHit = null;
 	for (CalorimeterHit hit : hits) {

-	    int layer = getLayer(hit);
-	    org.lcsim.geometry.Subdetector subdet = hit.getSubdetector();

+	    int layer = getVLayer(hit);
+	    Subdetector subdet = hit.getSubdetector();

             if ( ! subdet.isCalorimeter() ) { throw new AssertionError("Cluster hit outside calorimeter"); }

-            String name = subdet.getName();
-            if (name.compareTo("EMBarrel") == 0 || name.compareTo("EMEndcap") == 0) {

+            if (subdet == emb || subdet == eme) {

                 // EM -- OK

-		if (innermostHit==null || getLayer(innermostHit)>layer) {

+		if (innermostHit==null || getVLayer(innermostHit)>layer) {

 		    innermostHit = hit;
 		}
 	    }

@@ -251,11 +253,11 @@

 	return innermostHit;
     }

-    protected int getLayer(CalorimeterHit hit) {

+    protected int getVLayer(CalorimeterHit hit) {

 	if (hit==null) { throw new AssertionError("hit is null"); }
 	org.lcsim.geometry.IDDecoder id = hit.getIDDecoder();
 	id.setID(hit.getCellID());

-	int layer = id.getLayer();

+	int layer = id.getVLayer();

 	return layer;
     }

@@ -352,26 +354,32 @@

 
     public void initGeometry(EventHeader event) 
     {

-	Detector det = event.getDetector();
-	CylindricalCalorimeter emb = ((CylindricalCalorimeter) det.getSubdetectors().get("EMBarrel"));
-	CylindricalCalorimeter eme = ((CylindricalCalorimeter) det.getSubdetectors().get("EMEndcap"));
-	m_ECAL_barrel_zmin = emb.getZMin();
-	m_ECAL_barrel_zmax = emb.getZMax();
-	m_ECAL_barrel_r = emb.getLayering().getDistanceToLayerSensorMid(0);
-	m_ECAL_endcap_z = eme.getLayering().getDistanceToLayerSensorMid(0);
-	m_ECAL_endcap_rmin = eme.getInnerRadius();
-	m_ECAL_endcap_rmax = eme.getOuterRadius();
-	double[] zero = {0, 0, 0};
-	m_fieldStrength = det.getFieldMap().getField(zero);
-	m_init = true;
-	if (m_debug) {
-	    System.out.println(this.getClass().getName()+": Init: ECAL barrel zmin="+m_ECAL_barrel_zmin);
-	    System.out.println(this.getClass().getName()+": Init: ECAL barrel zmax="+m_ECAL_barrel_zmax);
-	    System.out.println(this.getClass().getName()+": Init: ECAL barrel r="+m_ECAL_barrel_r);
-	    System.out.println(this.getClass().getName()+": Init: ECAL endcap z="+m_ECAL_endcap_z);
-	    System.out.println(this.getClass().getName()+": Init: ECAL endcap rmin="+m_ECAL_endcap_rmin);
-	    System.out.println(this.getClass().getName()+": Init: ECAL endcap rmax="+m_ECAL_endcap_rmax);
-	}

+        if(!m_init)
+        {
+            if(ci == null)
+            {
+                ci = CalorimeterInformation.instance();
+                emb = ci.getSubdetector(CalorimeterType.EM_BARREL);
+                eme = ci.getSubdetector(CalorimeterType.EM_ENDCAP);
+            }
+            m_ECAL_barrel_zmin = ci.getZMin(CalorimeterType.EM_BARREL);
+            m_ECAL_barrel_zmax = ci.getZMax(CalorimeterType.EM_BARREL);
+            m_ECAL_barrel_r = emb.getLayering().getDistanceToLayerSensorMid(0);
+            m_ECAL_endcap_z = eme.getLayering().getDistanceToLayerSensorMid(0);
+            m_ECAL_endcap_rmin = ci.getRMin(CalorimeterType.EM_ENDCAP);
+            m_ECAL_endcap_rmax = ci.getRMax(CalorimeterType.EM_ENDCAP);
+            double[] zero = {0, 0, 0};
+            m_fieldStrength = event.getDetector().getFieldMap().getField(zero);
+            m_init = true;
+            if (m_debug) {
+                System.out.println(this.getClass().getName()+": Init: ECAL barrel zmin="+m_ECAL_barrel_zmin);
+                System.out.println(this.getClass().getName()+": Init: ECAL barrel zmax="+m_ECAL_barrel_zmax);
+                System.out.println(this.getClass().getName()+": Init: ECAL barrel r="+m_ECAL_barrel_r);
+                System.out.println(this.getClass().getName()+": Init: ECAL endcap z="+m_ECAL_endcap_z);
+                System.out.println(this.getClass().getName()+": Init: ECAL endcap rmin="+m_ECAL_endcap_rmin);
+                System.out.println(this.getClass().getName()+": Init: ECAL endcap rmax="+m_ECAL_endcap_rmax);
+            }
+        }

     }
 
     public void setDebug(boolean debug) { m_debug = debug; }

Commit in `lcsim/src/org/lcsim/recon/pfa/identifier` on MAIN
`SmallPhotonMaker.java`	+20	-12	1.3 -> 1.4
`CheatTrackClusterMatcher.java`	+47	-39	1.1 -> 1.2
`HelixExtrapolator.java`	+8	-28	1.8 -> 1.9
`SimpleTrackMIPClusterMatcher.java`	+5	-11	1.3 -> 1.4
`SimpleTrackClusterMatcher.java`	+41	-32	1.5 -> 1.6
`LocalHelixExtrapolationTrackMIPClusterMatcher.java`	+1	-1	1.3 -> 1.4
`LocalHelixExtrapolationTrackClusterMatcher.java`	+6	-6	1.5 -> 1.6
	+128	-129