7 modified files
lcsim-contrib/src/main/java/org/lcsim/contrib/CosminDeaconu
diff -u -r1.1.1.1 -r1.2
--- StripMakerDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ StripMakerDriver.java 24 Apr 2009 20:57:06 -0000 1.2
@@ -10,7 +10,7 @@
package org.lcsim.contrib.CosminDeaconu;
import org.lcsim.contrib.RobKutschke.TKNHits.TKNClusterMakerDriverV1;
import org.lcsim.contrib.RobKutschke.TKNHits.TKNRawHitsDriverV1;
-import org.lcsim.detector.driver.SimTrackerHitIdentifierReadoutDriver;
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
/**
@@ -29,7 +29,7 @@
public StripMakerDriver() {
- super.add( new SimTrackerHitIdentifierReadoutDriver( input ) );
+ super.add( new SimTrackerHitReadoutDriver( input ) );
super.add( new TKNRawHitsDriverV1( input, raw) );
super.add( new TKNClusterMakerDriverV1( raw, output) );
super.add( new SiTrackerHit2DMakerDriver());
lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/Tracking
diff -u -r1.1.1.1 -r1.2
--- ParticlewithHitsAccessDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ ParticlewithHitsAccessDriver.java 24 Apr 2009 20:57:07 -0000 1.2
@@ -35,7 +35,6 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
import org.lcsim.detector.identifier.Identifier;
-import org.lcsim.detector.driver.CollectionHandler;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.util.Driver;
lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/Tracking
diff -u -r1.1.1.1 -r1.2
--- TrackerHitAccessDriver.java 10 Dec 2008 22:03:06 -0000 1.1.1.1
+++ TrackerHitAccessDriver.java 24 Apr 2009 20:57:07 -0000 1.2
@@ -35,7 +35,6 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.BasicHep3Vector;
import org.lcsim.detector.identifier.Identifier;
-import org.lcsim.detector.driver.CollectionHandler;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
import org.lcsim.util.Driver;
lcsim-contrib/src/main/java/org/lcsim/contrib/Partridge/TrackingTest
diff -u -r1.2 -r1.3
--- TrackingTestDriver.java 25 Feb 2009 17:51:32 -0000 1.2
+++ TrackingTestDriver.java 24 Apr 2009 20:57:07 -0000 1.3
@@ -10,7 +10,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.lcsim.detector.driver.SimTrackerHitIdentifierReadoutDriver;
+import org.lcsim.recon.tracking.digitization.sisim.SimTrackerHitReadoutDriver;
import org.lcsim.util.Driver;
/**
@@ -28,7 +28,7 @@
colnames.add("TkrForwardHits");
colnames.add("VtxBarrHits");
colnames.add("VtxEndcapHits");
- add(new SimTrackerHitIdentifierReadoutDriver(colnames));
+ add(new SimTrackerHitReadoutDriver(colnames));
add(new LOIEffFake());
}
lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi
diff -u -r1.2 -r1.3
--- MyDigiHitMaker.java 20 Apr 2009 23:48:18 -0000 1.2
+++ MyDigiHitMaker.java 24 Apr 2009 20:57:07 -0000 1.3
@@ -35,29 +35,29 @@
//Initialize Nick's Pixel hit making code
// PixilatedSensorManager psm = new PixilatedSensorManager(SensorOption.ClassicCCD, true);
// add(psm);
- PixelCheater pcB = new PixelCheater("VtxBarrHits", 0.0075, 0.075, true);
+// PixelCheater pcB = new PixelCheater("VtxBarrHits", 0.0075, 0.075, true);
// PixelCheater pcB = new PixelCheater("VtxBarrHits",0.000000001,0.000000001,true);
- add(pcB);
- PixelCheater pcE = new PixelCheater("VtxEndcapHits", 0.0075, 0.075, false);
- add(pcE);
+// add(pcB);
+// PixelCheater pcE = new PixelCheater("VtxEndcapHits", 0.0075, 0.075, false);
+// add(pcE);
// sInitialize Tim's TrackerHit making code
TrackerHitDriver_sATLAS thd = new TrackerHitDriver_sATLAS();
add(thd);
- HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
- hitdriver.addCollection(((TrackerHitDriver_sATLAS) thd).getStripHits1DName(), HitType.Digitized);
- hitdriver.addCollection("VtxBarrHits_PixelCheater", HitType.Base);
- hitdriver.addCollection("VtxEndcapHits_PixelCheater", HitType.Base);
+// HelicalTrackHitDriver hitdriver = new HelicalTrackHitDriver();
+// hitdriver.addCollection(((TrackerHitDriver_sATLAS) thd).getStripHits1DName(), HitType.Digitized);
+// hitdriver.addCollection("VtxBarrHits_PixelCheater", HitType.Base);
+// hitdriver.addCollection("VtxEndcapHits_PixelCheater", HitType.Base);
// hitdriver.addCollection("RecVtxBarrHits", HitType.Base);
// hitdriver.addCollection("RecVtxEndcapHits", HitType.Base);
- hitdriver.OutputCollection("HelicalTrackHits"); // the default, but it might change?
- add(hitdriver);
- String sfile = StrategyXMLUtils.getDefaultStrategiesPrefix() + "sATLASBarrel-SM08.xml";
- List<SeedStrategy> slist = StrategyXMLUtils.getStrategyListFromResource(sfile);
+// hitdriver.OutputCollection("HelicalTrackHits"); // the default, but it might change?
+// add(hitdriver);
+// String sfile = StrategyXMLUtils.getDefaultStrategiesPrefix() + "sATLASBarrel-SM08.xml";
+// List<SeedStrategy> slist = StrategyXMLUtils.getStrategyListFromResource(sfile);
- SeedTracker st = new SeedTracker(slist);
- add(st);
+// SeedTracker st = new SeedTracker(slist);
+// add(st);
}
lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi
diff -u -r1.3 -r1.4
--- TrackerHitDriver_sATLAS.java 24 Apr 2009 20:23:39 -0000 1.3
+++ TrackerHitDriver_sATLAS.java 24 Apr 2009 20:57:07 -0000 1.4
@@ -27,18 +27,18 @@
_trackerhit_driver = new TrackerHitDriver();
// _trackerhit_driver.addReadout("VtxBarrHits");
- _trackerhit_driver.setReadout("SCTShortBarrHits");
- _trackerhit_driver.setReadout("SCTLongBarrHits");
+ //_trackerhit_driver.setReadout("SCTShortBarrHits");
+ //_trackerhit_driver.setReadout("SCTLongBarrHits");
//_trackerhit_driver.addReadout("VtxEndcapHits");
- _trackerhit_driver.setReadout("SCTShortEndcapHits");
- _trackerhit_driver.setReadout("SCTLongEndcapHits");
+ //_trackerhit_driver.setReadout("SCTShortEndcapHits");
+ _trackerhit_driver.setReadout("SiTrackerEndcap_RO");
//_trackerhit_driver.addElementToProcess("VtxPixelBarrel");
- _trackerhit_driver.addElementToProcess("SCTShortBarrel");
- _trackerhit_driver.addElementToProcess("SCTLongBarrel");
+ //_trackerhit_driver.addElementToProcess("SCTShortBarrel");
+ //_trackerhit_driver.addElementToProcess("SCTLongBarrel");
//_trackerhit_driver.addElementToProcess("VtxPixelEndcap");
- _trackerhit_driver.addElementToProcess("SCTShortEndcap");
- _trackerhit_driver.addElementToProcess("SCTLongEndcap");
+ //_trackerhit_driver.addElementToProcess("SCTShortEndcap");
+ //_trackerhit_driver.addElementToProcess("SCTLongEndcap");
super.add( _trackerhit_driver );
lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi
diff -u -r1.3 -r1.4
--- sATLASDigiDriver.java 24 Apr 2009 20:26:23 -0000 1.3
+++ sATLASDigiDriver.java 24 Apr 2009 20:57:07 -0000 1.4
@@ -15,7 +15,7 @@
public sATLASDigiDriver(){
MyDigiHitMaker hm=new MyDigiHitMaker();
add(hm);
- LOIEffFakeMG ef=new LOIEffFakeMG();
- add(ef);
+// LOIEffFakeMG ef=new LOIEffFakeMG();
+// add(ef);
}
}
CVSspam 0.2.8