Merging Kalman Filter for pattern recognition - iss204

analysis/src/main/java/org/hps/analysis/tuple/TupleMaker.java

@@ -169,8 +169,6 @@ protected void detectorChanged(Detector detector) {
         bfield = TrackUtils.getBField(detector).magnitude();
         bFieldMap = detector.getFieldMap();
 
-        bFieldMap = detector.getFieldMap();
-
         if (Double.isNaN(ebeam)) {
             try {
                 BeamEnergy.BeamEnergyCollection beamEnergyCollection = this.getConditionsManager()

steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015NewGBLOut.lcsim

@@ -1,72 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <!-- 
-      @brief Steering file that will be used for pass 2 reconstruction of 
-             the 2015 Engineering Run data. 
-      @author <a href="mailto:meeg@slac.stanford.edu">Sho Uemura</a>
-      @author <a href="mailto:omoreno1@ucsc.edu">Omar Moreno</a>
-      This file is copied fromo "EngineeringRun2015FullRecon.lcsim", and only GBLOutputDriver is added.
-      This will produce GBL asci files, that Alessandra and Mariangela can check the alignment.
-    -->
-    <execute>
-        <driver name="RawTrackerHitSensorSetup"/>
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver"/>
-        <driver name="HelicalTrackHitDriver"/>
-        <driver name="TrackReconSeed345Conf2Extd16"/>       
-        <driver name="MergeTrackCollections"/>
-        <driver name="GBLRefitterDriver" />
-        <driver name="TrackDataDriver" />
-        <driver name="GBLOutputDriver"/>
-        <driver name="LCIOWriter"/>
-        <driver name="CleanupDriver"/>
-    </execute>    
-    <drivers>    
-        
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
-            <readoutCollections>SVTRawTrackerHits</readoutCollections>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Pileup</fitAlgorithm>
-            <useTimestamps>false</useTimestamps>
-            <correctTimeOffset>true</correctTimeOffset>
-            <correctT0Shift>true</correctT0Shift>
-            <useTruthTime>false</useTruthTime>
-            <subtractTOF>true</subtractTOF>
-            <subtractTriggerTime>true</subtractTriggerTime>
-            <correctChanT0>true</correctChanT0>
-            <debug>false</debug>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
-            <neighborDeltaT>8.0</neighborDeltaT>
-        </driver>
-        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <clusterTimeCut>12.0</clusterTimeCut>
-            <maxDt>16.0</maxDt>
-            <clusterAmplitudeCut>400.0</clusterAmplitudeCut>
-        </driver>
-        <!-- SVT Track finding -->
-        <driver name="TrackReconSeed345Conf2Extd16" type="org.hps.recon.tracking.TrackerReconDriver">
-            <trackCollectionName>Tracks_s345_c2_e16</trackCollectionName>
-            <strategyResource>HPS_s345_c2_e16.xml</strategyResource>
-            <debug>false</debug>
-            <rmsTimeCut>8.0</rmsTimeCut>
-        </driver>                
-        <driver name="MergeTrackCollections" type="org.hps.recon.tracking.MergeTrackCollections" />
-        <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
-        <driver name="GBLRefitterDriver" type="org.hps.recon.tracking.gbl.GBLRefitterDriver">
-		<storeTrackStates>true</storeTrackStates>
-		<writeMilleBinary>true</writeMilleBinary>
-		<milleBinaryFileName>millepedeData.bin</milleBinaryFileName>
-        </driver>                
+  <!-- 
+       @brief Steering file that will be used for pass 2 reconstruction of 
+       the 2015 Engineering Run data. 
+       @author <a href="mailto:meeg@slac.stanford.edu">Sho Uemura</a>
+       @author <a href="mailto:omoreno1@ucsc.edu">Omar Moreno</a>
+       This file is copied fromo "EngineeringRun2015FullRecon.lcsim", and only GBLOutputDriver is added.
+       This will produce GBL asci files, that Alessandra and Mariangela can check the alignment.
+  -->
+  <execute>
+    <driver name="RawTrackerHitSensorSetup"/>
+    <driver name="RawTrackerHitFitterDriver" />
+    <driver name="TrackerHitDriver"/>
+    <driver name="HelicalTrackHitDriver"/>
+    <driver name="TrackReconSeed345Conf2Extd16"/>       
+    <driver name="MergeTrackCollections"/>
+    <driver name="GBLRefitterDriver" />
+    <driver name="TrackDataDriver" />
+    <driver name="GBLOutputDriver"/>
+    <driver name="LCIOWriter"/>
+    <driver name="CleanupDriver"/>
+  </execute>    
+  <drivers>    
+
+    <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
+      <readoutCollections>SVTRawTrackerHits</readoutCollections>
+    </driver>
+    <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+      <fitAlgorithm>Pileup</fitAlgorithm>
+      <useTimestamps>false</useTimestamps>
+      <correctTimeOffset>true</correctTimeOffset>
+      <correctT0Shift>true</correctT0Shift>
+      <useTruthTime>false</useTruthTime>
+      <subtractTOF>true</subtractTOF>
+      <subtractTriggerTime>true</subtractTriggerTime>
+      <correctChanT0>true</correctChanT0>
+      <debug>false</debug>
+    </driver>
+    <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
+      <neighborDeltaT>8.0</neighborDeltaT>
+    </driver>
+    <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+      <debug>false</debug>
+      <clusterTimeCut>12.0</clusterTimeCut>
+      <maxDt>16.0</maxDt>
+      <clusterAmplitudeCut>400.0</clusterAmplitudeCut>
+    </driver>
+    <!-- SVT Track finding -->
+    <driver name="TrackReconSeed345Conf2Extd16" type="org.hps.recon.tracking.TrackerReconDriver">
+      <trackCollectionName>Tracks_s345_c2_e16</trackCollectionName>
+      <strategyResource>HPS_s345_c2_e16.xml</strategyResource>
+      <debug>false</debug>
+      <rmsTimeCut>8.0</rmsTimeCut>
+    </driver>                
+    <driver name="MergeTrackCollections" type="org.hps.recon.tracking.MergeTrackCollections" />
+    <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
+    <driver name="GBLRefitterDriver" type="org.hps.recon.tracking.gbl.GBLRefitterDriver">
+	  <storeTrackStates>true</storeTrackStates>
+	  <writeMilleBinary>true</writeMilleBinary>
+	  <milleBinaryFileName>millepedeData.bin</milleBinaryFileName>
+    </driver>                
 	<driver name="GBLOutputDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver" />
-        <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>${outputFile}.slcio</outputFilePath>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
-            <outputFileName>${outputFile}.root</outputFileName>
-        </driver>       
-    </drivers>
+
+    <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
+      <outputFilePath>${outputFile}.slcio</outputFilePath>
+    </driver>
+    <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+    <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+      <outputFileName>${outputFile}.root</outputFileName>
+    </driver>       
+  </drivers>
 </lcsim>

steering-files/src/main/resources/org/hps/steering/recon/KalmanPatRecTest.lcsim

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <!-- 
+      @brief Steering file that will be used for pass 2 reconstruction of the 2015 Engineering Run data. 
+      @author <a href="mailto:meeg@slac.stanford.edu">Sho Uemura</a>
+      @author <a href="mailto:omoreno1@ucsc.edu">Omar Moreno</a>
+    -->
+    <execute>
+        <driver name="RawTrackerHitSensorSetup"/>
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver"/>
+        <driver name="KalmanPatRecDriver"/>
+        <driver name="CleanupDriver"/>
+    </execute>    
+    <drivers>    
+
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
+            <readoutCollections>SVTRawTrackerHits</readoutCollections>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Pileup</fitAlgorithm>
+            <useTimestamps>false</useTimestamps>
+            <correctTimeOffset>true</correctTimeOffset>
+            <correctT0Shift>true</correctT0Shift>
+            <useTruthTime>false</useTruthTime>
+            <subtractTOF>true</subtractTOF>
+            <subtractTriggerTime>true</subtractTriggerTime>
+            <correctChanT0>true</correctChanT0>
+            <debug>false</debug>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
+            <neighborDeltaT>8.0</neighborDeltaT>
+        </driver>
+        <driver name="KalmanPatRecDriver" type="org.hps.recon.tracking.kalman.KalmanPatRecDriver">
+        </driver>
+
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+
+    </drivers>
+</lcsim>

steering-files/src/main/resources/org/hps/steering/recon/KalmanTest.lcsim

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <!-- 
+      @brief Steering file that will be used for pass 2 reconstruction of 
+             the 2015 Engineering Run data. 
+      @author <a href="mailto:meeg@slac.stanford.edu">Sho Uemura</a>
+      @author <a href="mailto:omoreno1@ucsc.edu">Omar Moreno</a>
+    -->
+    <execute>
+        <driver name="RawTrackerHitSensorSetup"/>
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver"/>
+        <driver name="KalmanDriverHPS"/>
+        <driver name="CleanupDriver"/>
+    </execute>    
+    <drivers>    
+
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
+            <readoutCollections>SVTRawTrackerHits</readoutCollections>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Pileup</fitAlgorithm>
+            <useTimestamps>false</useTimestamps>
+            <correctTimeOffset>true</correctTimeOffset>
+            <correctT0Shift>true</correctT0Shift>
+            <useTruthTime>false</useTruthTime>
+            <subtractTOF>true</subtractTOF>
+            <subtractTriggerTime>true</subtractTriggerTime>
+            <correctChanT0>true</correctChanT0>
+            <debug>false</debug>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
+            <neighborDeltaT>8.0</neighborDeltaT>
+        </driver>
+        <driver name="KalmanDriverHPS" type="org.hps.recon.tracking.kalman.KalmanDriverHPS">
+            <outputSeedTrackCollectionName>KalmanSeedTracks</outputSeedTrackCollectionName>
+        </driver>
+
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+
+    </drivers>
+</lcsim>

steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC.lcsim

@@ -15,8 +15,8 @@
         <!--<driver name="EcalRunningPedestal"/>-->
         <driver name="EcalRawConverter" />
         <driver name="HitTimeSmear"/>
-        <driver name="ReconClusterer" />
-        <driver name="CopyCluster" />
+        <!--<driver name="ReconClusterer" />-->
+        <!--driver name="CopyCluster" />-->
         <!-- SVT reconstruction drivers -->
         <driver name="RawTrackerHitSensorSetup"/>
         <driver name="RawTrackerHitFitterDriver" />

tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java

@@ -1390,7 +1390,7 @@ public static List<TrackerHit> sortHits(Collection<TrackerHit> hits) {
         return hitList;
     }
 
-    private static class LayerComparator implements Comparator<TrackerHit> {
+    public static class LayerComparator implements Comparator<TrackerHit> {
 
         @Override
         public int compare(TrackerHit o1, TrackerHit o2) {

tracking/src/main/java/org/hps/recon/tracking/TrackingReconstructionPlots.java

@@ -216,7 +216,7 @@ private void doBasicTracks(List<Track> tracks) {
         int ntracksBot = 0;
         double momentum_param = 2.99792458e-04;
 
-        aida.histogram1D("Tracks per Event", 3, 0, 3).fill(tracks.size());
+        aida.histogram1D("Tracks per Event").fill(tracks.size());
 
         for (Track trk : tracks) {
 
@@ -225,6 +225,10 @@ private void doBasicTracks(List<Track> tracks) {
                 isTop = true;
             }
 
+            Track trackShared = TrackUtils.mostSharedHitTrack(trk, tracks);
+            int maxShared = TrackUtils.numberOfSharedHits(trk, trackShared);
+            aida.histogram1D("Shared Hits on Track").fill(maxShared);
+
             double pt = Math.abs((1 / trk.getTrackStates().get(0).getOmega()) * bfield * momentum_param);
             double pz = pt * Math.cos(trk.getTrackStates().get(0).getPhi());
             double px = pt * Math.sin(trk.getTrackStates().get(0).getPhi());
@@ -458,7 +462,6 @@ public void process(EventHeader event) {
 
         if (!event.hasCollection(Track.class, trackCollectionName)) {
             System.out.println(trackCollectionName + " does not exist; skipping event");
-            aida.histogram1D("Number Tracks/Event").fill(0);
             return;
         }
         List<Track> tracks = event.get(Track.class, trackCollectionName);
@@ -631,6 +634,8 @@ private void setupPlots() {
         IHistogram1D trkPz = aida.histogram1D("Track Momentum (Pz)", 100, 0, 1.5);
         IHistogram1D trkChi2 = aida.histogram1D("Track Chi2", 25, 0, 25.0);
 
+        aida.histogram1D("Shared Hits on Track", 7, 0, 7);
+
         IHistogram1D toptrkPx = aida.histogram1D("Top Track Momentum (Px)", 100, -0.15, 0.15);
         IHistogram1D toptrkPy = aida.histogram1D("Top Track Momentum (Py)", 100, -0.15, 0.15);
         IHistogram1D toptrkPz = aida.histogram1D("Top Track Momentum (Pz)", 100, 0, 1.5);