Print

Print


Commit in lcsim/src/org/lcsim/recon/tracking/seedtracker/ReconTracking on MAIN
HybridHitMaker.java-1161.1 removed
VSNoVertexDriver.java-1031.2 removed
VSNoVertexSegmenter.java-381.2 removed
-257
3 removed files
Remove obsolete files

lcsim/src/org/lcsim/recon/tracking/seedtracker/ReconTracking
HybridHitMaker.java removed after 1.1
diff -N HybridHitMaker.java
--- HybridHitMaker.java	10 Oct 2008 23:10:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,116 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.lcsim.recon.tracking.seedtracker.ReconTracking;
-
-import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver;
-import org.lcsim.fit.helicaltrack.HelicalTrackHitDriver.HitType;
-import org.lcsim.mc.CCDSim.FullCCDSimulation;
-import org.lcsim.util.Driver;
-
-/**
- * This generates HelicalTrackHits using VS in the barrel and CCDSim in the vertex. 
- * @author cozzy
- */
-public class HybridHitMaker extends Driver{
-    
-    private static final String[] CCDSIMOUT={"RecVtxBarrHits","RecVtxEndcapHits"}; 
-    private FullCCDSimulation ccdsim = new FullCCDSimulation(); 
-    
-    public HybridHitMaker() {
-        //Use CCDSim in the vertex
-        // defined as instance so that options can be set using setters... 
-        setDefaults();
-        add(ccdsim); 
-        //Use VS in the barrel 
-        add(new VSNoVertexDriver()); 
-        HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver(); 
-        hitdriver.addCollection("NewTrackerHits", HitType.VirtualSegmentation);
-        for (String s : CCDSIMOUT) hitdriver.addCollection(s,HitType.Base); 
-        add(hitdriver); 
-    }
-        
-    //set the default values... these can be changed easily enough
-    private void setDefaults(){
-       setPixelSizeX(20.);
-       setPixelSizeY(20.);   
-   }
-    
-    /**
-     * Sets the size of CCD Pixels in the x-coordinate
-     * @param x size in microns
-     */
-    public void setPixelSizeX(double x) {
-        ccdsim.setCCDPixelSizeX(x);
-    }
-    
-    /**
-     * Sets the size of CCD Pixels in the y-coordinate
-     * @param y size in microns
-     */
-    public void setPixelSizeY(double y) {
-        ccdsim.setCCDPixelSizeY(y);
-    }
-    /**
-     * Sets electronics noise level. 
-     * @param n noise level (RMS) in units of electric charge
-     */
-    public void setPixelNoiseLevelRMS(double n) {
-        ccdsim.setCCDNoiseRMS(n);
-    }
-    
-    /**
-     * Set ADC saturation level foro CCD electronics
-     * @param counts saturation level in ADC counts
-     */
-    public void setPixelADCSaturation(int counts) {
-        ccdsim.setCCDADCSaturation(counts);
-    }
-    
-    /**
-     * Set ADC converstion scale for CCD electronics
-     * @param scale factor to convert CCD signal to ADC counts
-     */
-    public void setPixelADCScale(double scale) {
-        ccdsim.setCCDADCScale(scale);
-    }
-    
-    /**
-     * Set amplitude threshold to make a cluster
-     * @param threshold threshold in ADC counts
-     */
-    public void setPixelClusterThreshold(int threshold) {
-        ccdsim.setCCDClustThr(threshold);
-    }
-    
-    /** 
-     * Set threshold to regard a single pixel as active
-     * @param counts threshold in ADC counts 
-     */
-    public void setPixelSinglePixelThreshold(int counts) {
-        ccdsim.setCCDSingPixThr(counts);
-    }
-    
-    /**
-     * Set the depletion depth for CCDs
-     * @param d depth in microns
-     */
-    public void setPixelDepletionDepth(double d) {
-        ccdsim.setCCDDepDepth(d);
-    }
-    
-    /**
-     * Set the epitaxial depth for CCDs
-     * @param d depth in microns
-     */
-   public void setPixelEpitaxialDepth(double d) {
-        ccdsim.setCCDEpiDepth(d);
-    }
-   
-
-            
-}
-
-

lcsim/src/org/lcsim/recon/tracking/seedtracker/ReconTracking
VSNoVertexDriver.java removed after 1.2
diff -N VSNoVertexDriver.java
--- VSNoVertexDriver.java	15 Oct 2008 18:12:14 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,103 +0,0 @@
-package org.lcsim.recon.tracking.seedtracker.ReconTracking;
-
-import java.util.*;
-
-import hep.aida.*;
-import org.lcsim.event.EventHeader;
-import org.lcsim.util.Driver;
-
-import org.lcsim.contrib.onoprien.tracking.clustering.ClusteringDriver;
-import org.lcsim.contrib.onoprien.tracking.clustering.clusterers.NearestNeighborClusterer;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiDriver;
-import org.lcsim.contrib.onoprien.tracking.digitization.SimToDigiConverter;
-import org.lcsim.contrib.onoprien.tracking.digitization.algorithms.ConverterSimple;
-import org.lcsim.contrib.onoprien.tracking.geom.SegmentationManager;
-import org.lcsim.contrib.onoprien.tracking.geom.Segmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.Sensor;
-import org.lcsim.contrib.onoprien.tracking.hit.DigiTrackerHit;
-import org.lcsim.contrib.onoprien.tracking.hit.TrackerCluster;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.HitMakingDriver;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.TrackerHitMaker;
-import org.lcsim.contrib.onoprien.tracking.hitmaking.hitmakers.TrackerHitMakerBasic;
-import org.lcsim.contrib.onoprien.tracking.mctruth.MCTruth;
-import org.lcsim.contrib.onoprien.tracking.mctruth.MCTruthDriver;
-
-/**
- * An Example of how to define virtual segmentation of the tracker,
- * and use {@link TrackerHitConverter} to create
- * "standard" <tt>org.lcsim.event.TrackerHits</tt>.
- * Parameters are chosen to define reasonable segmentation for SiD01.
- *
- *
- *
- * @author D. Onoprienko
- * @version $Id: VSNoVertexDriver.java,v 1.2 2008/10/15 18:12:14 partridge Exp $
- */
-public class VSNoVertexDriver extends Driver {
-    
-// -- Constructors :  ----------------------------------------------------------
-    
-    public VSNoVertexDriver() {
-        
-        add(new MCTruthDriver());
-        
-        // Segmentation description :
-        
-        Segmenter segmenter = new VSNoVertexSegmenter();
-        SegmentationManager segMan = new SegmentationManager(segmenter);
-        SegmentationManager.setDefaultInstance(segMan);
-        add(segMan);
-        
-        // Digitization :
-        
-        SimToDigiConverter converter = new ConverterSimple();
-        SimToDigiDriver conversionDriver = new SimToDigiDriver(converter);
-        conversionDriver.set("ADD_INPUT_LIST_NAME", "TkrBarrHits");
-        conversionDriver.set("ADD_INPUT_LIST_NAME", "TkrEndcapHits");
-        conversionDriver.set("OUTPUT_MAP_NAME", "DigiTrackerHits");
-        add(conversionDriver);
-        
-        // Clustering :
-        
-        ClusteringDriver clusteringDriver = new ClusteringDriver(new NearestNeighborClusterer());
-        clusteringDriver.set("INPUT_MAP_NAME","DigiTrackerHits");
-        clusteringDriver.set("OUTPUT_MAP_NAME","TrackerClusters");
-        add(clusteringDriver);
-        
-        // Hit making :
-        
-        TrackerHitMaker hitMaker = new TrackerHitMakerBasic();
-        HitMakingDriver hitMakingDriver = new HitMakingDriver(hitMaker);
-        hitMakingDriver.set("INPUT_MAP_NAME","TrackerClusters");
-        hitMakingDriver.set("OUTPUT_MAP_NAME","NewTrackerHits");
-        add(hitMakingDriver);
-        
-    }
-    
-    
-// -- Event processing :  ------------------------------------------------------
-    
-    public void process(EventHeader event) {
-        
-        super.process(event);
-        
-//    MCTruth mcTruth = (MCTruth) event.get("MCTruth");
-        
-//    int n = 0;
-//    HashMap<Sensor, List<DigiTrackerHit>> digiMap =
-//            (HashMap<Sensor, List<DigiTrackerHit>>) event.get("DigiTrackerHits");
-//    for (List<DigiTrackerHit> digiList : digiMap.values()) n += digiList.size();
-//    System.out.println("Created " + n + " DigiTrackerHits on " + digiMap.keySet().size() + " sensors");
-        
-//    n = 0;
-//    HashMap<Sensor, List<TrackerCluster>> clusterMap =
-//            (HashMap<Sensor, List<TrackerCluster>>) event.get("TrackerClusters");
-//    for (List<TrackerCluster> clusterList : clusterMap.values()) n += clusterList.size();
-//    System.out.println("Created " + n + " TrackerClusters on " + clusterMap.keySet().size() + " sensors");
-        
-//    n = 0;
-//    List<org.lcsim.event.TrackerHit> oldHitList = (List<org.lcsim.event.TrackerHit>) event.get("StandardTrackerHits");
-//    System.out.println("Created " + oldHitList.size() + " org.lcsim.event.TrackerHits");
-    }
-    
-}

lcsim/src/org/lcsim/recon/tracking/seedtracker/ReconTracking
VSNoVertexSegmenter.java removed after 1.2
diff -N VSNoVertexSegmenter.java
--- VSNoVertexSegmenter.java	15 Oct 2008 18:12:14 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-package org.lcsim.recon.tracking.seedtracker.ReconTracking;
-
-import org.lcsim.units.clhep.SystemOfUnits;
-
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.CylindricalBarrelSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToWedgesSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.DiskTrackerToRingsSegmenter;
-import org.lcsim.contrib.onoprien.tracking.geom.segmenters.SubdetectorBasedSegmenter;
-
-/**
- *  Segmenter for SiD02 to be run with FullCCDSimulation package for pixel
- *  digitization.
- * 
- * @author D. Onoprienko
- * @version $Id: VSNoVertexSegmenter.java,v 1.2 2008/10/15 18:12:14 partridge Exp $
- */
-public class VSNoVertexSegmenter extends SubdetectorBasedSegmenter {
-  
-// -- Constructors :  ----------------------------------------------------------
-  
-  public VSNoVertexSegmenter() {
-     
-    // 10 cm x 25 um strips in outer Tracker Barrel
-    
-    CylindricalBarrelSegmenter trackerBarrelSegmenter = new CylindricalBarrelSegmenter("TrackerBarrel");
-    trackerBarrelSegmenter.setStripLength(10.*SystemOfUnits.cm);
-    trackerBarrelSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
-    setSegmenter("TrackerBarrel", trackerBarrelSegmenter);
-   
-    // 12 degrees stereo wedges in outer Tracker Endcap
-    
-    DiskTrackerToWedgesSegmenter trackerEndcapSegmenter = new DiskTrackerToWedgesSegmenter("TrackerEndcap");
-    trackerEndcapSegmenter.setNumberOfRadialSlices(new int[]{3,6,9,12});
-    trackerEndcapSegmenter.setStripWidth(25.*SystemOfUnits.micrometer);
-    trackerEndcapSegmenter.setNumberOfPhiSlices(30);
-    setSegmenter("TrackerEndcap", trackerEndcapSegmenter);
-  }  
-}
CVSspam 0.2.8