<driver name="HitTimeDriver" type="org.lcsim.hps.users.mgraham.HitTimePlotter" />  <driver name="HelicalTrackHitDriver"

hps-java/src/main/java/org/lcsim/hps/users/mgraham

DataTrackerHitDriver.java removed after 1.7

diff -N DataTrackerHitDriver.java
--- DataTrackerHitDriver.java	29 Sep 2012 00:23:12 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,230 +0,0 @@

-package org.lcsim.hps.users.mgraham;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.detector.tracker.silicon.SiTrackerModule;
-import org.lcsim.event.EventHeader;
-import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.tracking.*;
-import org.lcsim.recon.tracking.digitization.sisim.*;
-import org.lcsim.util.Driver;
-import org.lcsim.util.lcio.LCIOUtil;
-
-/**
- *
- * @author mgraham
- */
-public class DataTrackerHitDriver extends Driver {
-    // Debug switch for development.
-
-    private boolean debug = false;
-    // Collection name.
-//    private String readoutCollectionName = "TrackerHits";
-    // Subdetector name.
-    private String subdetectorName = "Tracker";
-    // Name of RawTrackerHit output collection.
-//    private String rawTrackerHitOutputCollectionName = "RawTrackerHitMaker_RawTrackerHits";
-    // Name of StripHit1D output collection.
-    private String stripHitOutputCollectionName = "StripClusterer_SiTrackerHitStrip1D";
-    // Clustering parameters.
-    private double clusterSeedThreshold = 4.0;
-    private double clusterNeighborThreshold = 3.0;
-    private double clusterThreshold = 4.0;
-    private int clusterMaxSize = 10;
-    private int clusterCentralStripAveragingThreshold = 4;
-    // Clustering errors by number of TrackerHits.
-    private static final double clusterErrorMultiplier = 1.0;
-    private double oneClusterErr = clusterErrorMultiplier / Math.sqrt(12.);
-    private double twoClusterErr = clusterErrorMultiplier / 5.0;
-    private double threeClusterErr = clusterErrorMultiplier / 3.0;
-    private double fourClusterErr = clusterErrorMultiplier / 2.0;
-    private double fiveClusterErr = clusterErrorMultiplier / 1.0;
-    // Various data lists required by digitization.
-    private List<String> processPaths = new ArrayList<String>();
-    private List<IDetectorElement> processDEs = new ArrayList<IDetectorElement>();
-    private Set<SiSensor> processSensors = new HashSet<SiSensor>();
-    private Set<SiTrackerModule> processModules = new HashSet<SiTrackerModule>();
-    // Digi class objects.
-//    private SiDigitizer stripDigitizer;
-//    private HPSFittedRawTrackerHitMaker hitMaker;
-    private HPSStripMaker stripClusterer;
-    //  private    DumbShaperFit shaperFit;
-    int[][] counts = new int[2][10];
-
-    public void setDebug(boolean debug) {
-        this.debug = debug;
-    }
-
-//    public void setReadoutCollectionName(String readoutCollectionName) {
-//        this.readoutCollectionName = readoutCollectionName;
-//    }
-    public void setSubdetectorName(String subdetectorName) {
-        this.subdetectorName = subdetectorName;
-    }
-
-    public void setStripHitOutputCollectionName(String stripHitOutputCollectionName) {
-        this.stripHitOutputCollectionName = stripHitOutputCollectionName;
-    }
-
-    public void setClusterSeedThreshold(double clusterSeedThreshold) {
-        this.clusterSeedThreshold = clusterSeedThreshold;
-    }
-
-    public void setClusterNeighborThreshold(double clusterNeighborThreshold) {
-        this.clusterNeighborThreshold = clusterNeighborThreshold;
-    }
-
-    public void setClusterThreshold(double clusterThreshold) {
-        this.clusterThreshold = clusterThreshold;
-    }
-
-    public void setClusterMaxSize(int clusterMaxSize) {
-        this.clusterMaxSize = clusterMaxSize;
-    }
-
-    public void setClusterCentralStripAveragingThreshold(int clusterCentralStripAveragingThreshold) {
-        this.clusterCentralStripAveragingThreshold = clusterCentralStripAveragingThreshold;
-    }
-
-    public void setOneClusterErr(double oneClusterErr) {
-        this.oneClusterErr = oneClusterErr;
-    }
-
-    public void setTwoClusterErr(double twoClusterErr) {
-        this.twoClusterErr = twoClusterErr;
-    }
-
-    public void setThreeClusterErr(double threeClusterErr) {
-        this.threeClusterErr = threeClusterErr;
-    }
-
-    public void setFourClusterErr(double fourClusterErr) {
-        this.fourClusterErr = fourClusterErr;
-    }
-
-    public void setFiveClusterErr(double fiveClusterErr) {
-        this.fiveClusterErr = fiveClusterErr;
-    }
-
-    /**
-     * Creates a new instance of TrackerHitDriver.
-     */
-    public DataTrackerHitDriver() {
-    }
-
-    /**
-     * Do initialization once we get a Detector.
-     */
-    @Override
-    public void detectorChanged(Detector detector) {
-
-        // Call sub-Driver's detectorChanged methods.
-        super.detectorChanged(detector);
-
-        // Process detectors specified by path, otherwise process entire
-        // detector
-        IDetectorElement deDetector = detector.getDetectorElement();
-
-        for (String path : processPaths) {
-            processDEs.add(deDetector.findDetectorElement(path));
-        }
-
-        if (processDEs.isEmpty()) {
-            processDEs.add(deDetector);
-        }
-
-        for (IDetectorElement detectorElement : processDEs) {
-            processSensors.addAll(detectorElement.findDescendants(SiSensor.class));
-            //if (debug)
-            //    System.out.println("added " + processSensors.size() + " sensors");
-            processModules.addAll(detectorElement.findDescendants(SiTrackerModule.class));
-            //if (debug)
-            //    System.out.println("added " + processModules.size() + " modules");
-        }
-
-        // Create the sensor simulation.
-        CDFSiSensorSim stripSim = new CDFSiSensorSim();
-
-
-        // Create Strip clustering algorithm.
-        HPSNearestNeighborRMS stripClusteringAlgo = new HPSNearestNeighborRMS();
-        stripClusteringAlgo.setSeedThreshold(clusterSeedThreshold);
-        stripClusteringAlgo.setNeighborThreshold(clusterNeighborThreshold);
-        stripClusteringAlgo.setClusterThreshold(clusterThreshold);
-
-//         hitMaker=new HPSFittedRawTrackerHitMaker(shaperFit);    
-        // Create the clusterers and set hit-making parameters.
-        stripClusterer = new HPSStripMaker(stripSim,stripClusteringAlgo);
-
-        stripClusterer.setMaxClusterSize(clusterMaxSize);
-        stripClusterer.setCentralStripAveragingThreshold(clusterCentralStripAveragingThreshold);
-
-        // Set the cluster errors.
-        stripClusterer.SetOneClusterErr(oneClusterErr);
-        stripClusterer.SetTwoClusterErr(twoClusterErr);
-        stripClusterer.SetThreeClusterErr(threeClusterErr);
-        stripClusterer.SetFourClusterErr(fourClusterErr);
-        stripClusterer.SetFiveClusterErr(fiveClusterErr);
-
-        // Set the detector to process.
-        processPaths.add(subdetectorName);
-    }
-
-    /**
-     * Perform the digitization.
-     */
-    @Override
-    public void process(EventHeader event) {
-        // Call sub-Driver processing.
-//        super.process(event);
-
-        // Make new lists for output.
-//        List<HPSFittedRawTrackerHit> rawHits = new ArrayList<HPSFittedRawTrackerHit>();
-        List<SiTrackerHit> stripHits1D = new ArrayList<SiTrackerHit>();
-
-//        // Make HPS hits.
-//        for (SiSensor sensor : processSensors) {            
-//            rawHits.addAll(hitMaker.makeHits(sensor));
-//        }
-
-        // Make strip hits.
-        for (SiSensor sensor : processSensors) {
-            stripHits1D.addAll(stripClusterer.makeHits(sensor));
-        }
-
-        // Debug prints.
-        if (debug) {
-//            List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, this.readoutCollectionName);
-//            System.out.println("SimTrackerHit collection " + this.readoutCollectionName + " has " + simHits.size() + " hits.");
-//            System.out.println("RawTrackerHit collection " + this.rawTrackerHitOutputCollectionName + " has " + rawHits.size() + " hits.");
-            System.out.println("TrackerHit collection " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits.");
-        }
-
-        // Put output hits into collection.
-        int flag = LCIOUtil.bitSet(0, 31, true); // Turn on 64-bit cell ID.
-//        event.put(this.rawTrackerHitOutputCollectionName, rawHits, RawTrackerHit.class, flag, toString());
-        event.put(this.stripHitOutputCollectionName, stripHits1D, SiTrackerHitStrip1D.class, 0, toString());
-        if (debug) {
-            for (int mod = 0; mod < 2; mod++) {
-                for (int layer = 0; layer < 10; layer++) {
-                    counts[mod][layer] += SvtUtils.getInstance().getSensor(mod, layer).getReadout().getHits(SiTrackerHit.class).size();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void endOfData() {
-        if (debug) {
-            for (int mod = 0; mod < 2; mod++) {
-                for (int layer = 0; layer < 10; layer++) {
-                    System.out.format("mod %d, layer %d, count %d\n", mod, layer, counts[mod][layer]);
-                }
-            }
-        }
-    }
-}

+package org.lcsim.hps.recon.tracking; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.lcsim.detector.IDetectorElement; +import org.lcsim.detector.tracker.silicon.SiSensor; +import org.lcsim.detector.tracker.silicon.SiTrackerModule; +import org.lcsim.event.EventHeader; +import org.lcsim.geometry.Detector; +import org.lcsim.hps.recon.tracking.*; +import org.lcsim.recon.tracking.digitization.sisim.*; +import org.lcsim.util.Driver; +import org.lcsim.util.lcio.LCIOUtil; + +/** + * + * @author mgraham + */ +public class DataTrackerHitDriver extends Driver { + // Debug switch for development. + + private boolean debug = false; + // Collection name. +// private String readoutCollectionName = "TrackerHits"; + // Subdetector name. + private String subdetectorName = "Tracker"; + // Name of RawTrackerHit output collection. +// private String rawTrackerHitOutputCollectionName = "RawTrackerHitMaker_RawTrackerHits"; + // Name of StripHit1D output collection. + private String stripHitOutputCollectionName = "StripClusterer_SiTrackerHitStrip1D"; + // Clustering parameters. + private double clusterSeedThreshold = 4.0; + private double clusterNeighborThreshold = 3.0; + private double clusterThreshold = 4.0; + private int clusterMaxSize = 10; + private int clusterCentralStripAveragingThreshold = 4; + // Clustering errors by number of TrackerHits. + private static final double clusterErrorMultiplier = 1.0; + private double oneClusterErr = clusterErrorMultiplier / Math.sqrt(12.); + private double twoClusterErr = clusterErrorMultiplier / 5.0; + private double threeClusterErr = clusterErrorMultiplier / 3.0; + private double fourClusterErr = clusterErrorMultiplier / 2.0; + private double fiveClusterErr = clusterErrorMultiplier / 1.0; + // Various data lists required by digitization. + private List<String> processPaths = new ArrayList<String>(); + private List<IDetectorElement> processDEs = new ArrayList<IDetectorElement>(); + private Set<SiSensor> processSensors = new HashSet<SiSensor>(); + private Set<SiTrackerModule> processModules = new HashSet<SiTrackerModule>(); + // Digi class objects. +// private SiDigitizer stripDigitizer; +// private HPSFittedRawTrackerHitMaker hitMaker; + private HPSStripMaker stripClusterer; + // private DumbShaperFit shaperFit; + int[][] counts = new int[2][10]; + + public void setDebug(boolean debug) { + this.debug = debug; + } + +// public void setReadoutCollectionName(String readoutCollectionName) { +// this.readoutCollectionName = readoutCollectionName; +// } + public void setSubdetectorName(String subdetectorName) { + this.subdetectorName = subdetectorName; + } + + public void setStripHitOutputCollectionName(String stripHitOutputCollectionName) { + this.stripHitOutputCollectionName = stripHitOutputCollectionName; + } + + public void setClusterSeedThreshold(double clusterSeedThreshold) { + this.clusterSeedThreshold = clusterSeedThreshold; + } + + public void setClusterNeighborThreshold(double clusterNeighborThreshold) { + this.clusterNeighborThreshold = clusterNeighborThreshold; + } + + public void setClusterThreshold(double clusterThreshold) { + this.clusterThreshold = clusterThreshold; + } + + public void setClusterMaxSize(int clusterMaxSize) { + this.clusterMaxSize = clusterMaxSize; + } + + public void setClusterCentralStripAveragingThreshold(int clusterCentralStripAveragingThreshold) { + this.clusterCentralStripAveragingThreshold = clusterCentralStripAveragingThreshold; + } + + public void setOneClusterErr(double oneClusterErr) { + this.oneClusterErr = oneClusterErr; + } + + public void setTwoClusterErr(double twoClusterErr) { + this.twoClusterErr = twoClusterErr; + } + + public void setThreeClusterErr(double threeClusterErr) { + this.threeClusterErr = threeClusterErr; + } + + public void setFourClusterErr(double fourClusterErr) { + this.fourClusterErr = fourClusterErr; + } + + public void setFiveClusterErr(double fiveClusterErr) { + this.fiveClusterErr = fiveClusterErr; + } + + /** + * Creates a new instance of TrackerHitDriver. + */ + public DataTrackerHitDriver() { + } + + /** + * Do initialization once we get a Detector. + */ + @Override + public void detectorChanged(Detector detector) { + + // Call sub-Driver's detectorChanged methods. + super.detectorChanged(detector); + + // Process detectors specified by path, otherwise process entire + // detector + IDetectorElement deDetector = detector.getDetectorElement(); + + for (String path : processPaths) { + processDEs.add(deDetector.findDetectorElement(path)); + } + + if (processDEs.isEmpty()) { + processDEs.add(deDetector); + } + + for (IDetectorElement detectorElement : processDEs) { + processSensors.addAll(detectorElement.findDescendants(SiSensor.class)); + //if (debug) + // System.out.println("added " + processSensors.size() + " sensors"); + processModules.addAll(detectorElement.findDescendants(SiTrackerModule.class)); + //if (debug) + // System.out.println("added " + processModules.size() + " modules"); + } + + // Create the sensor simulation. + CDFSiSensorSim stripSim = new CDFSiSensorSim(); + + + // Create Strip clustering algorithm. + HPSNearestNeighborRMS stripClusteringAlgo = new HPSNearestNeighborRMS(); + stripClusteringAlgo.setSeedThreshold(clusterSeedThreshold); + stripClusteringAlgo.setNeighborThreshold(clusterNeighborThreshold); + stripClusteringAlgo.setClusterThreshold(clusterThreshold); + +// hitMaker=new HPSFittedRawTrackerHitMaker(shaperFit); + // Create the clusterers and set hit-making parameters. + stripClusterer = new HPSStripMaker(stripSim,stripClusteringAlgo); + + stripClusterer.setMaxClusterSize(clusterMaxSize); + stripClusterer.setCentralStripAveragingThreshold(clusterCentralStripAveragingThreshold); + + // Set the cluster errors. + stripClusterer.SetOneClusterErr(oneClusterErr); + stripClusterer.SetTwoClusterErr(twoClusterErr); + stripClusterer.SetThreeClusterErr(threeClusterErr); + stripClusterer.SetFourClusterErr(fourClusterErr); + stripClusterer.SetFiveClusterErr(fiveClusterErr); + + // Set the detector to process. + processPaths.add(subdetectorName); + } + + /** + * Perform the digitization. + */ + @Override + public void process(EventHeader event) { + // Call sub-Driver processing. +// super.process(event); + + // Make new lists for output. +// List<HPSFittedRawTrackerHit> rawHits = new ArrayList<HPSFittedRawTrackerHit>(); + List<SiTrackerHit> stripHits1D = new ArrayList<SiTrackerHit>(); + +// // Make HPS hits. +// for (SiSensor sensor : processSensors) { +// rawHits.addAll(hitMaker.makeHits(sensor)); +// } + + // Make strip hits. + for (SiSensor sensor : processSensors) { + stripHits1D.addAll(stripClusterer.makeHits(sensor)); + } + + // Debug prints. + if (debug) { +// List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, this.readoutCollectionName); +// System.out.println("SimTrackerHit collection " + this.readoutCollectionName + " has " + simHits.size() + " hits."); +// System.out.println("RawTrackerHit collection " + this.rawTrackerHitOutputCollectionName + " has " + rawHits.size() + " hits."); + System.out.println("TrackerHit collection " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits."); + } + + // Put output hits into collection. + int flag = LCIOUtil.bitSet(0, 31, true); // Turn on 64-bit cell ID. +// event.put(this.rawTrackerHitOutputCollectionName, rawHits, RawTrackerHit.class, flag, toString()); + event.put(this.stripHitOutputCollectionName, stripHits1D, SiTrackerHitStrip1D.class, 0, toString()); + if (debug) { + for (int mod = 0; mod < 2; mod++) { + for (int layer = 0; layer < 10; layer++) { + counts[mod][layer] += SvtUtils.getInstance().getSensor(mod, layer).getReadout().getHits(SiTrackerHit.class).size(); + } + } + } + } + + @Override + public void endOfData() { + if (debug) { + for (int mod = 0; mod < 2; mod++) { + for (int layer = 0; layer < 10; layer++) { + System.out.format("mod %d, layer %d, count %d\n", mod, layer, counts[mod][layer]); + } + } + } + } +}

- - <driver name="TwoTrackFilter"/>

- <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"> -  - </driver> - <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/> - <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> - <fitAlgorithm>Analytic</fitAlgorithm> - <correctT0Shift>true</correctT0Shift> - </driver> - <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> - <driver name="HelicalTrackHitDriver" - type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver"> - <debug>false</debug> - <layerGeometryType>Common</layerGeometryType> - <maxSeperation>20.0</maxSeperation> - <tolerance>1.0</tolerance> - </driver> - <driver name="TrackerReconDriver" - type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> - <debug>false</debug> - </driver>

Commit in `hps-java/src` on MAIN
`main/resources/org/lcsim/hps/steering/recon/HPS2014OfflineRecon.lcsim`	+2	-2	1.4 -> 1.5
`/TestRunOfflineReconTwoTrkFilter.lcsim`	+1	-1	1.2 -> 1.3
`/HPSTrackingDefaultsRecon.lcsim`	+1	-1	1.1 -> 1.2
`/TestRunOfflineRecon.lcsim`	+2	-2	1.9 -> 1.10
`test/java/org/lcsim/hps/recon/tracking/MainTrackingDriver.java`		-1	1.2 -> 1.3
`main/resources/org/lcsim/hps/steering/users/phansson/TwoTrackAnalysis.lcsim`	+1	-1	1.2 -> 1.3
`/MPAlignment.lcsim`	+1	-1	1.1 -> 1.2
`/MultScatAna.lcsim`	+1	-1	1.1 -> 1.2
`main/resources/org/lcsim/hps/steering/users/OfflineTrackingAxial.lcsim`	+1	-1	1.1 -> 1.2
`/TestRunOfflineReconSeeVertexingPlots.lcsim`	+1	-1	1.1 -> 1.2
`/FakeHitTracking.lcsim`	+2	-2	1.1 -> 1.2
`main/resources/org/lcsim/hps/steering/monitoring/TestRunMonitoring.lcsim`	+1	-1	1.1 -> 1.2
`/OnlineTracking.lcsim`	+1	-1	1.1 -> 1.2
`/TestRunEventDisplay.lcsim`	+1	-1	1.1 -> 1.2
`/SVTMonitoring.lcsim`	+1	-1	1.1 -> 1.2
`main/resources/org/lcsim/hps/steering/users/mgraham/ReconParticleBuilder.lcsim`	+1	-1	1.1 -> 1.2
`/HitTimeStudies.lcsim`	+1	-1	1.1 -> 1.2
`main/java/org/lcsim/hps/users/mgraham/MainJASDriver.java`	+1		1.8 -> 1.9
`/DataTrackerHitDriver.java`		-230	1.7 removed
`main/resources/org/lcsim/hps/steering/users/meeg/EcalGainDriver.lcsim`	+1	-1	1.1 -> 1.2
`main/resources/org/lcsim/hps/steering/readout/TestRunSim.lcsim`	+1	-1	1.2 -> 1.3
`main/java/org/lcsim/hps/recon/tracking/DataTrackerHitDriver.java`	+230		added 1.1
`main/resources/org/lcsim/hps/steering/LCIOEventFilter.lcsim`	+4	-33	1.6 -> 1.7
	+256	-285