Commit in lcsim/src/org/lcsim/recon/tracking/seedtracker on MAIN | |||
MaterialManager.java | +11 | -2 | 1.14 -> 1.15 |
Added HPSTracker to MaterialManager
diff -u -r1.14 -r1.15 --- MaterialManager.java 16 Nov 2011 17:55:51 -0000 1.14 +++ MaterialManager.java 25 Jan 2012 19:07:51 -0000 1.15 @@ -33,6 +33,7 @@
import org.lcsim.geometry.subdetector.SiTrackerEndcap2; import org.lcsim.geometry.subdetector.SiTrackerFixedTarget2; import org.lcsim.geometry.subdetector.SiTrackerSpectrometer;
+import org.lcsim.geometry.subdetector.HPSTracker;
/** * Rewrite and refactor of Rich's {@link MaterialManager} class to handle Subdetector types.
@@ -42,7 +43,7 @@
* @author Jeremy McCormick * @author Matt Graham *
- * @version $Id: MaterialManager.java,v 1.14 2011/11/16 17:55:51 mgraham Exp $
+ * @version $Id: MaterialManager.java,v 1.15 2012/01/25 19:07:51 mgraham Exp $
*/ public class MaterialManager {
@@ -218,6 +219,7 @@
SubdetectorVolumeGrouper endcap2Grouper = new SiTrackerEndap2VolumeGrouper(); subdetGroups.put(SiTrackerEndcap2.class, endcap2Grouper); subdetGroups.put(SiTrackerSpectrometer.class, endcap2Grouper);
+ subdetGroups.put(HPSTracker.class, endcap2Grouper);
// SiTrackerFixedTarget2. subdetGroups.put(SiTrackerFixedTarget2.class, new SiTrackerFixedTarget2VolumeGrouper());
@@ -391,7 +393,8 @@
System.out.println("Treating as a XPlane...x0: " + vgi.X0 + "| zmin: " + vgi.zmin + "| zmax: " + vgi.zmax + "| vtot: " + vtot + "| thickness: " + thickness + "| rmin: " + vgi.rmin +
- "| rmax: " + vgi.rmax);
+ "| rmax: " + vgi.rmax+
+ "| xmin: "+vgi.xmin+"| xmax: "+vgi.xmax);
System.out.println(); } if(x>0.1)
@@ -697,6 +700,12 @@
double r = Math.sqrt(transformed.x() * transformed.x() + transformed.y() * transformed.y()); vi.rmin = Math.min(vi.rmin, r); vi.rmax = Math.max(vi.rmax, r);
+ //mg 1/23/12 also store ymin,ymax + vi.ymin = Math.min(transformed.y(), vi.ymin); + vi.ymax = Math.max(transformed.y(), vi.ymax); + vi.xmin = Math.min(transformed.x(), vi.xmin); + vi.xmax = Math.max(transformed.x(), vi.xmax); +
} }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1