20 modified files
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.14 -r1.15
--- AbstractPolyhedraCalorimeter.java 30 Nov 2010 00:16:29 -0000 1.14
+++ AbstractPolyhedraCalorimeter.java 3 Dec 2010 01:21:38 -0000 1.15
@@ -16,7 +16,7 @@
* @see org.lcsim.geometry.subdetector.AbstractCalorimeter
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: AbstractPolyhedraCalorimeter.java,v 1.14 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: AbstractPolyhedraCalorimeter.java,v 1.15 2010/12/03 01:21:38 jeremy Exp $
*/
// TODO Remove duplicate methods (e.g. methods added for Pandora output).
public class AbstractPolyhedraCalorimeter extends AbstractCalorimeter
@@ -33,7 +33,7 @@
nsides = dimensions.getAttribute( "numsides" ).getIntValue();
sectionPhi = ( 2. * PI ) / ( ( double ) nsides );
-
+
// Additional parameters are read by subclasses.
}
@@ -46,7 +46,7 @@
{
return sectionPhi;
}
-
+
public double getZLength()
{
return zlength;
@@ -56,7 +56,7 @@
{
return innerZ;
}
-
+
public double getOuterZ()
{
return outerZ;
@@ -66,7 +66,7 @@
{
return outerRadius;
}
-
+
public double getInnerRadius()
{
return innerRadius;
@@ -74,7 +74,7 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( this.getDetectorElement(), factory, heprep, true );
+ // Let subclasses implement this.
}
// Old HepRep method. Keep here for reference. --JM
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.11 -r1.12
--- AbstractSubdetector.java 30 Nov 2010 00:16:29 -0000 1.11
+++ AbstractSubdetector.java 3 Dec 2010 01:21:39 -0000 1.12
@@ -6,6 +6,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
import org.lcsim.geometry.HepRepProvider;
/**
@@ -13,7 +14,7 @@
* org.lcsim.geometry.subdetector implementation classes.
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: AbstractSubdetector.java,v 1.11 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: AbstractSubdetector.java,v 1.12 2010/12/03 01:21:39 jeremy Exp $
*/
abstract class AbstractSubdetector extends org.lcsim.geometry.compact.Subdetector implements HepRepProvider
{
@@ -29,13 +30,19 @@
* HepRepProvider: optional impl for subclass
*/
public void appendHepRep( HepRepFactory factory, HepRep heprep )
- {}
+ {
+ // Let subclasses implement this.
+
+ // TODO Generic implementation. Requires depth on VisAttributes.
+ // DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, getVisAttributes().getDepth(), isEndcap(), getVisAttributes().getColor() );
+ }
/**
* Assign color to subdetector HepRep if there are VisAttributes.
*
* @param type The HepRepType for this subdetector.
*/
+ /*
protected void setHepRepColor( HepRepType type )
{
if ( getVisAttributes() != null )
@@ -43,4 +50,5 @@
type.addAttValue( "color", getVisAttributes().getColor() );
}
}
+ */
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.9 -r1.10
--- AbstractTestBeam.java 30 Nov 2010 00:16:29 -0000 1.9
+++ AbstractTestBeam.java 3 Dec 2010 01:21:39 -0000 1.10
@@ -14,7 +14,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: AbstractTestBeam.java,v 1.9 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: AbstractTestBeam.java,v 1.10 2010/12/03 01:21:39 jeremy Exp $
*/
public abstract class AbstractTestBeam extends AbstractLayeredSubdetector
{
@@ -140,9 +140,12 @@
HepRepType ec = typeTree.getType( "Endcap" );
HepRepType type = factory.createHepRepType( ec, getName() );
- type.addAttValue( "drawAs", "Prism" );
-
- setHepRepColor( type );
+
+ // Set color.
+ type.addAttValue( "color", getVisAttributes().getColor() );
+
+ // Set shape.
+ type.addAttValue( "drawAs", "Prism" );
HepRepInstance instance = factory.createHepRepInstance( instanceTree, type );
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.3 -r1.4
--- AbstractTracker.java 30 Nov 2010 00:16:29 -0000 1.3
+++ AbstractTracker.java 3 Dec 2010 01:21:39 -0000 1.4
@@ -6,13 +6,13 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: AbstractTracker.java,v 1.3 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: AbstractTracker.java,v 1.4 2010/12/03 01:21:39 jeremy Exp $
*/
abstract class AbstractTracker extends AbstractLayeredSubdetector implements Tracker
{
public AbstractTracker( Element node ) throws JDOMException
{
- super( node );
+ super( node );
}
public boolean isTracker()
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.12 -r1.13
--- CylindricalBarrelCalorimeter.java 30 Nov 2010 00:16:29 -0000 1.12
+++ CylindricalBarrelCalorimeter.java 3 Dec 2010 01:21:39 -0000 1.13
@@ -9,6 +9,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
/**
*
@@ -41,12 +42,15 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 1, false, getVisAttributes().getColor() );
+ /*
HepRepInstanceTree instanceTree = heprep.getInstanceTreeTop( "Detector", "1.0" );
HepRepTypeTree typeTree = heprep.getTypeTree( "DetectorType", "1.0" );
HepRepType barrel = typeTree.getType( "Barrel" );
HepRepType type = factory.createHepRepType( barrel, getName() );
type.addAttValue( "drawAs", "Cylinder" );
+ //type.addAttValue( "color", getVisAttributes().getColor() );
setHepRepColor( type );
@@ -59,6 +63,7 @@
instance2.addAttValue( "radius", getOuterRadius() );
factory.createHepRepPoint( instance2, 0, 0, getZMin() );
factory.createHepRepPoint( instance2, 0, 0, getZMax() );
+ */
}
public double getZLength()
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.21 -r1.22
--- CylindricalEndcapCalorimeter.java 30 Nov 2010 00:16:29 -0000 1.21
+++ CylindricalEndcapCalorimeter.java 3 Dec 2010 01:21:39 -0000 1.22
@@ -8,6 +8,7 @@
import hep.graphics.heprep.HepRepTypeTree;
import org.jdom.Element;
import org.jdom.JDOMException;
+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
import org.lcsim.geometry.segmentation.GridXYZ;
/**
@@ -41,13 +42,16 @@
}
public void appendHepRep( HepRepFactory factory, HepRep heprep )
- {
+ {
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, true, getVisAttributes().getColor() );
+ /*
HepRepInstanceTree instanceTree = heprep.getInstanceTreeTop( "Detector", "1.0" );
HepRepTypeTree typeTree = heprep.getTypeTree( "DetectorType", "1.0" );
HepRepType endcap = typeTree.getType( "Endcap" );
HepRepType type = factory.createHepRepType( endcap, getName() );
type.addAttValue( "drawAs", "Cylinder" );
+ //type.addAttValue( "color", getVisAttributes().getColor() );
setHepRepColor( type );
@@ -68,6 +72,7 @@
break;
flip = -1;
}
+ */
}
/**
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.13 -r1.14
--- DiskTracker.java 30 Nov 2010 00:16:29 -0000 1.13
+++ DiskTracker.java 3 Dec 2010 01:21:39 -0000 1.14
@@ -17,7 +17,7 @@
/**
* @author Tony Johnson
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: DiskTracker.java,v 1.13 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: DiskTracker.java,v 1.14 2010/12/03 01:21:39 jeremy Exp $
*/
public class DiskTracker extends AbstractTracker
{
@@ -112,7 +112,7 @@
HepRepType type = factory.createHepRepType( endcap, getName() );
type.addAttValue( "drawAs", "Cylinder" );
- setHepRepColor( type );
+ type.addAttValue( "color", getVisAttributes().getColor() );
double flip = 1;
for ( ;; )
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.10 -r1.11
--- EcalBarrel.java 30 Nov 2010 00:16:29 -0000 1.10
+++ EcalBarrel.java 3 Dec 2010 01:21:39 -0000 1.11
@@ -9,7 +9,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: EcalBarrel.java,v 1.10 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: EcalBarrel.java,v 1.11 2010/12/03 01:21:39 jeremy Exp $
*/
public class EcalBarrel extends PolyhedraBarrelCalorimeter
{
@@ -20,6 +20,6 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false );
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false, getVisAttributes().getColor() );
}
}
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.15 -r1.16
--- MultiLayerTracker.java 30 Nov 2010 00:16:29 -0000 1.15
+++ MultiLayerTracker.java 3 Dec 2010 01:21:39 -0000 1.16
@@ -98,10 +98,10 @@
HepRepType barrel = typeTree.getType( "Barrel" );
HepRepType type = factory.createHepRepType( barrel, getName() );
+
type.addAttValue( "drawAs", "Cylinder" );
-
- setHepRepColor( type );
-
+ type.addAttValue( "color", getVisAttributes().getColor() );
+
for ( int i = 0; i < innerR.length; i++ )
{
HepRepInstance instance = factory.createHepRepInstance( instanceTree, type );
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.13 -r1.14
--- PolyhedraBarrelCalorimeter.java 30 Nov 2010 00:16:29 -0000 1.13
+++ PolyhedraBarrelCalorimeter.java 3 Dec 2010 01:21:39 -0000 1.14
@@ -9,7 +9,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: PolyhedraBarrelCalorimeter.java,v 1.13 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: PolyhedraBarrelCalorimeter.java,v 1.14 2010/12/03 01:21:39 jeremy Exp $
*/
public class PolyhedraBarrelCalorimeter extends AbstractPolyhedraCalorimeter
{
@@ -32,6 +32,6 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false );
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false, getVisAttributes().getColor() );
}
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.3 -r1.4
--- PolyhedraBarrelCalorimeter2.java 30 Nov 2010 00:16:29 -0000 1.3
+++ PolyhedraBarrelCalorimeter2.java 3 Dec 2010 01:21:39 -0000 1.4
@@ -14,7 +14,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: PolyhedraBarrelCalorimeter2.java,v 1.3 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: PolyhedraBarrelCalorimeter2.java,v 1.4 2010/12/03 01:21:39 jeremy Exp $
*/
public class PolyhedraBarrelCalorimeter2 extends AbstractPolyhedraCalorimeter
{
@@ -37,6 +37,6 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false );
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false, getVisAttributes().getColor() );
}
}
\ No newline at end of file
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.17 -r1.18
--- PolyhedraEndcapCalorimeter.java 30 Nov 2010 00:16:29 -0000 1.17
+++ PolyhedraEndcapCalorimeter.java 3 Dec 2010 01:21:39 -0000 1.18
@@ -14,7 +14,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: PolyhedraEndcapCalorimeter.java,v 1.17 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: PolyhedraEndcapCalorimeter.java,v 1.18 2010/12/03 01:21:39 jeremy Exp $
*/
public class PolyhedraEndcapCalorimeter extends AbstractPolyhedraCalorimeter
{
@@ -44,7 +44,7 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, true );
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, true, getVisAttributes().getColor() );
/*
* HepRepInstanceTree instanceTree = heprep.getInstanceTreeTop("Detector", "1.0");
* HepRepTypeTree typeTree = heprep.getTypeTree("DetectorType", "1.0"); HepRepType
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.10 -r1.11
--- PolyhedraEndcapCalorimeter2.java 30 Nov 2010 00:16:29 -0000 1.10
+++ PolyhedraEndcapCalorimeter2.java 3 Dec 2010 01:21:39 -0000 1.11
@@ -9,7 +9,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: PolyhedraEndcapCalorimeter2.java,v 1.10 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: PolyhedraEndcapCalorimeter2.java,v 1.11 2010/12/03 01:21:39 jeremy Exp $
*/
public class PolyhedraEndcapCalorimeter2 extends AbstractPolyhedraCalorimeter
{
@@ -36,7 +36,7 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( this.getDetectorElement(), factory, heprep, 2, true );
+ DetectorElementToHepRepConverter.convert( this.getDetectorElement(), factory, heprep, 2, true, getVisAttributes().getColor() );
}
/*
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.16 -r1.17
--- SiTrackerBarrel.java 30 Nov 2010 00:16:29 -0000 1.16
+++ SiTrackerBarrel.java 3 Dec 2010 01:21:39 -0000 1.17
@@ -16,7 +16,7 @@
* @see org.lcsim.detector.tracker.silicon
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: SiTrackerBarrel.java,v 1.16 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: SiTrackerBarrel.java,v 1.17 2010/12/03 01:21:39 jeremy Exp $
*/
public class SiTrackerBarrel extends AbstractTracker
{
@@ -27,7 +27,8 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false );
+ // Display layer envelopes.
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 2, false, getVisAttributes().getColor() );
}
public boolean isBarrel()
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.10 -r1.11
--- SiTrackerEndcap.java 30 Nov 2010 00:16:29 -0000 1.10
+++ SiTrackerEndcap.java 3 Dec 2010 01:21:39 -0000 1.11
@@ -9,7 +9,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $$Id: SiTrackerEndcap.java,v 1.10 2010/11/30 00:16:29 jeremy Exp $$
+ * @version $$Id: SiTrackerEndcap.java,v 1.11 2010/12/03 01:21:39 jeremy Exp $$
*/
public class SiTrackerEndcap extends AbstractTracker
{
@@ -25,6 +25,7 @@
public void appendHepRep(HepRepFactory factory, HepRep heprep)
{
- DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 2, true);
+ // Display layer envelopes.
+ DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 2, true, getVisAttributes().getColor() );
}
}
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.4 -r1.5
--- SiTrackerEndcap2.java 14 Apr 2010 02:29:19 -0000 1.4
+++ SiTrackerEndcap2.java 3 Dec 2010 01:21:39 -0000 1.5
@@ -5,6 +5,7 @@
import org.jdom.Element;
import org.jdom.JDOMException;
+import org.lcsim.detector.converter.heprep.DetectorElementToHepRepConverter;
public class SiTrackerEndcap2 extends AbstractTracker
{
@@ -15,8 +16,7 @@
public void appendHepRep(HepRepFactory factory, HepRep heprep)
{
- // Use "HitModules" collection instead. No layer components to display, anyways. --JM
- // DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 2, true);
+ //DetectorElementToHepRepConverter.convert(getDetectorElement(), factory, heprep, 4, true, getVisAttributes().getColor() );
}
public boolean isEndcap()
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.4 -r1.5
--- SiTrackerFixedTarget.java 30 Nov 2010 00:16:29 -0000 1.4
+++ SiTrackerFixedTarget.java 3 Dec 2010 01:21:39 -0000 1.5
@@ -17,7 +17,7 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
// System.out.println("Have a FixedTarget element");
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 4, false );
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 4, false, getVisAttributes().getColor() );
}
public boolean isEndcap()
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.4 -r1.5
--- SiTrackerFixedTarget2.java 30 Nov 2010 00:16:29 -0000 1.4
+++ SiTrackerFixedTarget2.java 3 Dec 2010 01:21:39 -0000 1.5
@@ -16,7 +16,7 @@
public void appendHepRep( HepRepFactory factory, HepRep heprep )
{
- DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 4, false );
+ DetectorElementToHepRepConverter.convert( getDetectorElement(), factory, heprep, 4, false, getVisAttributes().getColor() );
}
public boolean isEndcap()
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.5 -r1.6
--- TPC.java 30 Nov 2010 00:16:29 -0000 1.5
+++ TPC.java 3 Dec 2010 01:21:39 -0000 1.6
@@ -17,7 +17,7 @@
/**
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: TPC.java,v 1.5 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: TPC.java,v 1.6 2010/12/03 01:21:39 jeremy Exp $
*/
public class TPC extends AbstractCylindricalTracker
{
@@ -39,10 +39,10 @@
HepRepType barrel = typeTree.getType( "Barrel" );
HepRepType type = factory.createHepRepType( barrel, getName() );
+
type.addAttValue( "drawAs", "Cylinder" );
-
- setHepRepColor( type );
-
+ type.addAttValue( "color", getVisAttributes().getColor() );
+
HepRepInstance instance = factory.createHepRepInstance( instanceTree, type );
instance.addAttValue( "radius", getInnerRadius() );
factory.createHepRepPoint( instance, 0, 0, getZMin() );
GeomConverter/src/org/lcsim/geometry/subdetector
diff -u -r1.3 -r1.4
--- TubeSegment.java 30 Nov 2010 00:16:29 -0000 1.3
+++ TubeSegment.java 3 Dec 2010 01:21:39 -0000 1.4
@@ -19,7 +19,7 @@
/**
*
* @author Jeremy McCormick
- * @version $Id: TubeSegment.java,v 1.3 2010/11/30 00:16:29 jeremy Exp $
+ * @version $Id: TubeSegment.java,v 1.4 2010/12/03 01:21:39 jeremy Exp $
*/
public class TubeSegment extends AbstractSubdetector
@@ -103,7 +103,9 @@
HepRepType barrel = typeTree.getType( "Barrel" );
HepRepType type = factory.createHepRepType( barrel, getName() );
+
type.addAttValue( "drawAs", "Cylinder" );
+ type.addAttValue( "color", getVisAttributes().getColor() );
double zmin = -zhalf;
double zmax = zhalf;
CVSspam 0.2.8
