lcsim/src/org/lcsim/recon/tracking/seedtracker
diff -u -r1.19 -r1.20
--- MaterialManager.java 29 May 2012 17:32:19 -0000 1.19
+++ MaterialManager.java 16 May 2013 17:58:31 -0000 1.20
@@ -44,7 +44,7 @@
* @author Jeremy McCormick
* @author Matt Graham
*
- * @version $Id: MaterialManager.java,v 1.19 2012/05/29 17:32:19 mgraham Exp $
+ * @version $Id: MaterialManager.java,v 1.20 2013/05/16 17:58:31 ngraf Exp $
*/
public class MaterialManager
{
@@ -60,6 +60,8 @@
private static double _rmax;
private static double _zmax = 1800.;
private static ITransform3D _detToTrk;
+
+ private boolean _useDefaultXPlanes = true;
/**
* VolumeGroup handlers for Subdetector types.
*/
@@ -270,6 +272,11 @@
{
this.DEBUG = debug;
}
+
+ public void setDefaultXPlaneUsage(boolean useDefault)
+ {
+ _useDefaultXPlanes = useDefault;
+ }
/**
* Setup tracking volume parameters.
@@ -431,8 +438,15 @@
"| xmin: "+vgi.xmin+"| xmax: "+vgi.xmax);
System.out.println();
}
+ if(!_useDefaultXPlanes)
+ {
if(x>0.1)
_matxpl.add(new MaterialXPlane(vgi.ymin,vgi.ymax, vgi.zmin, vgi.zmax, x, thickness));
+ }
+ else
+ {
+ _matxpl.add(new MaterialXPlane(vgi.ymin,vgi.ymax, vgi.zmin, vgi.zmax, x, thickness));
+ }
}
else if(isCylinder(vgi.rmin, vgi.rmax, vgi.zmin, vgi.zmax))
{
@@ -523,11 +537,18 @@
private boolean isXPlane(double xmin, double xmax)
{
+ if(!_useDefaultXPlanes)
+ {
if(xmax-xmin<0)
return false; //be default xmax is negative, xmin is positive
if(xmax+xmin<50)
return false; //catch short modules...
return (xmax-xmin)<50.0;//5cm...
+ }
+ else
+ {
+ return (xmax-xmin)<1.0;//1mm
+ }
}
public void setTransform(ITransform3D transform) {
lcsim/src/org/lcsim/recon/tracking/seedtracker
diff -u -r1.21 -r1.22
--- SeedTracker.java 1 May 2013 17:58:18 -0000 1.21
+++ SeedTracker.java 16 May 2013 17:58:31 -0000 1.22
@@ -32,7 +32,7 @@
protected List<SeedStrategy> _strategylist;
protected ISeedTrackerDiagnostics _diag = null;
- protected MaterialManager _materialmanager;
+ protected MaterialManager _materialmanager = new MaterialManager();
protected HitManager _hitmanager;
protected HelixFitter _helixfitter;
protected SeedTrackFinder _finder;
@@ -57,7 +57,7 @@
_strategylist = strategylist;
// Instantiate the material manager
- _materialmanager = new MaterialManager();
+ // _materialmanager = new MaterialManager();
// Instantiate the hit manager
_hitmanager = new HitManager();
@@ -283,4 +283,10 @@
public void setIterativeConfirmed(int maxfits) {
this._iterativeConfirmedFits = maxfits;
}
+
+ public void setUseDefaultXPlane(boolean useDefault)
+ {
+ _materialmanager.setDefaultXPlaneUsage(useDefault);
+
+ }
}
lcsim/src/org/lcsim/recon/tracking/seedtracker
diff -u -r1.1 -r1.2
--- IterativeSeedTracker.java 20 Jul 2010 17:51:36 -0000 1.1
+++ IterativeSeedTracker.java 16 May 2013 17:58:31 -0000 1.2
@@ -21,7 +21,7 @@
_strategyLists = new ArrayList<List<SeedStrategy>>();
// Instantiate the material manager
- _materialmanager = new MaterialManager();
+ // _materialmanager = new MaterialManager();
// Instantiate the hit manager
_hitmanager = new HitManager();