hps-java/src/main/java/org/lcsim/hps/recon/tracking

HPSHelicalTrackHitDriver.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- HPSHelicalTrackHitDriver.java	28 Apr 2012 19:35:09 -0000	1.5
+++ HPSHelicalTrackHitDriver.java	13 May 2012 21:38:20 -0000	1.6
@@ -18,6 +18,7 @@

 
 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.ITransform3D;

+import org.lcsim.detector.tracker.silicon.SiTrackerModule;

 import org.lcsim.digisim.MyLCRelation;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.LCRelation;

@@ -30,6 +31,7 @@

 import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
 import org.lcsim.fit.helicaltrack.HitIdentifier;
 import org.lcsim.fit.helicaltrack.StereoHitMaker;

+import org.lcsim.geometry.Detector;

 import org.lcsim.geometry.subdetector.BarrelEndcapFlag;
 import org.lcsim.hps.event.HPSTransformations;
 import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;

@@ -41,25 +43,25 @@

 
 /**
  * Create the appropriate HelicalTrackHits for the specified TrackerHit

- * collections.  The resulting HelicalTrackHits encapsulate the information
- * needed to perform a helical track hit for either a segmented strip
- * detector, a pixel detector, or cross hits from a stereo detector.

+ * collections. The resulting HelicalTrackHits encapsulate the information
+ * needed to perform a helical track hit for either a segmented strip detector,
+ * a pixel detector, or cross hits from a stereo detector.

  *
  * This driver was developed for the Dark Forces silicon tracker, where

- * digitized hits are in either axial or stereo layers.  The pairs of layers
- * to be used in forming stereo hits can be specified using the setStereoPairs

+ * digitized hits are in either axial or stereo layers. The pairs of layers to
+ * be used in forming stereo hits can be specified using the setStereoPairs

  * method.
  *

- * The list of hit collections to be converted must be specified
- * before the process method is executed.

+ * The list of hit collections to be converted must be specified before the
+ * process method is executed.

  *
  * @author Richard Partridge
  * @version 1.0
  */
 public class HPSHelicalTrackHitDriver extends Driver {

 //    private StereoHitMaker _crosser = new StereoHitMaker(2., 10.);

-    private boolean _debug=false;

+
+    private boolean _debug = false;

     private StereoHitMaker _crosser = new StereoHitMaker(0.0, 10.);
     private HitIdentifier _ID = new HitIdentifier();
     private String _outname = "HelicalTrackHits";

@@ -72,15 +74,52 @@

     private SymmetricMatrix _covTrkSystem;
     private boolean _doTranformToTracking = false;
     private HPSTransformations _detToTrk;

+    String subdetectorName = "Tracker";

-    /** Creates a new instance of HelicalTrackHitDriver */

+    /**
+     * Creates a new instance of HelicalTrackHitDriver
+     */

     public HPSHelicalTrackHitDriver() {
 //        setDetToTrkMatrix();
         _detToTrk = new HPSTransformations();

+        _colnames.add("StripClusterer_SiTrackerHitStrip1D");
+        _crosser.setMaxSeparation(10.01);
+        _crosser.setTolerance(0.01); // user parameter?
+    }
+
+    public void setSubdetectorName(String subdetectorName) {
+        this.subdetectorName = subdetectorName;
+    }
+
+    public void detectorChanged(Detector detector) {
+        // Setup default stereo pairings, which should work for even number of
+        // modules.
+        List<SiTrackerModule> modules = detector.getSubdetector(subdetectorName).getDetectorElement().findDescendants(SiTrackerModule.class);
+        if (modules.size() == 0) {
+            throw new RuntimeException("No SiTrackerModules found in detector.");
+        }
+        int nmodules = modules.size();
+        if (nmodules % 2 != 0) {
+            throw new RuntimeException("Don't know how to do stereo pairing for odd number of modules.");
+        }
+        List<int[]> pairs = new ArrayList<int[]>();
+        for (int i = 1; i <= (nmodules / 2) - 1; i += 2) {
+            int[] pair = {i, i + 1};
+            if (_debug) {
+                System.out.println("Adding stereo pair: " + pair[0] + ", " + pair[1]);
+            }
+            pairs.add(pair);
+        }
+        for (int[] pair : pairs) {
+            setStereoPair(subdetectorName, pair[0], pair[1]);
+        }
+        setTransformToTracking(true);
+        setDebug(true);

     }
 
     /**
      * Create the HelicalTrackHits for the specified hit collections.

+     *

      * @param event EventHeader of the event to be processed
      */
     public void process(EventHeader event) {

@@ -100,9 +139,10 @@

             //  Create collections for strip hits by layer and hit cross references
             Map<String, List<HelicalTrackStrip>> striplistmap = new HashMap<String, List<HelicalTrackStrip>>();
             Map<HelicalTrackStrip, SiTrackerHitStrip1D> stripmap = new HashMap<HelicalTrackStrip, SiTrackerHitStrip1D>();

-            if(_debug)
-                System.out.println("HPSHelicalTrackHitDriver:  # of hits found = "+hitlist.size());
-

+            if (_debug) {
+                System.out.println("HPSHelicalTrackHitDriver:  # of hits found = " + hitlist.size());
+            }
+

             //  Loop over the SiTrackerHits in this collection
             for (SiTrackerHit hit : hitlist) {

@@ -119,7 +159,7 @@

 
                         //  Create a HelicalTrackStrip for this hit
                         HelicalTrackStrip strip = makeDigiStrip(h);

                         //  Get the list of strips for this layer - create a new list if one doesn't already exist
                         List<HelicalTrackStrip> lyrhits = striplistmap.get(id);
                         if (lyrhits == null) {

@@ -153,8 +193,9 @@

             //  Now create the stereo hits
             //  Create a list of stereo hits
             List<HelicalTrackCross> stereohits = new ArrayList<HelicalTrackCross>();

-            if(_debug)
-                System.out.println("Map size = "+striplistmap.size());

+            if (_debug) {
+                System.out.println("Map size = " + striplistmap.size());
+            }

             //  Loop over the stereo layer pairs
             for (String id1 : _stereomap.keySet()) {

@@ -164,9 +205,10 @@

                 //  Form the stereo hits and add them to our hit list
                 stereohits.addAll(_crosser.MakeHits(striplistmap.get(id1), striplistmap.get(id2)));
             }

-            
-             if(_debug)
-                System.out.println("Number of stereo hits = "+stereohits.size());

+
+            if (_debug) {
+                System.out.println("Number of stereo hits = " + stereohits.size());
+            }

 
             for (HelicalTrackCross htc : stereohits) {
                 double ypos = htc.x();

@@ -180,8 +222,9 @@

             //  Add the stereo hits to our list of HelicalTrackHits
             helhits.addAll(stereohits);
             //mg...6/24/11  add new set of helical track hits that are rotated to from jlab to tracking frame

-            if (_doTranformToTracking)

+            if (_doTranformToTracking) {

                 addRotatedHitsToEvent(event, stereohits);

+            }

             //add LCRelation for strip hits
             for (HelicalTrackCross cross : stereohits) {
                 for (HelicalTrackStrip strip : cross.getStrips()) {

@@ -200,39 +243,37 @@

 
         //  Put the HelicalTrackHits back into the event
         event.put(_outname, helhits, HelicalTrackHit.class, 0);

+        System.out.println("The HelicalTrackHit collection " + _outname + " has " + helhits.size() + " hits.");

         event.put(_hitrelname, hitrelations, LCRelation.class, 0);
         event.put(_mcrelname, mcrelations, LCRelation.class, 0);
     }

-    /**
-     * Name of the HelicalTrackHit collection to be put back in the event.
-     * @param outname Name to use for the HelicalTrackHit collection
-     */

     public void addCollection(String colname) {
         _colnames.add(colname);
     }

-    public void OutputCollection(String outname) {
-        _outname = outname;
-    }
-

+    /**
+     * Name of the HelicalTrackHit collection to be put back in the event.
+     *
+     * @param outname Name to use for the HelicalTrackHit collection
+     */

     public void setOutputCollectionName(String outname) {
         _outname = outname;
     }

-    public void HitRelationName(String hitrelname) {

+    public void setHitRelationName(String hitrelname) {

         _hitrelname = hitrelname;
     }

-    public void MCRelationName(String mcrelname) {

+    public void setMCRelationName(String mcrelname) {

         _mcrelname = mcrelname;
     }

-    public void setMaxSeperation(double maxsep) {

+    public void setStripMaxSeparation(double maxsep) {

         _crosser.setMaxSeparation(maxsep);
     }

-    public void setTolerance(double tolerance) {

+    public void setStripTolerance(double tolerance) {

         _crosser.setTolerance(tolerance);
     }

@@ -393,7 +434,7 @@

     private SymmetricMatrix getCovTrkSystem(SymmetricMatrix cov) {
         return _detToTrk.transformCovarianceToTracking(cov);
     }

     public void setDebug(boolean debug) {
         this._debug = debug;
     }

hps-java/src/main/java/org/lcsim/hps/monitoring/svt

SVTEventDisplay.java 1.4 -> 1.5

diff -u -r1.4 -r1.5
--- SVTEventDisplay.java	6 May 2012 08:57:38 -0000	1.4
+++ SVTEventDisplay.java	13 May 2012 21:38:20 -0000	1.5
@@ -1,24 +1,14 @@

 package org.lcsim.hps.monitoring.svt;
 
 import hep.aida.*;

-import hep.physics.vec.BasicHep3Vector;

 import hep.physics.vec.Hep3Vector;

-import hep.physics.vec.VecOp;
-import java.util.ArrayList;

 import java.util.List;
 import org.lcsim.detector.tracker.silicon.*;

-import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.EventHeader;

-import org.lcsim.event.RawCalorimeterHit;

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.fit.helicaltrack.HelicalTrackHit;
 import org.lcsim.geometry.Detector;

-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.hps.monitoring.Resettable;

 import org.lcsim.hps.recon.ecal.HPSEcalCluster;

-import org.lcsim.hps.recon.ecal.HPSEcalConditions;
-import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;

@@ -26,58 +16,39 @@

  *
  * @author mgraham
  */

-public class SVTEventDisplay extends Driver implements Resettable {

+public class SVTEventDisplay extends Driver {

-    private List<IPlotter> plotters = new ArrayList<IPlotter>();

     private AIDA aida = AIDA.defaultInstance();

-    private String rawTrackerHitCollectionName = "RawTrackerHitMaker_RawTrackerHits";
- private String helicalTrackHitCollectionName = "HelicalTrackHits";

+    private String helicalTrackHitCollectionName = "HelicalTrackHits";

     //    String eCalClusterCollectionName = "EcalClusters";

-    private String trackerName = "Tracker";

     private int eventCount;

-    private Detector detector = null;

     private IPlotter plotter;

-    private List<SiSensor> sensors;

 //    private ICloud2D cl2D;
     private IHistogram2D svtDispZX;
     private IHistogram2D svtDispZY;

-    int integralWindow = 0;
-    IDDecoder dec;

     String ecalSubdetectorName = "Ecal";
     String ecalCollectionName = "EcalClusters";
     double zEcal = 130;
 
     protected void detectorChanged(Detector detector) {

-        this.detector = detector;

         aida.tree().cd("/");

-
-        sensors = detector.getSubdetector(trackerName).getDetectorElement().findDescendants(SiSensor.class);
-

         if (detector.getSubdetector(ecalSubdetectorName) == null) {
             throw new RuntimeException("There is no subdetector called " + ecalSubdetectorName + " in this detector");
         }

-        // Cache the IDDecoder for the ECal.		
-        dec = detector.getSubdetector(ecalSubdetectorName).getReadout().getIDDecoder();
-
-

         IAnalysisFactory fac = aida.analysisFactory();

-
-

         plotter = fac.createPlotterFactory().create("HPS SVT Event Display");

-        plotters.add(plotter);

         IPlotterStyle style = plotter.style();
         style.statisticsBoxStyle().setVisible(false);
         style.setParameter("hist2DStyle", "colorMap");
         style.dataStyle().fillStyle().setParameter("colorMapScheme", "rainbow");

-
-        //        style.dataStyle().fillStyle().

+//        style.zAxisStyle().setParameter("scale", "log");

 
         plotter.createRegions(1, 2);
         svtDispZY = aida.histogram2D("SVT Raw Hits:  z vs y", 50, 0, 140, 50, -10, 10);

-        svtDispZX = aida.histogram2D("SVT Raw Hits:  z vs x", 50, 0, 140, 100, -30, 30);

+        svtDispZX = aida.histogram2D("SVT Raw Hits:  z vs x", 50, 0, 140, 100, -35, 35);

 //        cl2D = aida.cloud2D("SVT Raw Hits:  z vs y");
 
         plotter.region(0).plot(svtDispZY);

@@ -89,18 +60,14 @@

 //    public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
 //        this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
 //    }

-
-      public void setHelicalTrackHitCollectionName(String helicalTrackHitCollectionName) {

+    public void setHelicalTrackHitCollectionName(String helicalTrackHitCollectionName) {

         this.helicalTrackHitCollectionName = helicalTrackHitCollectionName;
     }

     public void process(EventHeader event) {
 //        if (event.hasCollection(RawTrackerHit.class, rawTrackerHitCollectionName)) {
         if (event.hasCollection(HelicalTrackHit.class, helicalTrackHitCollectionName)) {
             ++eventCount;

-            if (!HPSSVTCalibrationConstants.calibrationLoaded()) {
-                HPSSVTCalibrationConstants.loadCalibrationConstants();
-            }

 
 //            aida.histogram2D("SVT Raw Hits:  z vs y").reset();

@@ -110,18 +77,19 @@

             for (HelicalTrackHit hrth : rawHits) {
                 fillPlots(hrth);
             }

-            
-              List<HPSEcalCluster> clusters = event.get(HPSEcalCluster.class, ecalCollectionName);
- //             System.out.println("Number of ECAL clusters="+clusters.size());
-              for (HPSEcalCluster cluster : clusters) {
-                    dec.setID(cluster.getSeedHit().getCellID());
-                    CalorimeterHit seedHit = cluster.getSeedHit();

+
+            List<HPSEcalCluster> clusters = event.get(HPSEcalCluster.class, ecalCollectionName);
+            //             System.out.println("Number of ECAL clusters="+clusters.size());
+            for (HPSEcalCluster cluster : clusters) {
+//                dec.setID(cluster.getSeedHit().getCellID());
+//                CalorimeterHit seedHit = cluster.getSeedHit();

 //                    System.out.println("z = "+seedHit.getPosition()[2]+" y = "+seedHit.getPosition()[1]);

-//                    if(cluster.getEnergy()/10>500)
-                        svtDispZY.fill(zEcal, seedHit.getPosition()[1]/10, cluster.getEnergy()/10);
-                        svtDispZY.fill(zEcal, seedHit.getPosition()[0]/10, cluster.getEnergy()/10);

+                if (cluster.getEnergy() > 0) {
+                    svtDispZY.fill(zEcal, cluster.getPosition()[1] / 10, cluster.getEnergy());
+                    svtDispZX.fill(zEcal, cluster.getPosition()[0] / 10, cluster.getEnergy());

-        }else{

+            }
+        } else {

             System.out.println("SVTEventDisplay:  Event has no HelicalTrackHits");
         }
     }

@@ -139,7 +107,7 @@

 //        double ped = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
 //        double noise = HPSSVTCalibrationConstants.getNoise(sensor, strip);

 //        aida.cloud2D("SVT Raw Hits:  z vs y").fill(position.z() / 10.0, position.y() / 10.0);
 //        aida.histogram2D("SVT Raw Hits:  z vs y").fill(position.z()/10.0,position.y()/10.0);
 //        aida.histogram2D("SVT Raw Hits:  z vs y").fill(position.z()/10.0,position.y()/10.0);

@@ -149,18 +117,18 @@

 //                maxAdc = adcVal[i] - ped;
 //        }
 //        if(noise<70){

- //       if (noise < 70 && !mask(position)) {

+        //       if (noise < 70 && !mask(position)) {

 //                  System.out.println(sensor.getName()+" strip # "+strip+"   "+position.z()+"   " + position.y());
 //            svtDisp.fill(position.z()/10.0,position.y()/10.0);
 //            svtDispZY.fill(position.z() / 10.0, position.y() / 10.0, maxAdc);
 //            svtDispZX.fill(position.z() / 10.0, position.x() / 10.0, maxAdc);

-            
- //           svtDispZY.fill(position.z() / 10.0, position.y() / 10.0, 1000.0);
- //           svtDispZX.fill(position.z() / 10.0, position.x() / 10.0, 1000.0);
- //       }
-            svtDispZY.fill(hit.z() / 10.0, hit.y() / 10.0, 1000.0);
-            svtDispZX.fill(hit.z() / 10.0, hit.x() / 10.0, 1000.0);
-

+
+        //           svtDispZY.fill(position.z() / 10.0, position.y() / 10.0, 1000.0);
+        //           svtDispZX.fill(position.z() / 10.0, position.x() / 10.0, 1000.0);
+        //       }
+        svtDispZY.fill(hit.z() / 10.0, hit.y() / 10.0, 1000.0);
+        svtDispZX.fill(hit.z() / 10.0, hit.x() / 10.0, 1000.0);
+

     }
 
     private Hep3Vector getGlobalHitPosition(RawTrackerHit hit, SiSensorElectrodes electrodes) {

@@ -173,18 +141,15 @@

         double y = pos.y();
         double z = pos.z();

-        if (z > 300 && z < 320)
-            if (y > -50 && y < -20)

+        if (z > 300 && z < 320) {
+            if (y > -50 && y < -20) {

                 return true;

+            }
+        }

 
         return false;
     }

-    @Override
-    public void reset() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-

     public void setEcalCollectionName(String ecalCollectionName) {
         this.ecalCollectionName = ecalCollectionName;
     }

Commit in `hps-java/src/main` on MAIN
`java/org/lcsim/hps/recon/tracking/HPSHelicalTrackHitDriver.java`	+74	-33	1.5 -> 1.6
`/HPSSVTCalibrationConstants.java`	+1	-1	1.8 -> 1.9
`/SVTRawTrackerHitThresholdDriver.java`		-3	1.1 -> 1.2
`/MultiTrackReco.java`	+10	-10	1.1 -> 1.2
`/TrackerReconDriver.java`	+27	-78	1.18 -> 1.19
`java/org/lcsim/hps/monitoring/svt/SVTEventDisplay.java`	+30	-65	1.4 -> 1.5
`/SensorOccupancyPlotsDriver.java`	+5	-6	1.2 -> 1.3
`/SVTHitRecoCorrelations.java`		-3	1.2 -> 1.3
`/SVTSimpleEventDisplay.java`	+1	-1	1.1 -> 1.2
`/SVTHitPulsePlots.java`	+9	-13	1.12 -> 1.13
`java/org/lcsim/hps/users/mgraham/alignment/HeavyPhotonLLDriver.java`	+7	-7	1.2 -> 1.3
`java/org/lcsim/hps/monitoring/HPSCalibrationListener.java`	+1	-2	1.1 -> 1.2
`resources/org/lcsim/hps/steering/TestRunEventDisplay.lcsim`	+14	-3	1.3 -> 1.4
`java/org/lcsim/hps/users/mgraham/jlabrotation/HeavyPhotonLLDriver.java`	+7	-7	1.1 -> 1.2
	+186	-232