lcd/hep/lcd/recon/tracking
diff -u -r1.3 -r1.4
--- RadLengths.java 24 Apr 2001 19:50:34 -0000 1.3
+++ RadLengths.java 10 Aug 2005 20:22:47 -0000 1.4
@@ -29,7 +29,7 @@
this.put("g10",new Double(19.4));
this.put("pb",new Double(0.56));
this.put("polystyrene",new Double(42.4));
- this.put("polystyrenefoam",new Double(683.7));
+ this.put("polystyrenefoam",new Double(783.9));
this.put("si",new Double(9.36));
this.put("w",new Double(0.35));
this.put("ti",new Double(3.563));
@@ -54,7 +54,9 @@
this.put("lif",new Double(14.91));
this.put("naf",new Double(11.68));
this.put("nai",new Double(2.59));
- this.put("silica",new Double(150.));
+ this.put("silica",new Double(150.));
+ this.put("carbonfiber",new Double(24.2));
+ this.put("rohacell31",new Double(1380.));
}
public RadLengths(int ne)
lcd/hep/lcd/recon/tracking
diff -u -r1.3 -r1.4
--- ReconstructedTrack.java 31 May 2004 19:58:37 -0000 1.3
+++ ReconstructedTrack.java 10 Aug 2005 20:22:47 -0000 1.4
@@ -21,6 +21,7 @@
public TrkExtrap extrap;
public double errmatrix[][];
public double Chi2;
+ public double unfChi2;
public double NDF;
public boolean Fitted = false;
public MCParticle mcp = null;
@@ -59,6 +60,7 @@
this.Fitted = tracker.fitSuccess(it);
this.mcp = tracker.getMCParticle(it);
this.frmcps = tracker.getFrHtsSameMC(it);
+ this.unfChi2 = ((TrackFinder) tracker.getFinder()).getUnfitChi2(it);
if(Fitted)
this.errmatrix = tracker.getErrMatr(it);
}
@@ -245,6 +247,11 @@
{
return NDF;
}
+
+ public double getUnfitChi2()
+ {
+ return unfChi2;
+ }
/**
* print the current values of track parameters and errors
lcd/hep/lcd/recon/tracking
diff -u -r1.2 -r1.3
--- TrackFinder.java 26 Mar 2002 18:28:25 -0000 1.2
+++ TrackFinder.java 10 Aug 2005 20:22:47 -0000 1.3
@@ -55,6 +55,8 @@
public int[] getTrkPnts(int itrk);
public double getChi2(int itrk);
+
+ public double getUnfitChi2(int itrk);
public double getNDF(int itrk);