Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN | |||
MaterialSupervisor.java | +12 | -16 | 1.1 -> 1.2 |
Cleaned up.
diff -u -r1.1 -r1.2 --- MaterialSupervisor.java 12 Jul 2013 20:46:10 -0000 1.1 +++ MaterialSupervisor.java 12 Sep 2013 17:56:34 -0000 1.2 @@ -4,27 +4,29 @@
*/ package org.lcsim.hps.recon.tracking;
-import com.sun.org.apache.bcel.internal.Constants;
import hep.physics.vec.BasicHep3Vector; import hep.physics.vec.Hep3Vector; import hep.physics.vec.VecOp;
+
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map; -import org.lcsim.detector.*; -import org.lcsim.detector.identifier.IIdentifier; -import org.lcsim.detector.identifier.Identifier;
+ +import org.lcsim.detector.IDetectorElement; +import org.lcsim.detector.IGeometryInfo; +import org.lcsim.detector.ILogicalVolume; +import org.lcsim.detector.IPhysicalVolume; +import org.lcsim.detector.IPhysicalVolumeContainer; +import org.lcsim.detector.ITransform3D; +import org.lcsim.detector.Translation3D;
import org.lcsim.detector.material.IMaterial; import org.lcsim.detector.solids.Box; import org.lcsim.detector.solids.ISolid; import org.lcsim.detector.solids.Polygon3D;
-import org.lcsim.detector.tracker.silicon.*; -import org.lcsim.fit.helicaltrack.HelicalTrackFit;
+import org.lcsim.detector.tracker.silicon.ChargeCarrier; +import org.lcsim.detector.tracker.silicon.SiSensor; +import org.lcsim.detector.tracker.silicon.SiTrackerModule;
import org.lcsim.geometry.Detector; import org.lcsim.hps.event.HPSTransformations;
-import org.lcsim.recon.tracking.seedtracker.MaterialXPlane; -import org.lcsim.recon.tracking.vsegment.transform.Transformation3D;
@@ -35,11 +37,7 @@
*/ public class MaterialSupervisor extends MaterialManager {
- private final static List<MaterialXPlane> _emptyMaterialXPlaneList = new ArrayList<MaterialXPlane>();
private List<ScatteringDetectorVolume> _detectorVolumes = new ArrayList<ScatteringDetectorVolume>();
- private Hep3Vector _bfield = new BasicHep3Vector(0,0,0); - private final static double _X0_Si = 93.7; //mm - private final static double _X0_C = 213.5; //mm
private HPSTransformations _detToTrk = new HPSTransformations();
@@ -58,7 +56,6 @@
public List<ScatteringDetectorVolume> getMaterialVolumes() { return _detectorVolumes;
- //return this._includeMS ? super.getMaterialXPlanes() : _emptyMaterialXPlaneList;
} @Override
@@ -184,7 +181,6 @@
ILogicalVolume logicalVolume = daughter.getLogicalVolume(); IMaterial material = logicalVolume.getMaterial(); String name = material.getName();
- double density = material.getDensity()/1000.0; // [g/mm3]
double X0 = 10.0* material.getRadiationLength()/material.getDensity(); Box solid = (Box) logicalVolume.getSolid(); //System.out.printf("%s x %f y %f z %f box\n",this.getClass().getSimpleName(),solid.getXHalfLength(),solid.getYHalfLength(),solid.getZHalfLength());
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