 |
 |
| Commit in hps-java/src/main on MAIN | |||
| java/org/lcsim/hps/recon/tracking/SvtUtils.java | +2 | -2 | 1.4 -> 1.5 |
| /TrackAnalysis.java | +7 | -1 | 1.1 -> 1.2 |
| java/org/lcsim/hps/users/mgraham/FastTrackAnalysisDriver.java | +29 | -34 | 1.3 -> 1.4 |
| resources/org/lcsim/hps/steering/HPSTrackingBunchedMC.lcsim | +1 | -1 | 1.1 -> 1.2 |
| resources/org/lcsim/hps/recon/tracking/strategies/HPS-Test-Lyr50.xml | +27 | -1 | 1.1 -> 1.2 |
| +66 | -39 | ||
A few more changes for vertex reach work...including changing sensorArray from [2][10] to [2][12] in SvtUtils.
diff -u -r1.4 -r1.5 --- SvtUtils.java 14 Aug 2012 00:58:03 -0000 1.4 +++ SvtUtils.java 30 Aug 2012 00:08:44 -0000 1.5 @@ -22,7 +22,7 @@
/** * * @author Omar Moreno
- * @version $Id: SvtUtils.java,v 1.4 2012/08/14 00:58:03 meeg Exp $
+ * @version $Id: SvtUtils.java,v 1.5 2012/08/30 00:08:44 mgraham Exp $
*/
public class SvtUtils {
@@ -44,7 +44,7 @@
private Map<SiSensor /* Sensor */, Integer /* Layer */> sensorToBottomLayer = new HashMap<SiSensor, Integer>();
// Map sensor to descriptor
private Map<SiSensor /* Sensor */, String /* Description */> sensorToDescriptor = new HashMap<SiSensor, String>();
- private SiSensor[][] sensorArray = new SiSensor[2][10];
+ private SiSensor[][] sensorArray = new SiSensor[2][12];
private IIdentifierHelper helper;
private boolean isSetup = false;
boolean debug = true;
diff -u -r1.1 -r1.2 --- TrackAnalysis.java 1 Aug 2011 18:25:21 -0000 1.1 +++ TrackAnalysis.java 30 Aug 2012 00:08:44 -0000 1.2 @@ -26,7 +26,7 @@
/** *
- * @author Richard Partridge
+ * @author Richard Partridge & Matt Graham
*/
public class TrackAnalysis {
@@ -48,6 +48,7 @@
private boolean _hasLayerOne;
List<Integer> badHitList = new ArrayList();
List<Integer> sharedHitList = new ArrayList();
+ List<Integer> trackLayerList = new ArrayList();
Map<MCParticle, HelicalTrackCross> badhits = new HashMap<MCParticle, HelicalTrackCross>();
private int[] _nMCHitsPerLayer={0,0,0,0,0,0,0,0,0,0,0,0};
private int[] _nStripHitsPerLayer={0,0,0,0,0,0,0,0,0,0,0,0};
@@ -182,6 +183,7 @@
HelicalTrackCross cross = (HelicalTrackCross) hit;
List<HelicalTrackStrip> clusterlist = cross.getStrips();
for (HelicalTrackStrip cl : clusterlist){
+ trackLayerList.add(cl.layer());
if (!(cl.MCParticles().contains(_mcpNew))) {
badHitList.add(cl.layer());
badhits.put(_mcpNew, cross);
@@ -284,6 +286,10 @@
public List<Integer> getSharedHitList() {
return sharedHitList;
}
+
+ public List<Integer> getTrackLayerList() {
+ return trackLayerList;
+ }
public Map<MCParticle, HelicalTrackCross> getBadHits() {
return badhits;
diff -u -r1.3 -r1.4 --- FastTrackAnalysisDriver.java 29 Aug 2012 15:40:46 -0000 1.3 +++ FastTrackAnalysisDriver.java 30 Aug 2012 00:08:44 -0000 1.4 @@ -68,9 +68,7 @@
nlayers[0] = trackerLayers;
_minLayers = mintrkLayers;
_config = config;
- if (_config.contains("Test")) {
- flipSign = -1;
- }
+
}
public FastTrackAnalysisDriver() {
@@ -84,12 +82,7 @@
_minLayers = mintrkLayers;
}
- public void setConfig(String config) {
- _config = config;
- if (_config.contains("Test")) {
- flipSign = -1;
- }
- }
+
public void process(
EventHeader event) {
@@ -109,6 +102,9 @@
Hep3Vector IP = new BasicHep3Vector(0., 0., 1.);
double bfield = event.getDetector().getFieldMap().getField(IP).y();
+ if(bfield<0){
+ flipSign=-1;
+ }
List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, "RawTrackerHitMaker_RawTrackerHits");
List<SiTrackerHitStrip1D> stripHits = event.get(SiTrackerHitStrip1D.class, "StripClusterer_SiTrackerHitStrip1D");
@@ -463,18 +459,22 @@
TrackAnalysis tkanalEle = tkanalMap.get(ele);
TrackAnalysis tkanalPos = tkanalMap.get(pos);
- Integer nElectron = tkanalEle.getNHitsNew(); - Integer nPositron = tkanalPos.getNHitsNew();
+// Integer nElectron = tkanalEle.getNHitsNew(); +// Integer nPositron = tkanalPos.getNHitsNew(); + List<Integer> layersEle = tkanalEle.getTrackLayerList(); + List<Integer> layersPos = tkanalPos.getTrackLayerList(); + Integer nElectron = encodeLayers(layersEle); + Integer nPositron = encodeLayers(layersPos);
List<Integer> badhitsEle = tkanalEle.getBadHitList();
List<Integer> badhitsPos = tkanalPos.getBadHitList();
- Integer badLayerEle = encodeBadHitList(badhitsEle); - Integer badLayerPos = encodeBadHitList(badhitsPos);
+ Integer badLayerEle = encodeLayers(badhitsEle); + Integer badLayerPos = encodeLayers(badhitsPos);
// int nMCL1Ele = tkanalEle.getNumberOfMCParticles(1);
// int nMCL1Pos = tkanalPos.getNumberOfMCParticles(1);
List<Integer> sharedhitsEle = tkanalEle.getSharedHitList();
List<Integer> sharedhitsPos = tkanalPos.getSharedHitList();
- Integer sharedLayerEle = encodeSharedHitList(sharedhitsEle); - Integer sharedLayerPos = encodeSharedHitList(sharedhitsPos);
+ Integer sharedLayerEle = encodeLayers(sharedhitsEle); + Integer sharedLayerPos = encodeLayers(sharedhitsPos);
int nStripsL1Ele = -99;
int nStripsL1Pos = -99;
Integer l1 = 1;
@@ -536,12 +536,13 @@
if (l123KinkAngle.get(pos) != null) {
l123KinkP = l123KinkAngle.get(pos);
}
- if (!tkanalEle.hasLayerOne()) {
- nElectron = -nElectron;
- }
- if (!tkanalPos.hasLayerOne()) {
- nPositron = -nPositron;
- }
+//
+// if (!tkanalEle.hasLayerOne()) {
+// nElectron = -nElectron;
+// }
+// if (!tkanalPos.hasLayerOne()) {
+// nPositron = -nPositron;
+// }
pw.format("%d %5.5f %5.5f %5.5f ", nevt, pxE, pyE, pzE);
pw.format("%5.5f %5.5f %5.5f %5.5f %5.5f ", d0E, z0E, slopeE, phi0E, RE);
pw.format("%5.5f %5.5f %5.5f %5.5f ", chisqE, l1minE, l1dzE, l123KinkE);
@@ -917,20 +918,14 @@
return mindist;
}
- private Integer encodeBadHitList(List<Integer> badHits) {
- Integer badHitsEncoded = 0;
- for (Integer layer : badHits) {
- badHitsEncoded += (int) Math.pow(2, layer - 1);
- }
- return badHitsEncoded;
- }
-
- private Integer encodeSharedHitList(List<Integer> sharedHits) {
- Integer sharedHitsEncoded = 0;
- for (Integer layer : sharedHits) {
- sharedHitsEncoded += (int) Math.pow(2, layer - 1);
+
+
+ private Integer encodeLayers(List<Integer> trackLayers) {
+ Integer hitsEncoded = 0;
+ for (Integer layer : trackLayers) {
+ hitsEncoded += (int) Math.pow(2, layer - 1);
}
- return sharedHitsEncoded;
+ return hitsEncoded;
}
private double getErr(double errSquared) {
diff -u -r1.1 -r1.2 --- HPSTrackingBunchedMC.lcsim 29 Aug 2012 15:40:46 -0000 1.1 +++ HPSTrackingBunchedMC.lcsim 30 Aug 2012 00:08:44 -0000 1.2 @@ -40,7 +40,7 @@
<driver name="TrackerReconDriver"
type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
- <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt0.xml</strategyResource>
+ <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-Lyr50.xml</strategyResource>
<stripMaxSeparation>20.0</stripMaxSeparation>
<stripTolerance>1.0</stripTolerance>
</driver>
diff -u -r1.1 -r1.2 --- HPS-Test-Lyr50.xml 29 Aug 2012 15:40:46 -0000 1.1 +++ HPS-Test-Lyr50.xml 30 Aug 2012 00:08:44 -0000 1.2 @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<StrategyList xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://lcsim.org/recon/tracking/seedtracker/strategybuilder/strategies.xsd">
<TargetDetector>HPS-Test-Lyr50</TargetDetector>
- <Strategy name="HelicalTrackHit Strategy">
+ <Strategy name="Strat135">
<!--Cutoffs-->
@@ -26,5 +26,31 @@
<Layer type="Extend" layer_number="11" detector_name="Tracker" be_flag="BARREL" />
</Layers>
</Strategy>
+ + <Strategy name="StratStrat1113"> + + <!--Cutoffs--> + + <MinPT>0.100</MinPT> + <MinHits>5</MinHits> + <MinConfirm>1</MinConfirm> + + <MaxDCA>4.0</MaxDCA> + <MaxZ0>4.0</MaxZ0> + + <MaxChisq>25.0</MaxChisq> + <BadHitChisq>10.0</BadHitChisq> + + <!--Layers--> + + <Layers> + <Layer type="Seed" layer_number="3" detector_name="Tracker" be_flag="BARREL" /> + <Layer type="Seed" layer_number="1" detector_name="Tracker" be_flag="BARREL" /> + <Layer type="Seed" layer_number="11" detector_name="Tracker" be_flag="BARREL" /> + <Layer type="Confirm" layer_number="5" detector_name="Tracker" be_flag="BARREL" /> + <Layer type="Extend" layer_number="7" detector_name="Tracker" be_flag="BARREL" /> + <Layer type="Extend" layer_number="9" detector_name="Tracker" be_flag="BARREL" /> + </Layers> + </Strategy>
</StrategyList>
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