Merge branch 'master' into iss221

Author: JeremyMcCormick

recon/src/main/java/org/hps/recon/particle/ReconParticleDriver.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.hps.conditions.beam.BeamEnergy.BeamEnergyCollection;
 import org.hps.recon.ecal.cluster.ClusterUtilities;
 import org.hps.recon.tracking.CoordinateTransformations;
 import org.hps.recon.tracking.TrackUtils;
@@ -48,12 +49,18 @@ public abstract class ReconParticleDriver extends Driver {
     public static final int MOLLER_BOT = 1;
 
     // normalized cluster-track distance required for qualifying as a match:
-    private double MAXNSIGMAPOSITIONMATCH = 30.0;
+    private double MAXNSIGMAPOSITIONMATCH=15.0;
 
     HPSEcal3 ecal;
 
     protected boolean isMC = false;
     private boolean disablePID = false;
+   
+    public void setUseCorrectedClusterPositionsForMatching(boolean val){
+        useCorrectedClusterPositionsForMatching = val;
+    }
+    
+    boolean useCorrectedClusterPositionsForMatching = false;
 
     // ==============================================================
     // ==== Class Variables =========================================
@@ -355,6 +362,10 @@ protected void detectorChanged(Detector detector) {
 
         ecal = (HPSEcal3) detector.getSubdetector("Ecal");
         matcher.setBFieldMap(detector.getFieldMap());
+        BeamEnergyCollection beamEnergyCollection = 
+                this.getConditionsManager().getCachedConditions(BeamEnergyCollection.class, "beam_energies").getCachedData();        
+            
+        matcher.setBeamEnergy(beamEnergyCollection.get(0).getBeamEnergy()); 
 
     }
 
@@ -433,7 +444,17 @@ protected List<ReconstructedParticle> makeReconstructedParticles(List<Cluster> c
                 // try to find a matching cluster:
                 Cluster matchedCluster = null;
                 for (Cluster cluster : clusters) {
-
+                    
+                    //if the option to use corrected cluster positions is selected, then
+                    //create a copy of the current cluster, and apply corrections to it
+                    //before calculating nsigma.  Default is don't use corrections.  
+                    Cluster originalCluster = cluster;
+                    if(useCorrectedClusterPositionsForMatching){
+                        cluster = new BaseCluster(cluster);
+                        double ypos = TrackUtils.getTrackStateAtECal(particle.getTracks().get(0)).getReferencePoint()[2];
+                        ClusterUtilities.applyCorrections(ecal, cluster, ypos,isMC);
+                    }
+                    
                     // normalized distance between this cluster and track:
                     final double thisNSigma = matcher.getNSigmaPosition(cluster, particle);
 
@@ -447,7 +468,7 @@ protected List<ReconstructedParticle> makeReconstructedParticles(List<Cluster> c
 
                     // we found a new best cluster candidate for this track:
                     smallestNSigma = thisNSigma;
-                    matchedCluster = cluster;
+                    matchedCluster = originalCluster;
 
                     // prefer using GBL tracks to correct (later) the clusters, for some consistency:
                     if (track.getType() >= 32 || !clusterToTrack.containsKey(matchedCluster)) {
@@ -535,6 +556,14 @@ protected List<ReconstructedParticle> makeReconstructedParticles(List<Cluster> c
             }
             HepLorentzVector fourVector = new BasicHepLorentzVector(clusterEnergy, momentum);
             ((BaseReconstructedParticle) particle).set4Vector(fourVector);
+        
+            // recalculate track-cluster matching n_sigma using corrected cluster positions
+            // if that option is selected
+            if(!particle.getClusters().isEmpty() && useCorrectedClusterPositionsForMatching){
+                double goodnessPID_corrected = matcher.getNSigmaPosition(particle.getClusters().get(0), particle);
+                ((BaseReconstructedParticle) particle).setGoodnessOfPid(goodnessPID_corrected);
+            }
+            
         }
 
         // Return the list of reconstructed particles.
@@ -711,4 +740,9 @@ protected void startOfData() {
     protected void endOfData() {
         // matcher.saveHistograms();
     }
+
+    
+    public void setSnapToEdge(boolean val){
+        this.matcher.setSnapToEdge(val);
+    }
 }

recon/src/main/java/org/hps/recon/utils/SnapToEdge.java

@@ -0,0 +1,40 @@
+package org.hps.recon.utils;
+
+import java.util.List;
+
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.Cluster;
+
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+
+public class SnapToEdge {
+
+    public Hep3Vector snapToEdge(Hep3Vector tPos, Cluster c) {
+        List<CalorimeterHit> hits = c.getCalorimeterHits();
+        boolean upperEdgeCrystalsOnly = true;
+        boolean lowerEdgeCrystalsOnly = true;
+        for(CalorimeterHit hit : hits){
+            int ix = hit.getIdentifierFieldValue("ix");
+            int iy = hit.getIdentifierFieldValue("iy");
+            
+            if(!(iy == -1 || (iy == -2 && ix >= -10 && ix <= -2) || iy == 5)){
+                upperEdgeCrystalsOnly = false;
+            }
+            
+            if(!(iy == 1 || (iy == 2 && ix >= -10 && ix <= -2) || iy == -5)){
+                lowerEdgeCrystalsOnly = false;
+            }
+            
+            
+            if(!upperEdgeCrystalsOnly && !lowerEdgeCrystalsOnly)
+                break;
+        }
+        if(upperEdgeCrystalsOnly && tPos.y() >= c.getPosition()[1])
+            return new BasicHep3Vector(tPos.x(), c.getPosition()[1], tPos.z());
+        if(lowerEdgeCrystalsOnly && tPos.y() <= c.getPosition()[1])
+            return new BasicHep3Vector(tPos.x(), c.getPosition()[1], tPos.z());
+        else 
+            return tPos;
+    }
+}