11 modified files
hps-java/src/main/java/org/lcsim/HPSTestv1
diff -u -r1.3 -r1.4
--- FastTrackAnalysisDriver.java 10 Feb 2011 19:35:24 -0000 1.3
+++ FastTrackAnalysisDriver.java 10 Mar 2011 19:02:46 -0000 1.4
@@ -59,7 +59,7 @@
FileWriter fw;
PrintWriter pw;
double[] beamsize = {0.001, 0.2, 0.02};
-
+ int flipSign=-1;
public FastTrackAnalysisDriver(int layers) {
nlayers[0] = layers;
@@ -255,11 +255,11 @@
for (Track track1 : tracklist) {
Track ele = null;
Track pos = null;
- int ch1 = track1.getCharge();
+ int ch1 = track1.getCharge()*flipSign;
int index = tracklist.indexOf(track1);
List<Track> subtracklist = tracklist.subList(index, tracklist.size());
for (Track track2 : subtracklist) {
- int ch2 = track2.getCharge();
+ int ch2 = track2.getCharge()*flipSign;
if (track1 != track2 && ch1 == -ch2) {
ele = track1;
pos = track2;
@@ -577,7 +577,8 @@
pxMCE = mcEle.getPX();
pyMCE = mcEle.getPY();
pzMCE = mcEle.getPZ();
- if (findable.InnerTrackerIsFindable(mcEle, nlayers[0] - 2))
+// if (findable.InnerTrackerIsFindable(mcEle, nlayers[0] - 2))
+ if (findable.InnerTrackerIsFindable(mcEle, nlayers[0]))
findableE = 1;
Set<Track> trklistE = trktomc.allTo(mcEle);
foundE = trklistE.size();//can be greater than 1 if more than 1 track shares hits
@@ -585,7 +586,8 @@
pxMCP = mcPos.getPX();
pyMCP = mcPos.getPY();
pzMCP = mcPos.getPZ();
- if (findable.InnerTrackerIsFindable(mcPos, nlayers[0] - 2))
+// if (findable.InnerTrackerIsFindable(mcPos, nlayers[0] - 2))
+ if (findable.InnerTrackerIsFindable(mcPos, nlayers[0]))
findableP = 1;
Set<Track> trklistP = trktomc.allTo(mcPos);
foundP = trklistP.size();//can be greater than 1 if more than 1 track shares hits
hps-java/src/main/java/org/lcsim/HPSTestv1
diff -u -r1.1 -r1.2
--- TrackerHitDriver_DarkPhoton.java 7 Jan 2011 17:15:08 -0000 1.1
+++ TrackerHitDriver_DarkPhoton.java 10 Mar 2011 19:02:46 -0000 1.2
@@ -206,7 +206,8 @@
}
- int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+// int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+ int flag=0;
event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
// event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
hps-java/src/main/java/org/lcsim/HPSTestv1
diff -u -r1.4 -r1.5
--- DarkPhotonLLDriver.java 10 Feb 2011 19:35:24 -0000 1.4
+++ DarkPhotonLLDriver.java 10 Mar 2011 19:02:46 -0000 1.5
@@ -92,7 +92,7 @@
if (pName.contentEquals("HPS1pt3")) {
referenceX = 0.0;
referenceY = 0.0;
- bfield = -0.5;
+ bfield = 0.5;
nlayers = 10;
axialStrategy = "none";
hps-java/src/main/java/org/lcsim/HPSTestv1
diff -u -r1.3 -r1.4
--- MultiTrackReco.java 10 Feb 2011 19:35:24 -0000 1.3
+++ MultiTrackReco.java 10 Mar 2011 19:02:46 -0000 1.4
@@ -102,7 +102,7 @@
stFinal.setTrkCollectionName("MatchedTracks");
}
// stFinal.setDiagnostics(new SeedTrackerDiagnostics());
- // stFinal.setBField(BField);
+ stFinal.setBField(BField);
stFinal.setTimingPlots(true);
add(stFinal);
hps-java/src/main/java/Utilities
diff -u -r1.2 -r1.3
--- ConvertToStdhep.java 10 Feb 2011 19:35:24 -0000 1.2
+++ ConvertToStdhep.java 10 Mar 2011 19:02:46 -0000 1.3
@@ -6,8 +6,7 @@
/**
*
- * @author richp
- * modified by mbussonn to take arguments from command line
+ * @author mgraham
*/
import java.io.FileReader;
import java.io.IOException;
@@ -50,11 +49,11 @@
*/
public static void main(String[] args) throws IOException {
int nInFiles = 100;
- aMass = 0.15;
- _ecm = 2.2;
+ aMass = 0.040;
+ _ecm = 1.1;
_declength = 0;//mm
- sigx = 0.02;
sigy = 0.2;
+ sigz = 0.02;
trident=true;
String postfix = "_20ux200u_beamspot_gammactau_0cm.stdhep";
@@ -64,11 +63,11 @@
// String fDir="/nfs/slac/g/hps/mgraham/DarkPhoton/tvm/trident/full/";
// String fileLabel = "full6.6gev";
- String fDir = "/nfs/slac/g/hps/mgraham/DarkPhoton/MadGraph/Events2pt2Ap150MeV/";
- String fileLabel = "ap2.2gev150mevall";
+ String fDir = "/nfs/slac/g/hps/mgraham/DarkPhoton/MadGraph/Events1pt1Ap40MeV/";
+ String fileLabel = "ap1.1gev40mevall";
- String inLabel = "W2pt2GeV_Ap150MeV_";
+ String inLabel = "W1pt1GeV_Ap40MeV_";
String inPost = "_unweighted_events.lhe";
hps-java/src/main/java/org/lcsim/HPSDedicated
diff -u -r1.2 -r1.3
--- TrackerHitDriver_DarkPhoton.java 14 Apr 2010 17:17:30 -0000 1.2
+++ TrackerHitDriver_DarkPhoton.java 10 Mar 2011 19:02:47 -0000 1.3
@@ -199,7 +199,8 @@
}
- int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+// int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+ int flag=0;
event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
// event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
hps-java/src/main/java/org/lcsim/HPSDedicatedv3
diff -u -r1.1 -r1.2
--- TrackerHitDriver_DarkPhoton.java 17 Jun 2010 00:31:45 -0000 1.1
+++ TrackerHitDriver_DarkPhoton.java 10 Mar 2011 19:02:47 -0000 1.2
@@ -206,7 +206,8 @@
}
- int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+// int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+ int flag=0;
event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
// event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
hps-java/src/main/java/org/lcsim/DarkPhoton
diff -u -r1.3 -r1.4
--- TrackerHitDriver_DarkPhoton.java 29 Mar 2010 15:33:18 -0000 1.3
+++ TrackerHitDriver_DarkPhoton.java 10 Mar 2011 19:02:47 -0000 1.4
@@ -196,7 +196,8 @@
}
- int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+// int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+ int flag=0;
event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
hps-java/src/main/resources
diff -u -r1.2 -r1.3
--- HPS-Test-1pt3.xml 10 Feb 2011 19:35:24 -0000 1.2
+++ HPS-Test-1pt3.xml 10 Mar 2011 19:02:47 -0000 1.3
@@ -12,10 +12,10 @@
<MaxChisq>2500.0</MaxChisq>
<BadHitChisq>1000.0</BadHitChisq>
-->
- <MaxDCA>100.0</MaxDCA>
- <MaxZ0>500.0</MaxZ0>
- <MaxChisq>500.0</MaxChisq>
- <BadHitChisq>250.0</BadHitChisq>
+ <MaxDCA>10.0</MaxDCA>
+ <MaxZ0>50.0</MaxZ0>
+ <MaxChisq>50.0</MaxChisq>
+ <BadHitChisq>25.0</BadHitChisq>
<!--Layers-->
<Layers>
hps-java/src/main/java/org/lcsim/HPSDedicatedv2
diff -u -r1.1 -r1.2
--- TrackerHitDriver_DarkPhoton.java 21 Apr 2010 17:16:44 -0000 1.1
+++ TrackerHitDriver_DarkPhoton.java 10 Mar 2011 19:02:47 -0000 1.2
@@ -206,7 +206,8 @@
}
- int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+// int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+ int flag=0;
event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
// event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
hps-java/src/main/java/org/lcsim/DarkPhoton_SAS
diff -u -r1.1 -r1.2
--- TrackerHitDriver_DarkPhoton.java 24 Jan 2010 21:14:16 -0000 1.1
+++ TrackerHitDriver_DarkPhoton.java 10 Mar 2011 19:02:47 -0000 1.2
@@ -197,7 +197,8 @@
}
- int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+// int flag = (1 << LCIOConstants.RTHBIT_HITS | 1 << LCIOConstants.TRAWBIT_ID1); //correct flag for persistence
+ int flag=0;
event.put(getRawHitsName(), raw_hits, RawTrackerHit.class, flag, toString());
event.put(getStripHits1DName(), hits_strip1D, SiTrackerHitStrip1D.class, 0, toString());
event.put(getPixelHitsName(), hits_pixel, SiTrackerHitPixel.class, 0, toString());
CVSspam 0.2.8
