lcsim/src/org/lcsim/util/heprep
diff -u -r1.6 -r1.7
--- ZvVertexConverter.java 31 Jan 2006 09:23:30 -0000 1.6
+++ ZvVertexConverter.java 31 Jan 2006 23:20:04 -0000 1.7
@@ -36,7 +36,7 @@
private static final double[] zero = { 0,0,0 };
public ZvVertexConverter() {
ColorMap cm = new RainbowColorMap();
- colors = new Color[20];
+ colors = new Color[11];
for (int i=0; i<colors.length; i++) colors[i] = cm.getColor(((double) i)/colors.length,1);
}
@@ -76,19 +76,25 @@
// typeY.addAttDef("dedX","de/Dx", "physics", "");
int iColor = 0;
+ HepRepType typeY = factory.createHepRepType(typeTree, name+"Tracks");
+ typeY.addAttValue("layer", LCSimHepRepConverter.PARTICLES_LAYER);
+ typeY.addAttValue("drawAs", "Line");
+
for (ZvVertex vtx : (List<ZvVertex>) collection) {
Color vertexColor = colors[iColor];
- iColor = (iColor+1) % colors.length;
+ iColor = (iColor+2) % colors.length;
SpacePoint pos = vtx.getPosition();
HepRepInstance instanceV = factory.createHepRepInstance(instanceTree, typeX);
instanceV.addAttValue("nTracks", vtx.getNumTracks());
+ instanceV.addAttValue("color", vertexColor);
+ instanceV.addAttValue("fillColor", vertexColor);
HepRepPoint pp = factory.createHepRepPoint(instanceV, pos.x(), pos.y(), pos.z());
for (ZvTrack iTrack : vtx.getVtxTracks()) {
helix.setTrack(iTrack);
double distanceToCylinder = helix.getDistanceToCylinder(trackingRMax,trackingZMax);
- HepRepInstance instanceT = factory.createHepRepInstance(instanceV, typeX);
+ HepRepInstance instanceT = factory.createHepRepInstance(instanceV, typeY);
double pt = field[2]*Constants.fieldConversion/Math.abs(iTrack.getTrackParameter(2));
instanceT.addAttValue("pT",pt);
instanceT.addAttValue("dedX", iTrack.getdEdx());
lcsim/src/org/lcsim/recon/vertexing/zvtop4
diff -u -r1.23 -r1.24
--- ZvTop.java 8 Nov 2005 17:04:32 -0000 1.23
+++ ZvTop.java 31 Jan 2006 23:20:05 -0000 1.24
@@ -99,7 +99,7 @@
private Map<ZvMaximum, Set<ZvMaximum>> isResolvedFromMap;
// Number of points to check along the line from point 1 to point 2
- int iterationMax = 300;
+ int iterationMax = 3;
// stores the f_i(r)*f_j(r), which are later translated into the
// V(r_ij)