1 added + 4 modified, total 5 files
hps-java/src/main/resources
diff -N HPS-Test-1pt3.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ HPS-Test-1pt3.xml 19 Jan 2011 20:47:05 -0000 1.1
@@ -0,0 +1,31 @@
+<?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>DarkPhoton-Thin</TargetDetector>
+ <Strategy name="HelicalTrackHit Strategy">
+ <!--Cutoffs-->
+ <MinPT>0.5</MinPT>
+ <MinHits>4</MinHits>
+ <MinConfirm>1</MinConfirm>
+<!--
+ <MaxDCA>100.0</MaxDCA>
+ <MaxZ0>1000.0</MaxZ0>
+ <MaxChisq>2500.0</MaxChisq>
+ <BadHitChisq>1000.0</BadHitChisq>
+-->
+ <MaxDCA>10.0</MaxDCA>
+ <MaxZ0>100.0</MaxZ0>
+ <MaxChisq>25.0</MaxChisq>
+ <BadHitChisq>10.0</BadHitChisq>
+ <!--Layers-->
+
+ <Layers>
+ <Layer type="Seed" layer_number="1" detector_name="Tracker" be_flag="BARREL" />
+ <Layer type="Seed" layer_number="3" detector_name="Tracker" be_flag="BARREL" />
+ <Layer type="Seed" layer_number="5" detector_name="Tracker" be_flag="BARREL" />
+ <Layer type="Confirm" layer_number="7" detector_name="Tracker" be_flag="BARREL" />
+ <Layer type="Extend" layer_number="9" detector_name="Tracker" be_flag="BARREL" />
+ </Layers>
+ </Strategy>
+
+</StrategyList>
+
hps-java/src/main/resources
diff -u -r1.1 -r1.2
--- HPS-Test-1pt0.xml 7 Jan 2011 17:15:08 -0000 1.1
+++ HPS-Test-1pt0.xml 19 Jan 2011 20:47:05 -0000 1.2
@@ -3,7 +3,7 @@
<TargetDetector>DarkPhoton-Thin</TargetDetector>
<Strategy name="HelicalTrackHit Strategy">
<!--Cutoffs-->
- <MinPT>0.1</MinPT>
+ <MinPT>0.5</MinPT>
<MinHits>4</MinHits>
<MinConfirm>1</MinConfirm>
<!--
hps-java/src/main/java/org/lcsim/HPSTestv1
diff -u -r1.1 -r1.2
--- DarkPhotonLLDriver.java 7 Jan 2011 17:15:08 -0000 1.1
+++ DarkPhotonLLDriver.java 19 Jan 2011 20:47:06 -0000 1.2
@@ -89,7 +89,30 @@
passLayers.add(11);
}
-
+ if (pName.contentEquals("HPS1pt3")) {
+ referenceX = 0.0;
+ referenceY = 0.0;
+ bfield = 0.5;
+
+ nlayers = 10;
+ axialStrategy = "none";
+ finalStrategy = "HPS-Test-1pt3.xml";
+ llStrategy = "none";
+
+ int[] p1 = {1, 2};
+ int[] p2 = {3, 4};
+ int[] p3 = {5, 6};
+ int[] p4 = {7, 8};
+ int[] p5 = {9, 10};
+
+ pairs.add(p1);
+ pairs.add(p2);
+ pairs.add(p3);
+ pairs.add(p4);
+ pairs.add(p5);
+
+ passLayers.add(11);
+ }
}
}
hps-java/src/main/java/org/lcsim/HPSTestv1
diff -u -r1.1 -r1.2
--- MultiTrackReco.java 7 Jan 2011 17:15:07 -0000 1.1
+++ MultiTrackReco.java 19 Jan 2011 20:47:06 -0000 1.2
@@ -76,8 +76,8 @@
for (int[] pair : stereoPairs)
hthdriver.setStereoPair("Tracker", pair[0], pair[1]);
- hthdriver.setMaxSeperation(50.);
- hthdriver.setTolerance(0.4);
+ hthdriver.setMaxSeperation(10.01);
+ hthdriver.setTolerance(0.01);
add(hthdriver);
hps-java/src/main/java/org/lcsim/DarkPhoton
diff -u -r1.5 -r1.6
--- TrackReconstructionDriver.java 23 Sep 2010 16:06:37 -0000 1.5
+++ TrackReconstructionDriver.java 19 Jan 2011 20:47:06 -0000 1.6
@@ -5,9 +5,9 @@
import java.util.List;
-import org.lcsim.contrib.Partridge.DarkForces.DarkForcesHitDriver;
+
import org.lcsim.contrib.mgraham.DarkPhoton.CheckDPTrack;
-import org.lcsim.contrib.mgraham.DarkPhoton.TrackerHitDriver_DarkPhoton;
+
import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
import org.lcsim.recon.tracking.seedtracker.SeedTracker;
import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
CVSspam 0.2.8