 |
 |
| Commit in hps-java/src/main/java/org/lcsim/hps on MAIN | |||
| users/mgraham/jlabrotation/HeavyPhotonLLDriver.java | +6 | -6 | 1.2 -> 1.3 |
| recon/tracking/TrackerReconDriver.java | +9 | -5 | 1.28 -> 1.29 |
| /MultiTrackReco.java | +8 | -8 | 1.2 -> 1.3 |
| users/mgraham/alignment/HeavyPhotonLLDriver.java | +6 | -6 | 1.3 -> 1.4 |
| +29 | -25 | ||
Dependencies to the new version of HelicalTrackHitDriver.
diff -u -r1.2 -r1.3 --- HeavyPhotonLLDriver.java 13 May 2012 21:38:21 -0000 1.2 +++ HeavyPhotonLLDriver.java 22 Nov 2012 02:48:54 -0000 1.3 @@ -67,19 +67,19 @@
HPSHelicalTrackHitDriver hthdriver = new HPSHelicalTrackHitDriver();
hthdriver.addCollection(((HPSTrackerHitDriver) thd).getStripHits1DName());
hthdriver.setOutputCollectionName("HelicalTrackHits");
- hthdriver.setHitRelationName("HelicalTrackHitRelations");
- hthdriver.setMCRelationName("HelicalTrackMCRelations");
+ hthdriver.HitRelationName("HelicalTrackHitRelations");
+ hthdriver.MCRelationName("HelicalTrackMCRelations");
for (int[] pair : pairs)
hthdriver.setStereoPair("Tracker", pair[0], pair[1]);
if (detType.contains("Test")) {
System.out.println("Setting separation for a Test detector");
- hthdriver.setStripMaxSeparation(10.01); - hthdriver.setStripTolerance(0.01);
+ hthdriver.setMaxSeperation(10.01); + hthdriver.setTolerance(0.01);
} else {
- hthdriver.setStripMaxSeparation(50.); - hthdriver.setStripTolerance(0.4);
+ hthdriver.setMaxSeperation(50.); + hthdriver.setTolerance(0.4);
}
hthdriver.setTransformToTracking(true);
add(hthdriver);
diff -u -r1.28 -r1.29 --- TrackerReconDriver.java 17 Oct 2012 22:58:21 -0000 1.28 +++ TrackerReconDriver.java 22 Nov 2012 02:48:54 -0000 1.29 @@ -66,15 +66,15 @@
}
public void setStripHitsCollectionName(String stripHitsCollectionName) {
- hthdriver.setHitRelationName(stripHitsCollectionName);
+ hthdriver.HitRelationName(stripHitsCollectionName);
}
public void setHelicalTrackHitRelationsCollectionName(String helicalTrackHitRelationsCollectionName) {
- hthdriver.setHitRelationName(helicalTrackHitRelationsCollectionName);
+ hthdriver.HitRelationName(helicalTrackHitRelationsCollectionName);
}
public void setHelicalTrackMCRelationsCollectionName(String helicalTrackMCRelationsCollectionName) {
- hthdriver.setMCRelationName(helicalTrackMCRelationsCollectionName);
+ hthdriver.MCRelationName(helicalTrackMCRelationsCollectionName);
}
public void setOutputHitCollectionName(String outputHitCollectionName) {
@@ -82,11 +82,15 @@
}
public void setStripMaxSeparation(double stripMaxSeparation) {
- hthdriver.setStripMaxSeparation(stripMaxSeparation);
+ hthdriver.setMaxSeperation(stripMaxSeparation);
}
public void setStripTolerance(double stripTolerance) {
- hthdriver.setStripTolerance(stripTolerance);
+ hthdriver.setTolerance(stripTolerance);
+ }
+
+ public void setLayerGeometryType(String geomType) {
+ hthdriver.setLayerGeometryType(geomType);
}
/**
diff -u -r1.2 -r1.3 --- MultiTrackReco.java 13 May 2012 21:38:20 -0000 1.2 +++ MultiTrackReco.java 22 Nov 2012 02:48:54 -0000 1.3 @@ -28,8 +28,8 @@
HPSHelicalTrackHitDriver hitdriver = new HPSHelicalTrackHitDriver();
hitdriver.addCollection(((HPSTrackerHitDriver) thd).getStripHits1DName());
hitdriver.setOutputCollectionName("AxialTrackHits");
- hitdriver.setHitRelationName("AxialTrackHitRelations");
- hitdriver.setMCRelationName("AxialTrackMCRelations");
+ hitdriver.HitRelationName("AxialTrackHitRelations");
+ hitdriver.MCRelationName("AxialTrackMCRelations");
add(hitdriver);
@@ -59,8 +59,8 @@
HPSHelicalTrackHitDriver hthdriver = new HPSHelicalTrackHitDriver();
hthdriver.addCollection(((HPSTrackerHitDriver) thd).getStripHits1DName());
hthdriver.setOutputCollectionName("HelicalTrackHits");
- hthdriver.setHitRelationName("HelicalTrackHitRelations");
- hthdriver.setMCRelationName("HelicalTrackMCRelations");
+ hthdriver.HitRelationName("HelicalTrackHitRelations");
+ hthdriver.MCRelationName("HelicalTrackMCRelations");
for (int[] pair : stereoPairs)
@@ -68,12 +68,12 @@
if (detType.contains("Test")) {
System.out.println("Setting separation for a Test detector");
- hthdriver.setStripMaxSeparation(10.01); - hthdriver.setStripTolerance(0.01);
+ hthdriver.setMaxSeperation(10.01); + hthdriver.setTolerance(0.01);
} else {
- hthdriver.setStripMaxSeparation(50.); - hthdriver.setStripTolerance(0.4);
+ hthdriver.setMaxSeperation(50.); + hthdriver.setTolerance(0.4);
}
add(hthdriver);
diff -u -r1.3 -r1.4 --- HeavyPhotonLLDriver.java 13 May 2012 21:38:20 -0000 1.3 +++ HeavyPhotonLLDriver.java 22 Nov 2012 02:48:54 -0000 1.4 @@ -66,19 +66,19 @@
HPSHelicalTrackHitDriver hthdriver = new HPSHelicalTrackHitDriver();
hthdriver.addCollection(((HPSTrackerHitDriver) thd).getStripHits1DName());
hthdriver.setOutputCollectionName("HelicalTrackHits");
- hthdriver.setHitRelationName("HelicalTrackHitRelations");
- hthdriver.setMCRelationName("HelicalTrackMCRelations");
+ hthdriver.HitRelationName("HelicalTrackHitRelations");
+ hthdriver.MCRelationName("HelicalTrackMCRelations");
for (int[] pair : pairs)
hthdriver.setStereoPair("Tracker", pair[0], pair[1]);
if (detType.contains("Test")) {
System.out.println("Setting separation for a Test detector");
- hthdriver.setStripMaxSeparation(10.01); - hthdriver.setStripTolerance(0.01);
+ hthdriver.setMaxSeperation(10.01); + hthdriver.setTolerance(0.01);
} else {
- hthdriver.setStripMaxSeparation(50.); - hthdriver.setStripTolerance(0.4);
+ hthdriver.setMaxSeperation(50.); + hthdriver.setTolerance(0.4);
}
hthdriver.setTransformToTracking(true);
add(hthdriver);
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1