graxml-commit Mailing List for GraXML (Page 4)
Brought to you by:
hrivnac
Menu
▾
▴
graxml-commit — CVS commit notifications of GraXML
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(6) |
Jun
(2) |
Jul
|
Aug
(12) |
Sep
(32) |
Oct
(41) |
Nov
(16) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(10) |
Mar
(3) |
Apr
(3) |
May
(10) |
Jun
(12) |
Jul
|
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(169) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(100) |
Nov
(14) |
Dec
(10) |
| 2008 |
Jan
(37) |
Feb
(4) |
Mar
(10) |
Apr
(73) |
May
(22) |
Jun
(8) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julius H. <hr...@us...> - 2008-04-29 14:36:33
|
Update of /cvsroot/graxml/Graphics/GraXML/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16319 Modified Files: GraXML.jnlp Log Message: javadoc cleaned Index: GraXML.jnlp =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/GraXML.jnlp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GraXML.jnlp 5 Feb 2008 15:29:36 -0000 1.14 --- GraXML.jnlp 29 Apr 2008 14:36:24 -0000 1.15 *************** *** 33,36 **** --- 33,38 ---- <jar href="jars/log4j-1.2.8.jar" download="eager"/> <jar href="jars/xercesImpl.jar" download="eager"/> + <jar href="jars/atlantis.jar" download="eager"/> + <jar href="jars/commons-cli-1.0.jar" download="eager"/> <extension href="http://download.java.net/media/java3d/webstart/release/java3d-1.5.1.jnlp"/> </resources> |
|
From: Julius H. <hr...@us...> - 2008-04-29 14:36:32
|
Update of /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/Test In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16319/net/hep/graphics/GraXML/FrontEnd/Test Modified Files: TestGraXMLThread.java Log Message: javadoc cleaned Index: TestGraXMLThread.java =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/src/net/hep/graphics/GraXML/FrontEnd/Test/TestGraXMLThread.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestGraXMLThread.java 11 Oct 2007 14:41:11 -0000 1.1 --- TestGraXMLThread.java 29 Apr 2008 14:36:24 -0000 1.2 *************** *** 8,11 **** --- 8,14 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/29 14:36:24 hrivnac + * javadoc cleaned + * * Revision 1.1 2007/10/11 14:41:11 hrivnac * connection to Atlantis improved *************** *** 13,16 **** --- 16,23 ---- * </pre> * </font></p> + * @opt attributes + * @opt operations + * @opt types + * @opt visibility * @version $Id$ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ *************** *** 25,27 **** } ! } \ No newline at end of file --- 32,34 ---- } ! } |
|
From: Julius H. <hr...@us...> - 2008-04-29 14:36:05
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15889/org/freehep/j3d Modified Files: package.html Log Message: javadoc cleaned Index: package.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.html 5 Sep 2005 12:16:26 -0000 1.1 --- package.html 29 Apr 2008 14:35:07 -0000 1.2 *************** *** 11,15 **** <br> <img src="doc-files/j3d.gif"> - @status Stable. <hr> <address> --- 11,14 ---- |
|
From: Julius H. <hr...@us...> - 2008-04-29 14:36:02
|
Update of /cvsroot/graxml/Graphics/HEP3D/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16215 Modified Files: build.xml Log Message: javadoc cleaned Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/ant/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 17 Oct 2007 13:18:25 -0000 1.8 --- build.xml 29 Apr 2008 14:35:34 -0000 1.9 *************** *** 179,184 **** <group title="freehep-hep3d" packages="hep.graphics.j3d"/> <group title="freehep-hep3d/geant4" packages="hep.graphics.j3d.geant4"/> ! <link href="http://java.sun.com/j2se/1.6.0/docs/api"/> ! <link href="http://java.sun.com/products/java-media/3D/forDevelopers/J3D_1_3_API/j3dapi"/> <classpath> <path refid="classpath.run"/> --- 179,184 ---- <group title="freehep-hep3d" packages="hep.graphics.j3d"/> <group title="freehep-hep3d/geant4" packages="hep.graphics.j3d.geant4"/> ! <link href="http://java.sun.com/javase/6/docs/api"/> ! <link href="http://download.java.net/media/java3d/javadoc/1.5.0"/> <classpath> <path refid="classpath.run"/> |
|
From: Julius H. <hr...@us...> - 2008-04-29 14:35:22
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4 In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15889/hep/graphics/j3d/geant4 Modified Files: package.html Log Message: javadoc cleaned Index: package.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/geant4/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.html 5 Sep 2005 12:16:26 -0000 1.1 --- package.html 29 Apr 2008 14:35:06 -0000 1.2 *************** *** 10,14 **** <br> <img src="doc-files/geant4.gif"> - @status Stable. <hr> <address> --- 10,13 ---- |
|
From: Julius H. <hr...@us...> - 2008-04-29 14:35:17
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15889/hep/graphics/j3d Modified Files: package.html Log Message: javadoc cleaned Index: package.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/hep/graphics/j3d/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** package.html 5 Sep 2005 12:16:26 -0000 1.1 --- package.html 29 Apr 2008 14:35:05 -0000 1.2 *************** *** 11,15 **** <br> <img src="doc-files/j3d.gif"> - @status Stable. <hr> <address> --- 11,14 ---- |
|
From: Julius H. <hr...@us...> - 2008-04-28 23:04:49
|
Update of /cvsroot/graxml/Graphics/GraXML/doc/Gallery In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25596 Added Files: AtlasGeometry.jpg AtlasGeometry.txt InnerDetectorEvent.jpg InnerDetectorEvent.txt Log Message: Atlantis Geometry added --- NEW FILE: InnerDetectorEvent.txt --- Atlantis Event in Inner Detector --- NEW FILE: AtlasGeometry.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: AtlasGeometry.txt --- Part of Atlas Geometry imported from Atlantis --- NEW FILE: InnerDetectorEvent.jpg --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17300/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java ABarrelCalorimeterDetectorProxy.java ABarrelSiliconDetectorProxy.java ABarrelTRTDetectorProxy.java ABox.java ABoxDetectorProxy.java AEndcapCalorimeterDetectorProxy.java AEndcapCryostat.java AEndcapCryostatDetectorProxy.java AEndcapSiliconDetectorProxy.java AEndcapTRTDetectorProxy.java AGapCalorimeterDetectorProxy.java ATrapezoidDetectorProxy.java ATrd.java Log Message: comments improved Index: ATrd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ATrd.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ATrd.java 27 Apr 2008 21:38:10 -0000 1.2 --- ATrd.java 28 Apr 2008 13:20:26 -0000 1.3 *************** *** 46,49 **** --- 46,52 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/28 13:20:26 hrivnac + * comments improved + * * Revision 1.2 2008/04/27 21:38:10 hrivnac * Muons OK, Cryostat added *************** *** 107,111 **** phi, wI, wO, - zSide, name, name1); } --- 110,113 ---- *************** *** 114,141 **** } - // TBD - static private double calculatePhi(String name, double phi0, int phiIndex) { - String technology = name.substring(0, 3); - if (technology.equals("TGC")) { - if (name.charAt(6) == 'E' && name.charAt(5) != '4') { - return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 24.; - } - else { - return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 12.; - } - } - else { - return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 4.; - } - } - private static int k = 0; private static BranchGroup _g; - private static final Matrix3d UMATRIX = new Matrix3d(1.0, 0.0, 0.0, - 0.0, 1.0, 0.0, - 0.0, 0.0, 1.0); - /** Logging . */ private static Logger log = Logger.getLogger(ATrd.class); --- 116,123 ---- Index: ABarrelCalorimeterDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeterDetectorProxy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABarrelCalorimeterDetectorProxy.java 25 Apr 2008 13:30:46 -0000 1.2 --- ABarrelCalorimeterDetectorProxy.java 28 Apr 2008 13:20:15 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.ABarrelCalorimeterDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/28 13:20:15 hrivnac + * comments improved + * * Revision 1.2 2008/04/25 13:30:46 hrivnac * box and trd prototype added *************** *** 51,63 **** /** Give z-rho projection. * @return The z-rho projection. */ - // TBD: refactor public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 56,61 ---- /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } Index: AGapCalorimeterDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGapCalorimeterDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AGapCalorimeterDetectorProxy.java 17 Apr 2008 22:59:19 -0000 1.1 --- AGapCalorimeterDetectorProxy.java 28 Apr 2008 13:20:26 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.AGapCalorimeterDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:26 hrivnac + * comments improved + * * Revision 1.1 2008/04/17 22:59:19 hrivnac * using Atlantis to get geometry *************** *** 46,56 **** * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 51,55 ---- * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } Index: AEndcapCryostat.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCryostat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapCryostat.java 27 Apr 2008 21:38:04 -0000 1.1 --- AEndcapCryostat.java 28 Apr 2008 13:20:22 -0000 1.2 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:22 hrivnac + * comments improved + * * Revision 1.1 2008/04/27 21:38:04 hrivnac * Muons OK, Cryostat added *************** *** 44,48 **** public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { ! System.out.println("CCCCCCCCCCCCCCCC"); // Set values set(builder, tg, parent); --- 47,51 ---- public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { ! // Set values set(builder, tg, parent); Index: ATrapezoidDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ATrapezoidDetectorProxy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ATrapezoidDetectorProxy.java 27 Apr 2008 21:38:10 -0000 1.2 --- ATrapezoidDetectorProxy.java 28 Apr 2008 13:20:26 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.ATrapezoidDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/28 13:20:26 hrivnac + * comments improved + * * Revision 1.2 2008/04/27 21:38:10 hrivnac * Muons OK, Cryostat added *************** *** 24,42 **** public class ATrapezoidDetectorProxy extends ATrapezoidDetector { ! /** Constructs a new barrel calorimeter prABoxDetectorProxy TBD ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * @param sampling The sampling of this calorimeter part. ! * @param region The region of this calorimeter part. ! * @param rMin The inner radius. ! * @param rMax The outer radius. ! * @param zMin The inner z. ! * @param zMax The outer z. ! * @param eta0 The start of the first cell in eta. ! * @param deta The size of a cell in eta. ! * @param neta The number of cells in eta. ! * @param meta The eta index of the first cell. ! * @param phi0 The start of the first cell in phi. ! * @param nphi The number of cells in phi. */ public ATrapezoidDetectorProxy(String name, double zMin, double zMax, double rMin, double rMax, --- 29,44 ---- public class ATrapezoidDetectorProxy extends ATrapezoidDetector { ! /** Constructs a new muon trapezoid proxy. ! * @param name The name of the object. ! * @param zMin The inner z. ! * @param zMax The outer z. ! * @param rMin The inner radius. ! * @param rMax The outer radius. ! * @param phi The phi. ! * @param sizeS The short size. ! * @param sizeL The long size. ! * @param alpha The trapezoidal angle. ! * @param stationEta The station number in eta. ! * @param stationPhi The station number in phi. */ public ATrapezoidDetectorProxy(String name, double zMin, double zMax, double rMin, double rMax, *************** *** 51,68 **** /** Give z-rho projection. ! * @return The z-rho projection. */ public Point2d[] zrho(int zSide) { ! double[][][] hv = getXZRZUser(1.0).hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! int j; ! for (int i = 0; i < n; i++) { ! j = (zSide >= 0) ? i : (n - i - 1); ! p[j] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } ! // TBD public String name() { return _name; --- 53,64 ---- /** Give z-rho projection. ! * @param zSize The z-side of the detector: <code>-1</code> or <code>+1</code>. ! * @return The z-rho projection. */ public Point2d[] zrho(int zSide) { ! return JiveGeometryBuilder.zrho(getXZRZUser(zSide)); } ! /** Give box name. ! * @return The chamber name. */ public String name() { return _name; Index: ABarrelTRTDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelTRTDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABarrelTRTDetectorProxy.java 17 Apr 2008 22:58:35 -0000 1.1 --- ABarrelTRTDetectorProxy.java 28 Apr 2008 13:20:17 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.ABarrelTRTDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:17 hrivnac + * comments improved + * * Revision 1.1 2008/04/17 22:58:35 hrivnac * using Atlantis to get geometry *************** *** 22,28 **** /** Constructs a new barrel TRT proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * TBD */ public ABarrelTRTDetectorProxy(String name, String color, int layer, int numPhi, --- 27,40 ---- /** Constructs a new barrel TRT proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * @param layer The layer. ! * @param numPhi The number of cells in phi. ! * @param rMin The inner radius. ! * @param rMax The outer radius. ! * @param phiIn The inner phi. ! * @param phiOut The outer phi. ! * @param zMin The inner z. ! * @param zMax The outer z. */ public ABarrelTRTDetectorProxy(String name, String color, int layer, int numPhi, *************** *** 36,46 **** * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 48,52 ---- * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } Index: AEndcapCryostatDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCryostatDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapCryostatDetectorProxy.java 27 Apr 2008 21:38:05 -0000 1.1 --- AEndcapCryostatDetectorProxy.java 28 Apr 2008 13:20:24 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.AEndcapCryostatDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:24 hrivnac + * comments improved + * * Revision 1.1 2008/04/27 21:38:05 hrivnac * Muons OK, Cryostat added *************** *** 45,56 **** * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } ! } \ No newline at end of file --- 50,55 ---- * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } ! } \ No newline at end of file Index: ABoxDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABoxDetectorProxy.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABoxDetectorProxy.java 27 Apr 2008 21:38:03 -0000 1.2 --- ABoxDetectorProxy.java 28 Apr 2008 13:20:22 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.ABoxDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/28 13:20:22 hrivnac + * comments improved + * * Revision 1.2 2008/04/27 21:38:03 hrivnac * Muons OK, Cryostat added *************** *** 24,39 **** public class ABoxDetectorProxy extends ABoxDetector { ! /** Constructs a new barrel calorimeter prABoxDetectorProxy TBD ! * @param name The name of the object. ! * @param zMin The inner z. ! * @param zMax The outer z. ! * @param rMin The inner radius. ! * @param rMax The outer radius. ! * @param phi0 The start of the first cell in phi. ! * @param excl The start of the first cell in eta. ! * @param size The size of a cell in eta. ! * @param neta The number of cells in eta. ! * @param meta The eta index of the first cell. ! * @param nphi The number of cells in phi. */ public ABoxDetectorProxy(String name, double zMin, double zMax, double rMin, double rMax, --- 29,43 ---- public class ABoxDetectorProxy extends ABoxDetector { ! /** Constructs a new muon box proxy. ! * @param name The name of the object. ! * @param zMin The inner z. ! * @param zMax The outer z. ! * @param rMin The inner radius. ! * @param rMax The outer radius. ! * @param phi The phi. ! * @param excl ??? ! * @param size ??? ! * @param stationEta The station number in eta. ! * @param stationPhi The station number in phi. */ public ABoxDetectorProxy(String name, double zMin, double zMax, double rMin, double rMax, *************** *** 48,65 **** /** Give z-rho projection. ! * @return The z-rho projection. */ public Point2d[] zrho(int zSide) { ! double[][][] hv = getXZRZUser(1.0).hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! int j; ! for (int i = 0; i < n; i++) { ! j = (zSide >= 0) ? i : (n - i - 1); ! p[j] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } ! // TBD public String name() { return _name; --- 52,63 ---- /** Give z-rho projection. ! * @param zSize The z-side of the detector: <code>-1</code> or <code>+1</code>. ! * @return The z-rho projection. */ public Point2d[] zrho(int zSide) { ! return JiveGeometryBuilder.zrho(getXZRZUser(zSide)); } ! /** Give box name. ! * @return The chamber name. */ public String name() { return _name; Index: AEndcapCalorimeterDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCalorimeterDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapCalorimeterDetectorProxy.java 17 Apr 2008 22:58:40 -0000 1.1 --- AEndcapCalorimeterDetectorProxy.java 28 Apr 2008 13:20:22 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.AEndcapCalorimeterDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:22 hrivnac + * comments improved + * * Revision 1.1 2008/04/17 22:58:40 hrivnac * using Atlantis to get geometry *************** *** 49,59 **** * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 54,58 ---- * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } Index: ABarrelSiliconDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelSiliconDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABarrelSiliconDetectorProxy.java 17 Apr 2008 22:58:18 -0000 1.1 --- ABarrelSiliconDetectorProxy.java 28 Apr 2008 13:20:17 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.ABarrelSiliconDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:17 hrivnac + * comments improved + * * Revision 1.1 2008/04/17 22:58:18 hrivnac * using Atlantis to get geometry *************** *** 22,28 **** /** Constructs a new barrel silicon proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * TBD */ public ABarrelSiliconDetectorProxy(String name, String color, int layer, double length, double width, double thickness, --- 27,43 ---- /** Constructs a new barrel silicon proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * @param layer The layer. ! * @param length The length of detector. ! * @param width The with of detector. ! * @param thickness The thickness of detector. ! * @param numZ The number of z divisions.. ! * @param numPhi The number of phi divisions. ! * @param tilt The tilt angle. ! * @param r0 The r. ! * @param phi0 The start of the first detector in phi. ! * @param zMin The inner z. ! * @param zMax The outer z. */ public ABarrelSiliconDetectorProxy(String name, String color, int layer, double length, double width, double thickness, *************** *** 34,48 **** tilt, r0, phi0, zMin, zMax); } ! /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 49,57 ---- tilt, r0, phi0, zMin, zMax); } ! /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } Index: ABox.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABox.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABox.java 27 Apr 2008 21:38:00 -0000 1.2 --- ABox.java 28 Apr 2008 13:20:17 -0000 1.3 *************** *** 46,49 **** --- 46,52 ---- * <pre> * $Log$ + * Revision 1.3 2008/04/28 13:20:17 hrivnac + * comments improved + * * Revision 1.2 2008/04/27 21:38:00 hrivnac * Muons OK, Cryostat added *************** *** 109,113 **** phi, w, w, - zSide, name, name1); if (rpcI > 0) { --- 112,115 ---- *************** *** 120,124 **** phi, w, w, - zSide, name0, name1); } --- 122,125 ---- *************** *** 132,136 **** phi, w, w, - zSide, name0, name1); } --- 133,136 ---- *************** *** 140,166 **** } - // TBD - static private double calculatePhi(String name, double phi0, int phiIndex) { - String technology = name.substring(0, 3); - if (technology.equals("TGC")) { - if (name.charAt(6) == 'E' && name.charAt(5) != '4') { - return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 24.; - } - else { - return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 12.; - } - } - else { - return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 4.; - } - } - private static int k = 0; private static BranchGroup _g; - private static final Matrix3d UMATRIX = new Matrix3d(1.0, 0.0, 0.0, - 0.0, 1.0, 0.0, - 0.0, 0.0, 1.0); /** Logging . */ --- 140,147 ---- Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ABarrelCalorimeter.java 17 Apr 2008 22:57:55 -0000 1.8 --- ABarrelCalorimeter.java 28 Apr 2008 13:20:15 -0000 1.9 *************** *** 34,37 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.9 2008/04/28 13:20:15 hrivnac + * comments improved + * * Revision 1.8 2008/04/17 22:57:55 hrivnac * using Atlantis to get geometry *************** *** 99,105 **** double dEta = aBarrelCalorimeter.getDeta(); - // Register limits for JiveEvent - builder().register(name + "_" + sampling + "_" + region, rMin, rMax, zMin, zMax); - // Get 2d reprtesentation from Atlantis ABarrelCalorimeterDetectorProxy detector = new ABarrelCalorimeterDetectorProxy(name, color, sampling, region, --- 102,105 ---- Index: AEndcapTRTDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapTRTDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapTRTDetectorProxy.java 17 Apr 2008 22:59:10 -0000 1.1 --- AEndcapTRTDetectorProxy.java 28 Apr 2008 13:20:26 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.AEndcapTRTDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:26 hrivnac + * comments improved + * * Revision 1.1 2008/04/17 22:59:10 hrivnac * using Atlantis to get geometry *************** *** 22,28 **** /** Constructs a new endcap TRT proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * TBD */ public AEndcapTRTDetectorProxy(String name, String color, int layer, int numPhi, --- 27,39 ---- /** Constructs a new endcap TRT proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * @param layer The layer. ! * @param numPhi The number of cells in phi. ! * @param rMin The inner radius. ! * @param rMax The outer radius. ! * @param phi0 The phi. ! * @param zMin The inner z. ! * @param zMax The outer z. */ public AEndcapTRTDetectorProxy(String name, String color, int layer, int numPhi, *************** *** 36,46 **** * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 47,51 ---- * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } Index: AEndcapSiliconDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapSiliconDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AEndcapSiliconDetectorProxy.java 17 Apr 2008 22:58:50 -0000 1.1 --- AEndcapSiliconDetectorProxy.java 28 Apr 2008 13:20:25 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; + import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; + // Atlantis import atlantis.geometry.AEndcapSiliconDetector; *************** *** 12,15 **** --- 14,20 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/28 13:20:25 hrivnac + * comments improved + * * Revision 1.1 2008/04/17 22:58:50 hrivnac * using Atlantis to get geometry *************** *** 22,28 **** /** Constructs a new endcap silicon proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * TBD */ public AEndcapSiliconDetectorProxy(String name, String color, int layer, double length, double width, double thickness, --- 27,44 ---- /** Constructs a new endcap silicon proxy. ! * @param name The name of the object. ! * @param color The name of the color used to draw this object. ! * @param layer The layer. ! * @param length The length of detector. ! * @param width The with of detector. ! * @param thickness The thickness of detector. ! * @param numZ The number of z divisions.. ! * @param numPhi The number of phi divisions. ! * @param tilt The tilt angle. ! * @param rMin The inner r. ! * @param rMax The outer r. ! * @param phi0 The start of the first detector in phi. ! * @param zMin The inner z. ! * @param zMax The outer z. */ public AEndcapSiliconDetectorProxy(String name, String color, int layer, double length, double width, double thickness, *************** *** 38,48 **** * @return The z-rho projection. */ public Point2d[] zrho() { ! double[][][] hv = getRZUser().hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } --- 54,58 ---- * @return The z-rho projection. */ public Point2d[] zrho() { ! return JiveGeometryBuilder.zrho(getRZUser()); } |
|
From: Julius H. <hr...@us...> - 2008-04-28 13:20:52
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17300/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java JiveRep.java Log Message: comments improved Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JiveRep.java 27 Apr 2008 21:38:00 -0000 1.8 --- JiveRep.java 28 Apr 2008 13:20:13 -0000 1.9 *************** *** 8,13 **** import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; ! // FreeHEP import org.freehep.j3d.OutlinedShape3DFactory; // Java3D --- 8,19 ---- import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; ! // Atlantis ! import atlantis.utils.AMath; ! ! // HEP3D import org.freehep.j3d.OutlinedShape3DFactory; + import org.freehep.j3d.Ring; + import org.freehep.j3d.Trapezoid; + import org.freehep.j3d.Cuboid; // Java3D *************** *** 27,35 **** import javax.vecmath.Vector3d; - // FreeHEP - import org.freehep.j3d.Ring; - import org.freehep.j3d.Trapezoid; - import org.freehep.j3d.Cuboid; - // Java import static java.lang.Math.PI; --- 33,36 ---- *************** *** 48,51 **** --- 49,55 ---- * <pre> * $Log$ + * Revision 1.9 2008/04/28 13:20:13 hrivnac + * comments improved + * * Revision 1.8 2008/04/27 21:38:00 hrivnac * Muons OK, Cryostat added *************** *** 104,108 **** /** Convert Atlantis geometry representation to GraXML one. * Create corresponding {@link PolyGoneSegment}s. ! * @param zrho The z-rho-coordinates of one solid quadrant. * @param reflect The whether z-reflected solid should be created too. * @param nPhi The number of solid' subdivisions in phi. --- 108,112 ---- /** Convert Atlantis geometry representation to GraXML one. * Create corresponding {@link PolyGoneSegment}s. ! * @param zrho The z-rho coordinates of one solid quadrant. * @param reflect The whether z-reflected solid should be created too. * @param nPhi The number of solid' subdivisions in phi. *************** *** 138,154 **** } - // TBD /** Convert Atlantis geometry representation to GraXML one. ! * Create corresponding {@link PolyGoneSegment}s. ! * @param zrho The z-rho-coordinates of one solid quadrant. ! * @param reflect The whether z-reflected solid should be created too. ! * @param nPhi The number of solid' subdivisions in phi. * @param color The name of the solid' color. * @param name The solid' name. */ protected void atlantis2GraXML(Point2d[] zrho, double phi, ! double widthM, ! double widthP, ! int zSide, String color, String name) { --- 142,157 ---- } /** Convert Atlantis geometry representation to GraXML one. ! * Create corresponding {@link Cuboids}s. ! * @param zrho The z-rho coordinates of one solid cuboid. ! * @param phi The phi of the solid ! * @param widthI The inner width.. ! * @param widthI The outer width.. * @param color The name of the solid' color. * @param name The solid' name. */ protected void atlantis2GraXML(Point2d[] zrho, double phi, ! double widthI, ! double widthO, String color, String name) { *************** *** 164,201 **** use(cuboid(zrho, phi, ! widthM, ! widthP, ! zSide), name, info); } ! /** Draw one Jet0 as a {@link ConeSegment}. TBD ! * @param name The name of the Jet0. ! * @param x The x-coordinate of the Cone start point. ! * @param y The y-coordinate of the Cone start point. ! * @param z The z-coordinate of the Cone start point. ! * @param r The r-coordinate of the Cone start point. ! * @param phi The phi-coordinate of the Cone. ! * @param delX The x-length of the Cone. ! * @param delY The y-length of the Cone. ! * @param delZ The z-length of the Cone. ! * @param delR The r-length of the Cone. ! * @param pt The pt of the Jet0. ! * @return The {@link ConeSegment} representing the Jet0. */ ! // TBD: simplify private Shape3D cuboid(Point2d[] zrho, double phi, ! double widthM, ! double widthP, ! int zSide) { ! Point3d[] points = {new Point3d(-widthM / 2.0, zrho[0].y, zrho[0].x), ! new Point3d(-widthP / 2.0, zrho[1].y, zrho[1].x), ! new Point3d(-widthP / 2.0, zrho[2].y, zrho[2].x), ! new Point3d(-widthM / 2.0, zrho[3].y, zrho[3].x), ! new Point3d( widthM / 2.0, zrho[0].y, zrho[0].x), ! new Point3d( widthP / 2.0, zrho[1].y, zrho[1].x), ! new Point3d( widthP / 2.0, zrho[2].y, zrho[2].x), ! new Point3d( widthM / 2.0, zrho[3].y, zrho[3].x)}; Cuboid cuboid = new Cuboid(points, --- 167,194 ---- use(cuboid(zrho, phi, ! widthI, ! widthO), name, info); } ! /** Draw one {@link Cuboid}. ! * @param zrho The z-rho coordinates of one solid cuboid. ! * @param phi The phi of the solid ! * @param widthI The inner width.. ! * @param widthI The outer width.. ! * @return The {@link Cuboid}.. */ private Shape3D cuboid(Point2d[] zrho, double phi, ! double widthI, ! double widthO) { ! Point3d[] points = {new Point3d(-widthI / 2.0, zrho[3].y, zrho[3].x), ! new Point3d(-widthO / 2.0, zrho[2].y, zrho[2].x), ! new Point3d(-widthO / 2.0, zrho[1].y, zrho[1].x), ! new Point3d(-widthI / 2.0, zrho[0].y, zrho[0].x), ! new Point3d( widthI / 2.0, zrho[3].y, zrho[3].x), ! new Point3d( widthO / 2.0, zrho[2].y, zrho[2].x), ! new Point3d( widthO / 2.0, zrho[1].y, zrho[1].x), ! new Point3d( widthI / 2.0, zrho[0].y, zrho[0].x)}; Cuboid cuboid = new Cuboid(points, *************** *** 304,307 **** --- 297,321 ---- } + /** Give phi of Atlantis element. This function is copied from + * {@link atlantis.geometry.AGeometryFromXMLReader}. + * @param name The name of the element. + * @param phi0 The initial phi. + * @param phiIndex The index of the element in phi direction. + * @return The phi of the element. */ + static protected double calculatePhi(String name, double phi0, int phiIndex) { + String technology = name.substring(0, 3); + if (technology.equals("TGC")) { + if (name.charAt(6) == 'E' && name.charAt(5) != '4') { + return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 24.; + } + else { + return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 12.; + } + } + else { + return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 4.; + } + } + private JiveGeometryBuilder _builder; Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JiveGeometryBuilder.java 27 Apr 2008 21:38:00 -0000 1.9 --- JiveGeometryBuilder.java 28 Apr 2008 13:20:11 -0000 1.10 *************** *** 9,12 **** --- 9,13 ---- import javax.media.j3d.Transform3D; import javax.vecmath.Vector3d; + import javax.vecmath.Point2d; import javax.vecmath.Matrix3d; *************** *** 25,28 **** --- 26,30 ---- // Atlantis import atlantis.parameters.APar; + import atlantis.graphics.ACoord; import atlantis.utils.xml.AXMLUtils; import atlantis.utils.xml.AXMLErrorHandler; *************** *** 36,39 **** --- 38,44 ---- * <pre> * $Log$ + * Revision 1.10 2008/04/28 13:20:11 hrivnac + * comments improved + * * Revision 1.9 2008/04/27 21:38:00 hrivnac * Muons OK, Cryostat added *************** *** 125,164 **** return _norm; } - - // TBD - public void register(String name, double rMin, double rMax, double zMin, double zMax) { - _rMin.put(name, rMin); - _rMax.put(name, rMax); - _zMin.put(name, zMin); - _zMax.put(name, zMax); - } - // TBD - public static double rMin(String name) { - return _rMin.get(name); - } ! // TBD ! public static double rMax(String name) { ! return _rMax.get(name); ! } ! // TBD ! public static double zMin(String name) { ! return _zMin.get(name); ! } ! ! // TBD ! public static double zMax(String name) { ! return _zMax.get(name); } - private static Map<String, Double> _rMin = new TreeMap<String, Double>(); - - private static Map<String, Double> _rMax = new TreeMap<String, Double>(); - - private static Map<String, Double> _zMin = new TreeMap<String, Double>(); - - private static Map<String, Double> _zMax = new TreeMap<String, Double>(); - private static String _schema = "AGeometry.xsd"; --- 130,149 ---- return _norm; } ! /** Give z-rho projection. ! * @param coord The coordinations of z-rho projection ! * in Atlantis format. ! * @return The z-rho projection. */ ! public static Point2d[] zrho(ACoord coord) { ! double[][][] hv = coord.hv; ! int n = hv[0][0].length; ! Point2d[] p = new Point2d[n]; ! for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); ! } ! return p; } private static String _schema = "AGeometry.xsd"; |
|
From: Julius H. <hr...@us...> - 2008-04-28 13:20:42
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17300 Modified Files: index.html Log Message: comments improved Index: index.html =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.html 22 Dec 2007 15:30:18 -0000 1.5 --- index.html 28 Apr 2008 13:20:10 -0000 1.6 *************** *** 31,40 **** <ul> <li>Initial (uncomplete) release.</li> ! <li>Migrated to JSAXB 2.0.</li> </ul> </li> ! <li>Bug fixes: <ul> ! <li>...</li> </ul> </li> --- 31,44 ---- <ul> <li>Initial (uncomplete) release.</li> ! <li>Migrated to JAXB 2.0.</li> </ul> </li> ! </ul> ! </li> ! <li><u>1.0.0:</u> ! <ul> ! <li>New features: <ul> ! <li>All global shapes from Atlantis are supported.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:41:11
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29968 Modified Files: build.xml Log Message: complete geometry OK Index: build.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/ant/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 19 Oct 2007 14:10:55 -0000 1.8 --- build.xml 27 Apr 2008 21:41:09 -0000 1.9 *************** *** 22,25 **** --- 22,27 ---- <pathelement path="${Java3D.utils}"/> <pathelement path="${Java3D.vecmath}"/> + <pathelement path="${Atlantis.core}"/> + <pathelement path="${Atlantis.commons}"/> <pathelement path="${Log4J.core}"/> <!-- Java 1.5 --> *************** *** 69,72 **** --- 71,76 ---- <fileset file="${Java3D.utils}"/> <fileset file="${Java3D.vecmath}"/> + <fileset file="${Atlantis.core}"/> + <fileset file="${Atlantis.commons}"/> <fileset file="${Log4J.core}"/> <!-- Java 1.5 --> *************** *** 133,139 **** <fileset dir="${build}" includes="**/bgm.ser"/> <fileset dir="${build}" includes="**/*.properties"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometryTB.xml"/> </jar> </target> --- 137,143 ---- <fileset dir="${build}" includes="**/bgm.ser"/> <fileset dir="${build}" includes="**/*.properties"/> + <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/AtlantisConfig.xml"/> <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd"/> ! <fileset dir="${src}" includes="net/hep/atlas/graphics/JiveGeometry/Test/data/GGeometry.xml"/> </jar> </target> |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:40:56
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29430/net/hep/atlas/graphics/JiveGeometry/Test/data Added Files: GGeometry.xml Log Message: complete geometry OK --- NEW FILE: GGeometry.xml --- <?xml version="1.0"?> <!-- Atlantis Geometry for GraXML --> <!-- $Log: GGeometry.xml,v $ Revision 1.1 2008/04/27 21:40:52 hrivnac complete geometry OK --> <AGeometry> <!-- AGeometry --> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="0.306424" tilt="-19.9962" nz="13" nphi="22" r0="5.10491" phi0="7.78997" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="0.307646" tilt="-19.9962" nz="13" nphi="38" r0="8.88103" phi0="4.60732" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="0.30793" tilt="-19.9962" nz="13" nphi="52" r0="12.2722" phi0="3.3937" zMin="-40.5702" zMax="40.5702" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="48.7" zMax="49.7" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="57.2" zMax="58.2" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="64.2" zMax="65.2" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="0" length="12.609" width="6.144" thickness="0.844888" tilt="11.0351" nz="6" nphi="32" r0="30.134" phi0="3.2" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="1" length="12.609" width="6.144" thickness="0.760799" tilt="11.0283" nz="6" nphi="40" r0="37.2063" phi0="2.6" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="2" length="12.609" width="6.144" thickness="0.841372" tilt="11.2742" nz="6" nphi="48" r0="44.4326" phi0="2.1" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="3" length="12.609" width="6.144" thickness="0.780462" tilt="11.2709" nz="6" nphi="56" r0="51.4694" phi0="1.799" zMin="-74.8272" zMax="74.8272" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="83.0567" zMax="84.1532" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="86.0567" zMax="87.1532" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="91.0768" zMax="92.1732" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="91.6268" zMax="95.1732" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="106.827" zMax="107.923" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="107.377" zMax="110.923" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="127.667" zMax="128.763" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="128.217" zMax="131.763" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="137.647" zMax="138.743" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="138.197" zMax="141.743" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="174.817" zMax="175.913" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="175.367" zMax="178.913" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="209.197" zMax="210.293" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="212.197" zMax="213.293" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="248.177" zMax="249.273" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="5.2475" width="6.83547" thickness="11.0247" nz="1" nphi="40" rMin="40.2836" rMax="45.7959" phi0="4.31982" zMin="251.177" zMax="252.273" /> <AEndcapSiliconDetector c="SIL" n="Silicon" layer="8" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="1.03842" zMin="273.247" zMax="274.343" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="56.7302" rMax="69.8248" phiIn="-6.17382" phiOut="-10.7369" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="70.1346" rMax="86.6458" phiIn="-10.7202" phiOut="-5.99874" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="113.525" zMax="126.225" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="3" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="128.075" zMax="140.775" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="4" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="142.625" zMax="155.325" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="5" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="157.175" zMax="169.875" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="6" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="173.875" zMax="184.275" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="7" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="186.225" zMax="196.625" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="8" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="198.575" zMax="208.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="9" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="210.925" zMax="221.325" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="10" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="223.275" zMax="233.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="11" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="235.625" zMax="246.025" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="12" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="247.975" zMax="258.375" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="13" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="260.325" zMax="270.725" /> <ADisc p="YX" c="Sol" n="Solenoid" rIn="122.9" rOut="127.4" /> <ARectangle p="RZ" c="Sol" n="Solenoid" xMin="-265" xMax="265" yMin="122.9" yMax="127.4" xR="NO" /> <ABarrelCalorimeter c="ECAL" n="LAr Presampler" sampling="0" region="0" rMin="142.173" rMax="143.858" zMin="0" zMax="325.0" eta0="3.1225e-17" deta="0.025" neta="61" meta="0" phi0="-0.175783" nphi="64" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="0" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="0.003125" deta="0.003125" neta="447" meta="1" phi0="-0.175783" nphi="64" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="1" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="1.4" deta="0.025" neta="3" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="0" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="0.0" deta="0.025" neta="56" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="1" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="1.4" deta="0.075" neta="1" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="3" region="0" rMin="184" rMax="198.47" zMin="0" zMax="325.0" eta0="0.0" deta="0.05" neta="27" meta="0" phi0="-0.175783" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Endcap Presampler" sampling="0" region="0" rMin="29.0" rMax="203.4" zMin="368.075" zMax="371.425" eta0="1.50988" deta="0.025" neta="12" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.38444" deta="0.05" neta="1" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="1" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.43452" deta="0.025" neta="3" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="2" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.50965" deta="0.003125" neta="96" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="3" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.81009" deta="0.00416667" neta="48" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="4" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="2.01027" deta="0.00625" neta="64" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="5" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="2.41048" deta="0.025" neta="4" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="380.073" zMax="424.326" eta0="1.38381" deta="0.05" neta="7" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="2" region="1" rMin="29.0" rMax="203.4" zMin="380.073" zMax="415.624" eta0="1.43388" deta="0.025" neta="43" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="3" region="0" rMin="29.0" rMax="203.4" zMin="415.624" zMax="424.326" eta0="1.50867" deta="0.05" neta="20" meta="0" phi0="-0.234375" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="420.125" eta0="2.51004" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Inner Endcap" sampling="2" region="0" rMin="29.0" rMax="203.4" zMin="420.125" zMax="424.326" eta0="2.5094" deta="0.1" neta="7" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="0" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="1.50824" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="0" region="1" rMin="37.2" rMax="203.4" zMin="435" zMax="463" eta0="2.50892" deta="0.2" neta="4" meta="0" phi0="0" nphi="32" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="0" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="1.50755" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="1" region="1" rMin="48.5" rMax="203.4" zMin="463" zMax="510" eta0="2.50817" deta="0.2" neta="3" meta="0" phi0="0" nphi="32" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="0" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="1.6" deta="0.1" neta="9" meta="1" phi0="0" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="2" region="1" rMin="48.5" rMax="203.4" zMin="513" zMax="559" eta0="2.5" deta="0.2" neta="3" meta="0" phi0="-7.95139e-16" nphi="32" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> <ADisc p="YX" c="HCAL" n="FCAL HAD 1" rIn="7.90558" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 1" xMin="512.3" xMax="557.3" yMin="7.90558" yMax="47.5" /> <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="2" region="0" rMin="344" rMax="386" zMin="-36.5199" zMax="282" eta0="-0.1" deta="0.2" neta="4" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="0" region="0" rMin="229" rMax="260" zMin="355.95" zMax="615" eta0="1.1" deta="0.1" neta="5" meta="11" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> <AEndcapCryostat c="HCAL" n="Minimum Bias Trigger Scintillators" sampling="0" region="0" rMin="15.3" rMax="42.6" zMin="319.187" zMax="321.187" neta="1" nphi="8" /> <AEndcapCryostat c="HCAL" n="Minimum Bias Trigger Scintillators" sampling="1" region="0" rMin="42.6" rMax="89" zMin="319.187" zMax="321.187" neta="1" nphi="8" /> <!-- AMuonGeometry --> <ABox n="MDT_BIL" zi="33" zo="124.607" ri="474.091" ro="515.705" w="267.15" eta="1" phi="1 2 3 7" /> <ABox n="MDT_BIL" zi="51" zo="124.586" ri="474.091" ro="515.705" w="267.15" eta="1" phi="4" /> <ABox n="MDT_BIL" zi="56" zo="147.607" ri="525.691" ro="567.305" w="267.15" eta="1" phi="5" /> <ABox n="MDT_BIL" zi="125" zo="234.628" ri="474.091" ro="515.705" w="267.15" eta="2" phi="1 2 3 4 5 7" /> <ABox n="MDT_BIL" zi="235" zo="326.607" ri="474.091" ro="515.705" w="267.15" eta="3" phi="1 2 4 5 7" /> <ABox n="MDT_BIL" zi="235" zo="344.628" ri="474.091" ro="515.705" w="267.15" eta="3" phi="3" /> <ABox n="MDT_BIL" zi="345" zo="454.628" ri="474.091" ro="515.705" w="267.15" eta="4" phi="1 2 3 4 5" /> <ABox n="MDT_BIL" zi="345" zo="436.607" ri="474.091" ro="515.705" w="267.15" eta="4" phi="7" /> <ABox n="MDT_BIL" zi="455" zo="546.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="1 2 3 4 5" /> <ABox n="MDT_BIL" zi="437" zo="528.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="7" /> <ABox n="MDT_BIL" zi="547" zo="656.628" ri="474.091" ro="515.705" w="267.15" eta="6" phi="1 2 3 5" /> <ABox n="MDT_BIL" zi="547" zo="638.607" ri="474.091" ro="515.705" w="267.15" eta="6" phi="4 7" /> <ABox n="MDT_BIS" zi="1" zo="110.628" ri="440.793" ro="474.707" w="167.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="111" zo="202.607" ri="440.793" ro="474.707" w="167.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="203" zo="294.607" ri="440.793" ro="474.707" w="167.15" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="295" zo="386.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="313" zo="404.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="387" zo="478.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="405" zo="496.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="479" zo="570.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="497" zo="588.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="571" zo="680.628" ri="440.793" ro="474.707" w="167.15" eta="7" phi="1 2 3" dphi="22.5" /> <ABox n="MDT_BIS" zi="589" zo="680.607" ri="440.793" ro="474.707" w="167.15" eta="7" phi="4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIS" zi="681" zo="730.558" ri="454.864" ro="471.645" w="85.15" eta="8" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BML" zi="15" zo="184.698" ri="675.194" ro="754.205" w="357.6" eta="1" phi="1 2" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="39" zo="184.67" ri="675.194" ro="754.205" w="357.6" eta="1" phi="3 7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="87" zo="184.614" ri="675.194" ro="753.005" w="357.6" eta="1" phi="4 5" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="63" zo="184.642" ri="675.194" ro="753.005" w="357.6" eta="1" phi="6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="185" zo="354.698" ri="675.194" ro="754.205" w="357.6" eta="2" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="355" zo="524.698" ri="675.194" ro="754.205" w="357.6" eta="3" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="525" zo="646.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="5" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="5" phi="7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="6" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="6" phi="7" RPCi="15" RPCo="15" /> <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="7" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="15" zo="184.698" ri="777.694" ro="842.905" w="309.6" eta="1" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="185" zo="364.5" ri="777.694" ro="842.905" w="309.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="368" zo="513.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="514" zo="691.35" ri="777.694" ro="842.905" w="309.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="692.5" zo="790.114" ri="777.694" ro="841.705" w="309.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMS" zi="790.5" zo="936.17" ri="777.694" ro="842.905" w="309.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BOL" zi="15" zo="232.754" ri="924.444" ro="989.055" w="498.6" eta="1" phi="1 2" RPCo="15" /> <ABox n="MDT_BOL" zi="39" zo="232.726" ri="924.444" ro="989.055" w="498.6" eta="1" phi="3" RPCo="15" /> <ABox n="MDT_BOL" zi="87" zo="232.67" ri="924.444" ro="989.055" w="498.6" eta="1" phi="4 5" RPCo="15" /> <ABox n="MDT_BOL" zi="63" zo="232.698" ri="924.444" ro="989.055" w="498.6" eta="1" phi="6 7 8" RPCo="15" /> <ABox n="MDT_BOL" zi="233" zo="450.754" ri="924.444" ro="989.055" w="498.6" eta="2" phi="1 2 3 4 5 6 8" RPCo="15" /> <ABox n="MDT_BOL" zi="233" zo="378.67" ri="924.444" ro="989.055" w="498.6" eta="2" phi="7" RPCo="15" /> <ABox n="MDT_BOL" zi="451" zo="620.698" ri="924.444" ro="989.055" w="498.6" eta="3" phi="1 2 3 4 5 6 8" RPCo="15" /> <ABox n="MDT_BOL" zi="379" zo="524.67" ri="924.444" ro="989.055" w="498.6" eta="3" phi="7" RPCo="15" /> <ABox n="MDT_BOL" zi="621" zo="838.754" ri="924.444" ro="989.055" w="498.6" eta="4" phi="1 2 3 4 5 6 7 8" RPCo="15" /> <ABox n="MDT_BOL" zi="839" zo="1056.75" ri="924.444" ro="989.055" w="498.6" eta="5" phi="1 2 3 4 5 6 7 8" RPCo="15" /> <ABox n="MDT_BOL" zi="1057" zo="1226.7" ri="924.444" ro="989.055" w="498.6" eta="6" phi="1 2 3 4 5 6 7 8" RPCo="15" /> <ABox n="MDT_BOS" zi="1" zo="218.754" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="1 2 3 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="73" zo="218.67" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="4" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="219" zo="436.754" ri="1019.19" ro="1082.46" w="379.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="437" zo="654.754" ri="1019.19" ro="1082.46" w="379.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="655" zo="872.754" ri="1019.19" ro="1082.46" w="379.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="873" zo="1090.75" ri="1019.19" ro="1082.46" w="379.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BOS" zi="1091" zo="1284.73" ri="1019.19" ro="1082.46" w="379.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> <ABox n="MDT_BEE" zi="889" zo="1034.67" ri="433.023" ro="452.33" w="91.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BEE" zi="1035" zo="1180.67" ri="433.023" ro="452.33" w="91.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="6" sh="11.65" /> <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="8" sh="-11.65" /> <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="6" sh="68.4" /> <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="8" sh="-68.4" /> <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="6" sh="46.85" /> <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="8" sh="-46.85" /> <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="6" sh="68.4" /> <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="8" sh="-68.4" /> <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="6" sh="68.4" /> <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="8" sh="-68.4" /> <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="6" sh="46.85" /> <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="8" sh="-46.85" /> <ABox n="MDT_BMF" zi="62.5" zo="280.254" ri="777.694" ro="842.905" w="309.6" eta="1" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMF" zi="406" zo="599.726" ri="777.694" ro="842.905" w="309.6" eta="2" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BMF" zi="728" zo="873.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> <ABox n="MDT_BOF" zi="62.57" zo="280.324" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOF" zi="405.46" zo="599.186" ri="1028.19" ro="1107.41" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOF" zi="727.92" zo="873.59" ri="1028.19" ro="1107.41" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOF" zi="1002.6" zo="1124.24" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="-60" zo="61.6418" ri="1028.19" ro="1093.06" w="379.6" eta="0" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="282.07" zo="403.712" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="602.73" zo="724.372" ri="1028.19" ro="1093.06" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="877.14" zo="998.782" ri="1028.19" ro="1106.21" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> <ABox n="MDT_BOG" zi="1147.2" zo="1268.84" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> <ATrd n="MDT_EIL1" zi="749.146" zo="785.86" ri="207.6" ro="317.228" wi="132.15" wo="186.9" eta="1" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EIL2" zi="749.146" zo="785.86" ri="319.1" ro="428.728" wi="186.15" wo="240.9" eta="2" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.23" ro="464.774" wi="207.15" wo="207.15" eta="3" phi="1 2 3 4 5 7" /> <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="6" sh="-16.5" /> <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="8" sh="16.5" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="509.544" wi="153.65" wo="153.65" eta="4" phi="1 5" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="635.691" wi="235.15" wo="316.9" eta="4" phi="2 3 7" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="473.105" ro="636.796" wi="165.15" wo="246.9" eta="4" phi="4" sh="35" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="6" sh="-62.5" /> <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="8" sh="62.5" /> <ATrd n="MDT_EIL5" zi="745.796" zo="782.51" ri="508.04" ro="635.689" wi="253.15" wo="316.9" eta="5" phi="1 5" /> <ATrd n="MDT_EML1" zi="1411.25" zo="1447.66" ri="177" ro="346.698" wi="118.65" wo="203.4" eta="1" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML2" zi="1411.25" zo="1447.66" ri="348.5" ro="542.226" wi="202.65" wo="299.4" eta="2" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML3" zi="1411.25" zo="1447.66" ri="544" ro="737.726" wi="298.65" wo="395.4" eta="3" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML4" zi="1411.25" zo="1447.66" ri="739.5" ro="933.226" wi="394.65" wo="491.4" eta="4" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EML5" zi="1411.25" zo="1447.66" ri="935" ro="1128.73" wi="490.65" wo="587.4" eta="5" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EMS1" zi="1369.65" zo="1406.06" ri="177" ro="370.726" wi="83.55" wo="141.6" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS2" zi="1369.65" zo="1406.06" ri="372.5" ro="566.226" wi="141.15" wo="199.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS3" zi="1369.65" zo="1406.06" ri="568" ro="761.726" wi="198.75" wo="256.8" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS4" zi="1369.65" zo="1406.06" ri="763.5" ro="957.226" wi="256.35" wo="314.4" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EMS5" zi="1369.65" zo="1406.06" ri="959" ro="1152.73" wi="313.95" wo="372" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOL1" zi="2117.5" zo="2153.91" ri="277" ro="446.698" wi="168.15" wo="252.9" eta="1" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL2" zi="2117.5" zo="2153.91" ri="448.5" ro="618.198" wi="264.15" wo="348.9" eta="2" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL3" zi="2117.5" zo="2153.91" ri="620" ro="765.67" wi="348.15" wo="420.9" eta="3" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL4" zi="2117.5" zo="2153.91" ri="767.5" ro="913.17" wi="420.15" wo="492.9" eta="4" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL5" zi="2117.5" zo="2153.91" ri="915" ro="1060.67" wi="492.15" wo="564.9" eta="5" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOL6" zi="2117.5" zo="2153.91" ri="1062.5" ro="1208.17" wi="564.15" wo="636.9" eta="6" phi="1 2 3 4 5 6 7 8" /> <ATrd n="MDT_EOS1" zi="2158.4" zo="2194.81" ri="277" ro="446.698" wi="124.95" wo="175.8" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS2" zi="2158.4" zo="2194.81" ri="448.5" ro="618.198" wi="175.35" wo="226.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS3" zi="2158.4" zo="2194.81" ri="620" ro="789.698" wi="225.75" wo="276.6" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS4" zi="2158.4" zo="2194.81" ri="791.5" ro="937.17" wi="276.15" wo="319.8" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS5" zi="2158.4" zo="2194.81" ri="939" ro="1084.67" wi="319.35" wo="363" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EOS6" zi="2158.4" zo="2194.81" ri="1086.5" ro="1232.17" wi="362.55" wo="406.2" eta="6" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="TGC_T1F1" zi="1327.15" zo="1334.15" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> <ATrd n="TGC_T1F1" zi="1345.05" zo="1352.05" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> <ATrd n="TGC_T1E1" zi="1345.05" zo="1359.95" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> <ATrd n="TGC_T1E1" zi="1327.15" zo="1342.05" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> <ATrd n="TGC_T2F1" zi="1460.05" zo="1464.42" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> <ATrd n="TGC_T2F1" zi="1475.55" zo="1479.92" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> <ATrd n="TGC_T2E1" zi="1475.55" zo="1485.42" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> <ATrd n="TGC_T2E1" zi="1460.05" zo="1469.92" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> <ATrd n="TGC_T3F1" zi="1502.05" zo="1506.42" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> <ATrd n="TGC_T3F1" zi="1517.55" zo="1521.92" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> <ATrd n="TGC_T3E1" zi="1517.55" zo="1527.42" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> <ATrd n="TGC_T3E1" zi="1502.05" zo="1511.92" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> <ATrd n="TGC_T4F1" zi="698.06" zo="702.43" ri="217" ro="443.4" wi="62.38" wo="121.99" eta="1" phi="1 3 4 6 7 9 10 12 13 15 16 18 19 21 22 24" dphi="7.5" /> <ATrd n="TGC_T4F1" zi="693.04" zo="697.41" ri="217" ro="433.4" wi="62.38" wo="119.36" eta="1" phi="2 5 8 11 14 17 20 23" dphi="7.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="1 4 7" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="2" dphi="-5.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="3 6" dphi="5.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="5 8" dphi="-5.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="9 12" dphi="15" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="10" dphi="9.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="11 14" dphi="20.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="13" dphi="9.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="15" dphi="15" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="16" dphi="35.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="17" dphi="30" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="18" dphi="24.5" /> <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="19" dphi="45" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="20" dphi="39.5" /> <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="21" dphi="50.5" /> <ATrd n="MDT_EIS1" zi="707.746" zo="744.46" ri="207.6" ro="335.249" wi="89.85" wo="128.1" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="MDT_EIS2" zi="707.746" zo="744.46" ri="337.1" ro="446.728" wi="127.65" wo="160.5" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> <ATrd n="CSC_CSS1" zi="708.06" zo="724.63" ri="87.0128" ro="206.473" wi="40.29" wo="74.75" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" a="-11.587" /> <ATrd n="CSC_CSL1" zi="744.319" zo="760.889" ri="92.4354" ro="207.125" wi="61.01" wo="112.87" eta="1" phi="1 2 3 4 5 6 7 8" a="-11.587" /> <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="8" sh="56.6" /> <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="8" sh="56.6" /> </AGeometry> |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:40:48
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29430/net/hep/atlas/graphics/JiveGeometry Added Files: AtlantisConfig.xml Log Message: complete geometry OK --- NEW FILE: AtlantisConfig.xml --- <?xml version="1.0"?> <!DOCTYPE AtlantisConfiguration [ <!ELEMENT AtlantisConfiguration (Initialization, Parameters,ParameterDifferences*, WindowCorners*)> <!ELEMENT Initialization (Interactions, Canvas)> <!ELEMENT Interactions (Panel*, InteractionControl+)> <!ELEMENT InteractionControl (Panel*)> <!ATTLIST InteractionControl projectionName CDATA #REQUIRED> <!ELEMENT Panel EMPTY> <!ATTLIST Panel screenName CDATA #REQUIRED fileName CDATA #REQUIRED toolTip CDATA ""> [...1284 lines suppressed...] <CORNERS windowName="R" x0="-5.0" y0="360.0" x1="5.0" y1="360.0" x2="5.0" y2="0.0"/> <CORNERS windowName="M" x0="-2250.0" y0="4500.0" x1="2250.0" y1="4500.0" x2="2250.0" y2="-4500.0"/> <CORNERS windowName="L" x0="-1320.0" y0="2640.0" x1="1320.0" y1="2640.0" x2="1320.0" y2="-2640.0"/> <CORNERS windowName="D" x0="-2640.0" y0="1320.0" x1="2640.0" y1="1320.0" x2="2640.0" y2="-1320.0"/> <CORNERS windowName="C" x0="0.0" y0="400.0" x1="1320.0" y1="400.0" x2="1320.0" y2="0.0"/> <CORNERS windowName="B" x0="-3960.0" y0="1320.0" x1="3960.0" y1="1320.0" x2="3960.0" y2="-1320.0"/> <CORNERS windowName="9" x0="-241.0" y0="-30.0" x1="385.0" y1="-30.0" x2="385.0" y2="8.0"/> <CORNERS windowName="8" x0="-5.0" y0="360.0" x1="5.0" y1="360.0" x2="5.0" y2="0.0"/> <CORNERS windowName="7" x0="-2250.0" y0="2250.0" x1="2250.0" y1="2250.0" x2="2250.0" y2="-2250.0"/> <CORNERS windowName="6" x0="-5.0" y0="360.0" x1="5.0" y1="360.0" x2="5.0" y2="0.0"/> <CORNERS windowName="5" x0="-2250.0" y0="2250.0" x1="2250.0" y1="2250.0" x2="2250.0" y2="-2250.0"/> <CORNERS windowName="4" x0="-2250.0" y0="2250.0" x1="2250.0" y1="2250.0" x2="2250.0" y2="-2250.0"/> <CORNERS windowName="3" x0="-2250.0" y0="400.0" x1="2250.0" y1="400.0" x2="2250.0" y2="0.0"/> <CORNERS windowName="2" x0="0.0" y0="400.0" x1="1320.0" y1="400.0" x2="1320.0" y2="0.0"/> <CORNERS windowName="1" x0="-1320.0" y0="1320.0" x1="1320.0" y1="1320.0" x2="1320.0" y2="-1320.0"/> </WindowCorners> </AtlantisConfiguration> |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:38:45
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26499/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABox.java ABoxDetectorProxy.java AEndcapSiliconDetector.java ATrapezoidDetectorProxy.java ATrd.java Added Files: AEndcapCryostat.java AEndcapCryostatDetectorProxy.java Log Message: Muons OK, Cryostat added Index: ATrd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ATrd.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ATrd.java 25 Apr 2008 13:30:49 -0000 1.1 --- ATrd.java 27 Apr 2008 21:38:10 -0000 1.2 *************** *** 46,49 **** --- 46,52 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/27 21:38:10 hrivnac + * Muons OK, Cryostat added + * * Revision 1.1 2008/04/25 13:30:49 hrivnac * box and trd prototype added *************** *** 69,75 **** if (_g == null) { _g = new BranchGroup(); ! use(_g, "Trd", "Trd Container"); } ! set(builder, _g, "Trd"); // Get element properties --- 72,78 ---- if (_g == null) { _g = new BranchGroup(); ! use(_g, "EndcapMuonDetector", "Endcap Muon Detector Container"); } ! set(builder, _g, "EndcapMuonDetector"); // Get element properties *************** *** 101,107 **** zSide * zI, zSide * zO, rI, rO, phi, wI, wO, ! a, zSide * eta, phis[i]).zrho(), phi, wI, wO, name, name1); } --- 104,111 ---- zSide * zI, zSide * zO, rI, rO, phi, wI, wO, ! a, zSide * eta, phis[i]).zrho(zSide), phi, wI, wO, + zSide, name, name1); } --- NEW FILE: AEndcapCryostat.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCryostatType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; import javax.vecmath.Point2d; import javax.media.j3d.Appearance; // Java import static java.lang.Math.PI; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>AEndcapCryostat</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.AEndcapCryostat} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: AEndcapCryostat.java,v $ * Revision 1.1 2008/04/27 21:38:04 hrivnac * Muons OK, Cryostat added * * </pre> * </font></p> * @version $Id: AEndcapCryostat.java,v 1.1 2008/04/27 21:38:04 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class AEndcapCryostat extends JiveRep { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { System.out.println("CCCCCCCCCCCCCCCC"); // Set values set(builder, tg, parent); // Verify element type if (! (element instanceof AEndcapCryostatType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Create container if (_g == null) { _g = new BranchGroup(); use(_g, "EndcapCryostat", "Endcap Cryostat Container"); } set(builder, _g, "EndcapCryostat"); // Get element properties AEndcapCryostatType aEndcapCryostat = (AEndcapCryostatType)element; String color = aEndcapCryostat.getC(); String name = aEndcapCryostat.getN(); int sampling = aEndcapCryostat.getSampling(); int region = aEndcapCryostat.getRegion(); double rMin = aEndcapCryostat.getRMin() / builder().norm(); double rMax = aEndcapCryostat.getRMax() / builder().norm(); double zMin = aEndcapCryostat.getZMin() / builder().norm(); double zMax = aEndcapCryostat.getZMax() / builder().norm(); int nPhi = aEndcapCryostat.getNphi(); int nEta = aEndcapCryostat.getNeta(); // Get 2d reprtesentation from Atlantis AEndcapCryostatDetectorProxy detector = new AEndcapCryostatDetectorProxy(name, color, sampling, region, rMin, rMax, zMin, zMax, nEta, nPhi); // Find dimensions Point2d[] points = detector.zrho(); // Construct Atlantis representation atlantis2GraXML(points, true, 0, nPhi, color, name + "[" + sampling + "/" + region + "]"); } private static int k = 0; private static BranchGroup _g; /** Logging . */ private static Logger log = Logger.getLogger(AEndcapCryostat.class); } Index: ATrapezoidDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ATrapezoidDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ATrapezoidDetectorProxy.java 25 Apr 2008 13:30:48 -0000 1.1 --- ATrapezoidDetectorProxy.java 27 Apr 2008 21:38:10 -0000 1.2 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/27 21:38:10 hrivnac + * Muons OK, Cryostat added + * * Revision 1.1 2008/04/25 13:30:48 hrivnac * box and trd prototype added *************** *** 49,58 **** /** Give z-rho projection. * @return The z-rho projection. */ ! public Point2d[] zrho() { double[][][] hv = getXZRZUser(1.0).hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; --- 52,63 ---- /** Give z-rho projection. * @return The z-rho projection. */ ! public Point2d[] zrho(int zSide) { double[][][] hv = getXZRZUser(1.0).hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; + int j; for (int i = 0; i < n; i++) { ! j = (zSide >= 0) ? i : (n - i - 1); ! p[j] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; --- NEW FILE: AEndcapCryostatDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.AEndcapCryostatDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link AEndcapCryostatDetector}. * <p><font color="#880088"> * <pre> * $Log: AEndcapCryostatDetectorProxy.java,v $ * Revision 1.1 2008/04/27 21:38:05 hrivnac * Muons OK, Cryostat added * * </pre> * </font></p> * @version $Id: AEndcapCryostatDetectorProxy.java,v 1.1 2008/04/27 21:38:05 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class AEndcapCryostatDetectorProxy extends AEndcapCryostatDetector { /** Constructs a new endcap cryostat proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * @param sampling The sampling of this calorimeter part. * @param region The region of this calorimeter part. * @param rMin The inner radius. * @param rMax The outer radius. * @param zMin The inner z. * @param zMax The outer z. * @param neta The number of cells in eta. * @param nphi The number of cells in phi. */ public AEndcapCryostatDetectorProxy(String name, String color, int sampling, int region, double rMin, double rMax, double zMin, double zMax, int neta, int nphi) { super(name, color, sampling, region, rMin, rMax, zMin, zMax, neta, nphi); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } Index: AEndcapSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapSiliconDetector.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AEndcapSiliconDetector.java 17 Apr 2008 22:58:44 -0000 1.4 --- AEndcapSiliconDetector.java 27 Apr 2008 21:38:07 -0000 1.5 *************** *** 37,40 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/27 21:38:07 hrivnac + * Muons OK, Cryostat added + * * Revision 1.4 2008/04/17 22:58:44 hrivnac * using Atlantis to get geometry *************** *** 101,105 **** // Construct Atlantis representation ! atlantis2GraXML(points, true, phi0, nPhi, color, name + "[" + layer + "]"); } --- 104,108 ---- // Construct Atlantis representation ! atlantis2GraXML(points, true, phi0, nPhi, color, name + "[" + layer + "]_" + (k++)); } Index: ABox.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABox.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABox.java 25 Apr 2008 13:30:47 -0000 1.1 --- ABox.java 27 Apr 2008 21:38:00 -0000 1.2 *************** *** 46,49 **** --- 46,52 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/27 21:38:00 hrivnac + * Muons OK, Cryostat added + * * Revision 1.1 2008/04/25 13:30:47 hrivnac * box and trd prototype added *************** *** 69,75 **** if (_g == null) { _g = new BranchGroup(); ! use(_g, "Box", "Box Container"); } ! set(builder, _g, "Box"); // Get element properties --- 72,78 ---- if (_g == null) { _g = new BranchGroup(); ! use(_g, "BarrelMuonDetector", "Barrel Muon Detector Container"); } ! set(builder, _g, "BarrelMuonDetector"); // Get element properties *************** *** 90,93 **** --- 93,97 ---- Group orig = tg(); + String name0; String name1; for (int i = 0; i < phis.length; i++) { *************** *** 102,126 **** zSide * zI, zSide * zO, rI + rpcI, rO - rpcO, phi, sh, w, ! zSide * eta, phis[i]).zrho(), phi, ! - w / 2.0, w / 2.0, name, name1); if (rpcI > 0) { setTg(orig); ! atlantis2GraXML(new ABoxDetectorProxy("RPC" + name.substring(3) + "_I", zSide * zI, zSide * zO, rI, rI + rpcI, phi, sh, w, ! zSide * eta, phis[i]).zrho(), phi, ! - w / 2.0, w / 2.0, ! name, name1); } if (rpcO > 0) { setTg(orig); ! atlantis2GraXML(new ABoxDetectorProxy("RPC" + name.substring(3) + "_O", zSide * zI, zSide * zO, rO - rpcO, rO, phi, sh, w, ! zSide * eta, phis[i]).zrho(), phi, w, w, ! name, name1); } } --- 106,137 ---- zSide * zI, zSide * zO, rI + rpcI, rO - rpcO, phi, sh, w, ! zSide * eta, phis[i]).zrho(zSide), phi, ! w, w, ! zSide, name, name1); if (rpcI > 0) { setTg(orig); ! name0 = "RPC" + name.substring(3) + "_I"; ! name1 = name0 + "[" + eta + "/" + phis[i] + "/" + zSide + "]"; ! atlantis2GraXML(new ABoxDetectorProxy(name0, zSide * zI, zSide * zO, rI, rI + rpcI, phi, sh, w, ! zSide * eta, phis[i]).zrho(zSide), phi, ! w, w, ! zSide, ! name0, name1); } if (rpcO > 0) { setTg(orig); ! name0 = "RPC" + name.substring(3) + "_O"; ! name1 = name0 + "[" + eta + "/" + phis[i] + "/" + zSide + "]"; ! atlantis2GraXML(new ABoxDetectorProxy(name0, zSide * zI, zSide * zO, rO - rpcO, rO, phi, sh, w, ! zSide * eta, phis[i]).zrho(zSide), phi, w, w, ! zSide, ! name0, name1); } } Index: ABoxDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABoxDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABoxDetectorProxy.java 25 Apr 2008 13:30:48 -0000 1.1 --- ABoxDetectorProxy.java 27 Apr 2008 21:38:03 -0000 1.2 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/27 21:38:03 hrivnac + * Muons OK, Cryostat added + * * Revision 1.1 2008/04/25 13:30:48 hrivnac * box and trd prototype added *************** *** 46,55 **** /** Give z-rho projection. * @return The z-rho projection. */ ! public Point2d[] zrho() { double[][][] hv = getXZRZUser(1.0).hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { ! p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; --- 49,60 ---- /** Give z-rho projection. * @return The z-rho projection. */ ! public Point2d[] zrho(int zSide) { double[][][] hv = getXZRZUser(1.0).hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; + int j; for (int i = 0; i < n; i++) { ! j = (zSide >= 0) ? i : (n - i - 1); ! p[j] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:38:44
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26499/net/hep/atlas/graphics/JiveGeometry/Schema Modified Files: AGeometry.xsd Log Message: Muons OK, Cryostat added Index: AGeometry.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AGeometry.xsd 25 Apr 2008 13:30:49 -0000 1.6 --- AGeometry.xsd 27 Apr 2008 21:38:11 -0000 1.7 *************** *** 5,8 **** --- 5,11 ---- <!-- $Log$ + Revision 1.7 2008/04/27 21:38:11 hrivnac + Muons OK, Cryostat added + Revision 1.6 2008/04/25 13:30:49 hrivnac box and trd prototype added *************** *** 35,38 **** --- 38,42 ---- <xs:element ref="AEndcapCalorimeter"/> <xs:element ref="AGapCalorimeter"/> + <xs:element ref="AEndcapCryostat"/> <xs:element ref="ABarrelSiliconDetector"/> <xs:element ref="AEndcapSiliconDetector"/> *************** *** 182,185 **** --- 186,204 ---- </xs:element> + <xs:element name="AEndcapCryostat"> + <xs:complexType> + <xs:attribute name="c" type="xs:string" use="required"/> + <xs:attribute name="n" type="xs:string" use="required"/> + <xs:attribute name="sampling" type="xs:int" use="required"/> + <xs:attribute name="region" type="xs:int" use="required"/> + <xs:attribute name="rMin" type="xs:double" use="required"/> + <xs:attribute name="rMax" type="xs:double" use="required"/> + <xs:attribute name="zMin" type="xs:double" use="required"/> + <xs:attribute name="zMax" type="xs:double" use="required"/> + <xs:attribute name="neta" type="xs:int" use="required"/> + <xs:attribute name="nphi" type="xs:int" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="ABarrelSiliconDetector"> <xs:complexType> |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:38:33
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26499/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java JiveRep.java Log Message: Muons OK, Cryostat added Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JiveRep.java 25 Apr 2008 13:30:44 -0000 1.7 --- JiveRep.java 27 Apr 2008 21:38:00 -0000 1.8 *************** *** 21,24 **** --- 21,25 ---- import javax.media.j3d.Appearance; import javax.media.j3d.TransparencyAttributes; + import javax.media.j3d.PolygonAttributes; import javax.vecmath.Point2d; import javax.vecmath.Point3d; *************** *** 47,50 **** --- 48,54 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/27 21:38:00 hrivnac + * Muons OK, Cryostat added + * * Revision 1.7 2008/04/25 13:30:44 hrivnac * box and trd prototype added *************** *** 146,149 **** --- 150,154 ---- double widthM, double widthP, + int zSide, String color, String name) { *************** *** 160,164 **** phi, widthM, ! widthP), name, info); --- 165,170 ---- phi, widthM, ! widthP, ! zSide), name, info); *************** *** 182,201 **** double phi, double widthM, ! double widthP) { ! Point3d[] points = {new Point3d(- widthM / 2.0, zrho[0].y, zrho[0].x), ! new Point3d(- widthP / 2.0, zrho[1].y, zrho[1].x), ! new Point3d(- widthP / 2.0, zrho[2].y, zrho[2].x), ! new Point3d(- widthM / 2.0, zrho[3].y, zrho[3].x), ! new Point3d( widthM / 2.0, zrho[0].y, zrho[0].x), ! new Point3d( widthP / 2.0, zrho[1].y, zrho[1].x), ! new Point3d( widthP / 2.0, zrho[2].y, zrho[2].x), ! new Point3d( widthM / 2.0, zrho[3].y, zrho[3].x)}; Cuboid cuboid = new Cuboid(points, _appearance); Matrix3d m = new Matrix3d(UMATRIX); ! m.rotZ(phi); TransformGroup it = new TransformGroup(new Transform3D(m, ! new Vector3d(0,0,0), 1)); tg().addChild(it); --- 188,208 ---- double phi, double widthM, ! double widthP, ! int zSide) { ! Point3d[] points = {new Point3d(-widthM / 2.0, zrho[0].y, zrho[0].x), ! new Point3d(-widthP / 2.0, zrho[1].y, zrho[1].x), ! new Point3d(-widthP / 2.0, zrho[2].y, zrho[2].x), ! new Point3d(-widthM / 2.0, zrho[3].y, zrho[3].x), ! new Point3d( widthM / 2.0, zrho[0].y, zrho[0].x), ! new Point3d( widthP / 2.0, zrho[1].y, zrho[1].x), ! new Point3d( widthP / 2.0, zrho[2].y, zrho[2].x), ! new Point3d( widthM / 2.0, zrho[3].y, zrho[3].x)}; Cuboid cuboid = new Cuboid(points, _appearance); Matrix3d m = new Matrix3d(UMATRIX); ! m.rotZ(phi - PI / 2.0); TransformGroup it = new TransformGroup(new Transform3D(m, ! new Vector3d(0, 0, 0), 1)); tg().addChild(it); Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JiveGeometryBuilder.java 25 Apr 2008 13:30:35 -0000 1.8 --- JiveGeometryBuilder.java 27 Apr 2008 21:38:00 -0000 1.9 *************** *** 36,39 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.9 2008/04/27 21:38:00 hrivnac + * Muons OK, Cryostat added + * * Revision 1.8 2008/04/25 13:30:35 hrivnac * box and trd prototype added *************** *** 71,85 **** // Atlantis ! String fileSep = System.getProperty("file.separator"); ! String userHome = System.getProperty("user.home"); ! String fileNameUser = userHome + fileSep + ".Atlantis-config.xml"; ! log.info("Reading Atlantis configuration from " + fileNameUser); try { - InputStream isConfig = new FileInputStream(fileNameUser); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(true); DocumentBuilder parser = factory.newDocumentBuilder(); parser.setErrorHandler(new AXMLErrorHandler()); ! Node rootNode = parser.parse(isConfig).getDocumentElement(); new APar(AXMLUtils.getChild(rootNode, "Parameters")); } --- 74,84 ---- // Atlantis ! log.info("Reading Atlantis configuration from " + ATLANTIS_CONFIG); try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); factory.setValidating(true); DocumentBuilder parser = factory.newDocumentBuilder(); parser.setErrorHandler(new AXMLErrorHandler()); ! Node rootNode = parser.parse(getClass().getClassLoader().getResource(ATLANTIS_CONFIG).openStream()).getDocumentElement(); new APar(AXMLUtils.getChild(rootNode, "Parameters")); } *************** *** 93,97 **** * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml"}; return demos; } --- 92,96 ---- * @return The list of (embedded) demostration files. */ public String[] demos() { ! String[] demos = {"net/hep/atlas/graphics/JiveGeometry/Test/data/GGeometry.xml"}; return demos; } *************** *** 170,173 **** --- 169,174 ---- private static double _norm = 100.0; + private static String ATLANTIS_CONFIG = "net/hep/atlas/graphics/JiveGeometry/AtlantisConfig.xml"; + /** Logging . */ private static Logger log = Logger.getLogger(JiveGeometryBuilder.class); |
|
From: Julius H. <hr...@us...> - 2008-04-27 21:38:12
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26499/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometry.xml AMuonGeometry.xml Log Message: Muons OK, Cryostat added Index: AMuonGeometry.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AMuonGeometry.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AMuonGeometry.xml 24 Jan 2007 14:00:36 -0000 1.1 --- AMuonGeometry.xml 27 Apr 2008 21:38:12 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <Geometry> <ABox n="MDT_BIL" zi="33" zo="124.607" ri="474.091" ro="515.705" w="267.15" eta="1" phi="1 2 3 7" /> <ABox n="MDT_BIL" zi="51" zo="124.586" ri="474.091" ro="515.705" w="267.15" eta="1" phi="4" /> --- 1,67 ---- <?xml version="1.0"?> ! <!DOCTYPE AMuonGeometry [ ! <!ELEMENT AMuonGeometry (section)> ! <!ELEMENT section (ABox | ATBx | ATrd)*> ! <!ATTLIST section ! name CDATA " " ! version CDATA " " ! date CDATA " " ! author CDATA " " ! top_volume CDATA " " ! DTD_version CDATA " "> ! <!ELEMENT ABox EMPTY > ! <!ATTLIST ABox ! n CDATA #REQUIRED ! zi CDATA #REQUIRED ! zo CDATA #REQUIRED ! ri CDATA #REQUIRED ! ro CDATA #REQUIRED ! w CDATA #REQUIRED ! eta CDATA #REQUIRED ! phi CDATA #REQUIRED ! dphi CDATA "0" ! sh CDATA "0" ! RPCi CDATA "0" ! RPCo CDATA "0"> ! <!ELEMENT ATBx EMPTY > ! <!ATTLIST ATBx ! n CDATA #REQUIRED ! zi CDATA #REQUIRED ! zo CDATA #REQUIRED ! ri CDATA #REQUIRED ! ro CDATA #REQUIRED ! w CDATA #REQUIRED ! eta CDATA #REQUIRED ! phi CDATA #REQUIRED ! sh CDATA "0" ! dphi CDATA "0" ! RPCi CDATA "0" ! RPCo CDATA "0" ! zis CDATA #REQUIRED ! zos CDATA #REQUIRED ! ws CDATA #REQUIRED ! or CDATA "0"> ! <!ELEMENT ATrd EMPTY > ! <!ATTLIST ATrd ! n CDATA #REQUIRED ! zi CDATA #REQUIRED ! zo CDATA #REQUIRED ! ri CDATA #REQUIRED ! ro CDATA #REQUIRED ! wi CDATA #REQUIRED ! wo CDATA #REQUIRED ! eta CDATA #REQUIRED ! phi CDATA #REQUIRED ! dphi CDATA "0" ! sh CDATA "0" ! a CDATA "0"> ! ]> ! <AMuonGeometry> ! <section name = "AGMU" ! version = "Q02_initial" ! date = "" ! author = "Eric Jansen, Frans Crijns" ! top_volume = "" ! DTD_version = "v4"> <ABox n="MDT_BIL" zi="33" zo="124.607" ri="474.091" ro="515.705" w="267.15" eta="1" phi="1 2 3 7" /> <ABox n="MDT_BIL" zi="51" zo="124.586" ri="474.091" ro="515.705" w="267.15" eta="1" phi="4" /> *************** *** 164,166 **** <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="8" sh="56.6" /> ! </AGeometry> --- 227,231 ---- <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="6" sh="-56.6" /> <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="8" sh="56.6" /> ! </section> ! </AMuonGeometry> ! Index: AGeometry.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AGeometry.xml 25 Apr 2008 13:30:50 -0000 1.5 --- AGeometry.xml 27 Apr 2008 21:38:12 -0000 1.6 *************** *** 1,40 **** <?xml version="1.0"?> <AGeometry> - <!-- <ABarrelSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="0.306424" tilt="-19.9962" nz="13" nphi="22" r0="5.10491" phi0="7.78997" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="0.307646" tilt="-19.9962" nz="13" nphi="38" r0="8.88103" phi0="4.60732" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="0.30793" tilt="-19.9962" nz="13" nphi="52" r0="12.2722" phi0="3.3937" zMin="-40.5702" zMax="40.5702" /> - <AEndcapSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="48.7" zMax="49.7" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="57.2" zMax="58.2" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="64.2" zMax="65.2" /> - <ABarrelSiliconDetector c="SIL" n="Silicon" layer="0" length="12.609" width="6.144" thickness="0.844888" tilt="11.0351" nz="6" nphi="32" r0="30.134" phi0="3.2" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="1" length="12.609" width="6.144" thickness="0.760799" tilt="11.0283" nz="6" nphi="40" r0="37.2063" phi0="2.6" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="2" length="12.609" width="6.144" thickness="0.841372" tilt="11.2742" nz="6" nphi="48" r0="44.4326" phi0="2.1" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="3" length="12.609" width="6.144" thickness="0.780462" tilt="11.2709" nz="6" nphi="56" r0="51.4694" phi0="1.799" zMin="-74.8272" zMax="74.8272" /> ! ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="01" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="83.0567" zMax="84.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="02" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="86.0567" zMax="87.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="11" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="91.0768" zMax="92.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="12" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="91.6268" zMax="95.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="20" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="106.827" zMax="107.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="21" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="107.377" zMax="110.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="30" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="127.667" zMax="128.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="31" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="128.217" zMax="131.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="40" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="137.647" zMax="138.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="41" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="138.197" zMax="141.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="50" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="174.817" zMax="175.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="51" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="175.367" zMax="178.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="60" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="209.197" zMax="210.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="61" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="212.197" zMax="213.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="70" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="248.177" zMax="249.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="71" length="5.2475" width="6.83547" thickness="11.0247" nz="1" nphi="40" rMin="40.2836" rMax="45.7959" phi0="4.31982" zMin="251.177" zMax="252.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="80" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="1.03842" zMin="273.247" zMax="274.343" /> ! <ABarrelTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="56.7302" rMax="69.8248" phiIn="-6.17382" phiOut="-10.7369" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="70.1346" rMax="86.6458" phiIn="-10.7202" phiOut="-5.99874" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> - <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> --- 1,175 ---- <?xml version="1.0"?> + <!DOCTYPE AGeometry [ + <!ELEMENT AGeometry (AGeometryConstant | AGeneralPath | ADisc | ARectangle | + ABarrelCalorimeter | AEndcapCalorimeter | AGapCalorimeter | + ABarrelSiliconDetector | AEndcapSiliconDetector | + ABarrelTRTDetector | AEndcapTRTDetector)* > + <!ELEMENT AGeometryConstant EMPTY > + <!ATTLIST AGeometryConstant + n CDATA #REQUIRED + value CDATA #REQUIRED> + <!ELEMENT APoint EMPTY > + <!ATTLIST APoint + x CDATA #REQUIRED + y CDATA #REQUIRED> + <!ELEMENT AGeneralPath (APoint*) > + <!ATTLIST AGeneralPath + p CDATA #REQUIRED + c CDATA #REQUIRED + n CDATA #REQUIRED + numPoints CDATA #REQUIRED + xR (YES|NO) "YES" + yR (YES|NO) "YES"> + <!ELEMENT ADisc EMPTY > + <!ATTLIST ADisc + p CDATA #REQUIRED + c CDATA #REQUIRED + n CDATA #REQUIRED + rIn CDATA #REQUIRED + rOut CDATA #REQUIRED + nIn CDATA "256" + nOut CDATA "256"> + <!ELEMENT ARectangle EMPTY > + <!ATTLIST ARectangle + p CDATA #REQUIRED + c CDATA #REQUIRED + n CDATA #REQUIRED + xMin CDATA #REQUIRED + xMax CDATA #REQUIRED + yMin CDATA #REQUIRED + yMax CDATA #REQUIRED + xR (YES|NO) "YES" + yR (YES|NO) "YES"> + <!ELEMENT ABarrelCalorimeter EMPTY > + <!ATTLIST ABarrelCalorimeter + c CDATA #REQUIRED + n CDATA #REQUIRED + sampling CDATA #REQUIRED + region CDATA #REQUIRED + rMin CDATA #REQUIRED + rMax CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED + eta0 CDATA #REQUIRED + deta CDATA #REQUIRED + neta CDATA #REQUIRED + meta CDATA #REQUIRED + phi0 CDATA #REQUIRED + nphi CDATA #REQUIRED> + <!ELEMENT AEndcapCalorimeter EMPTY > + <!ATTLIST AEndcapCalorimeter + c CDATA #REQUIRED + n CDATA #REQUIRED + sampling CDATA #REQUIRED + region CDATA #REQUIRED + rMin CDATA #REQUIRED + rMax CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED + eta0 CDATA #REQUIRED + deta CDATA #REQUIRED + neta CDATA #REQUIRED + meta CDATA #REQUIRED + phi0 CDATA #REQUIRED + nphi CDATA #REQUIRED> + <!ELEMENT AGapCalorimeter EMPTY > + <!ATTLIST AGapCalorimeter + c CDATA #REQUIRED + n CDATA #REQUIRED + sampling CDATA #REQUIRED + region CDATA #REQUIRED + rMin CDATA #REQUIRED + rMax CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED + eta CDATA #REQUIRED + phi0 CDATA #REQUIRED + nphi CDATA #REQUIRED> + <!ELEMENT ABarrelSiliconDetector EMPTY > + <!ATTLIST ABarrelSiliconDetector + c CDATA #REQUIRED + n CDATA #REQUIRED + layer CDATA #REQUIRED + length CDATA #REQUIRED + width CDATA #REQUIRED + thickness CDATA #REQUIRED + tilt CDATA #REQUIRED + nz CDATA #REQUIRED + nphi CDATA #REQUIRED + r0 CDATA #REQUIRED + phi0 CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED> + <!ELEMENT AEndcapSiliconDetector EMPTY > + <!ATTLIST AEndcapSiliconDetector + c CDATA #REQUIRED + n CDATA #REQUIRED + layer CDATA #REQUIRED + length CDATA #REQUIRED + width CDATA #REQUIRED + thickness CDATA #REQUIRED + nz CDATA #REQUIRED + nphi CDATA #REQUIRED + rMin CDATA #REQUIRED + rMax CDATA #REQUIRED + phi0 CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED> + <!ELEMENT ABarrelTRTDetector EMPTY > + <!ATTLIST ABarrelTRTDetector + c CDATA #REQUIRED + n CDATA #REQUIRED + layer CDATA #REQUIRED + nphi CDATA #REQUIRED + rMin CDATA #REQUIRED + rMax CDATA #REQUIRED + phiIn CDATA #REQUIRED + phiOut CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED> + <!ELEMENT AEndcapTRTDetector EMPTY > + <!ATTLIST AEndcapTRTDetector + c CDATA #REQUIRED + n CDATA #REQUIRED + layer CDATA #REQUIRED + nphi CDATA #REQUIRED + rMin CDATA #REQUIRED + rMax CDATA #REQUIRED + phi0 CDATA #REQUIRED + zMin CDATA #REQUIRED + zMax CDATA #REQUIRED> + ]> + <AGeometry> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="0.306424" tilt="-19.9962" nz="13" nphi="22" r0="5.10491" phi0="7.78997" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="0.307646" tilt="-19.9962" nz="13" nphi="38" r0="8.88103" phi0="4.60732" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="0.30793" tilt="-19.9962" nz="13" nphi="52" r0="12.2722" phi0="3.3937" zMin="-40.5702" zMax="40.5702" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="48.7" zMax="49.7" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="57.2" zMax="58.2" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="64.2" zMax="65.2" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="0" length="12.609" width="6.144" thickness="0.844888" tilt="11.0351" nz="6" nphi="32" r0="30.134" phi0="3.2" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="1" length="12.609" width="6.144" thickness="0.760799" tilt="11.0283" nz="6" nphi="40" r0="37.2063" phi0="2.6" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="2" length="12.609" width="6.144" thickness="0.841372" tilt="11.2742" nz="6" nphi="48" r0="44.4326" phi0="2.1" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="3" length="12.609" width="6.144" thickness="0.780462" tilt="11.2709" nz="6" nphi="56" r0="51.4694" phi0="1.799" zMin="-74.8272" zMax="74.8272" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="83.0567" zMax="84.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="86.0567" zMax="87.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="91.0768" zMax="92.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="91.6268" zMax="95.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="106.827" zMax="107.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="107.377" zMax="110.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="127.667" zMax="128.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="128.217" zMax="131.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="137.647" zMax="138.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="138.197" zMax="141.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="174.817" zMax="175.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="175.367" zMax="178.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="209.197" zMax="210.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="212.197" zMax="213.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="248.177" zMax="249.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="5.2475" width="6.83547" thickness="11.0247" nz="1" nphi="40" rMin="40.2836" rMax="45.7959" phi0="4.31982" zMin="251.177" zMax="252.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="8" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="1.03842" zMin="273.247" zMax="274.343" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="56.7302" rMax="69.8248" phiIn="-6.17382" phiOut="-10.7369" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="70.1346" rMax="86.6458" phiIn="-10.7202" phiOut="-5.99874" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> *************** *** 51,65 **** <AEndcapTRTDetector c="TRT" n="TRT" layer="12" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="247.975" zMax="258.375" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="13" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="260.325" zMax="270.725" /> - <ADisc p="YX" c="Sol" n="Solenoid" rIn="122.9" rOut="127.4" /> <ARectangle p="RZ" c="Sol" n="Solenoid" xMin="-265" xMax="265" yMin="122.9" yMax="127.4" xR="NO" /> - <ABarrelCalorimeter c="ECAL" n="LAr Presampler" sampling="0" region="0" rMin="142.173" rMax="143.858" zMin="0" zMax="325.0" eta0="3.1225e-17" deta="0.025" neta="61" meta="0" phi0="-0.175783" nphi="64" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="0" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="0.003125" deta="0.003125" neta="447" meta="1" phi0="-0.175783" nphi="64" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="1" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="1.4" deta="0.025" neta="3" meta="0" phi0="-0.175783" nphi="256" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="0" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="0.0" deta="0.025" neta="56" meta="0" phi0="-0.175783" nphi="256" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="1" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="1.4" deta="0.075" neta="1" meta="0" phi0="-0.175783" nphi="256" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="3" region="0" rMin="184" rMax="198.47" zMin="0" zMax="325.0" eta0="0.0" deta="0.05" neta="27" meta="0" phi0="-0.175783" nphi="256" /> ! <AEndcapCalorimeter c="ECAL" n="LAr Endcap Presampler" sampling="0" region="0" rMin="29.0" rMax="203.4" zMin="368.075" zMax="371.425" eta0="1.50988" deta="0.025" neta="12" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.38444" deta="0.05" neta="1" meta="0" phi0="-0.234375" nphi="64" /> --- 186,197 ---- <AEndcapTRTDetector c="TRT" n="TRT" layer="12" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="247.975" zMax="258.375" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="13" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="260.325" zMax="270.725" /> <ADisc p="YX" c="Sol" n="Solenoid" rIn="122.9" rOut="127.4" /> <ARectangle p="RZ" c="Sol" n="Solenoid" xMin="-265" xMax="265" yMin="122.9" yMax="127.4" xR="NO" /> <ABarrelCalorimeter c="ECAL" n="LAr Presampler" sampling="0" region="0" rMin="142.173" rMax="143.858" zMin="0" zMax="325.0" eta0="3.1225e-17" deta="0.025" neta="61" meta="0" phi0="-0.175783" nphi="64" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="0" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="0.003125" deta="0.003125" neta="447" meta="1" phi0="-0.175783" nphi="64" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="1" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="1.4" deta="0.025" neta="3" meta="0" phi0="-0.175783" nphi="256" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="0" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="0.0" deta="0.025" neta="56" meta="0" phi0="-0.175783" nphi="256" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="1" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="1.4" deta="0.075" neta="1" meta="0" phi0="-0.175783" nphi="256" /> ! <ABarrelCalorimeter c="ECAL" n="LAr" sampling="3" region="0" rMin="184" rMax="198.47" zMin="0" zMax="325.0" eta0="0.0" deta="0.05" neta="27" meta="0" phi0="-0.175783" nphi="256" /> <AEndcapCalorimeter c="ECAL" n="LAr Endcap Presampler" sampling="0" region="0" rMin="29.0" rMax="203.4" zMin="368.075" zMax="371.425" eta0="1.50988" deta="0.025" neta="12" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.38444" deta="0.05" neta="1" meta="0" phi0="-0.234375" nphi="64" /> *************** *** 82,86 **** <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> - <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> --- 214,217 ---- *************** *** 89,93 **** <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> - <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> --- 220,223 ---- *************** *** 96,272 **** <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> - <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="1" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="2" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="3" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> ! --> ! <ABox n="MDT_BIL" zi="33" zo="124.607" ri="474.091" ro="515.705" w="267.15" eta="1" phi="1 2 3 7" /> ! <ABox n="MDT_BIL" zi="51" zo="124.586" ri="474.091" ro="515.705" w="267.15" eta="1" phi="4" /> ! <ABox n="MDT_BIL" zi="56" zo="147.607" ri="525.691" ro="567.305" w="267.15" eta="1" phi="5" /> ! <ABox n="MDT_BIL" zi="125" zo="234.628" ri="474.091" ro="515.705" w="267.15" eta="2" phi="1 2 3 4 5 7" /> ! <ABox n="MDT_BIL" zi="235" zo="326.607" ri="474.091" ro="515.705" w="267.15" eta="3" phi="1 2 4 5 7" /> ! <ABox n="MDT_BIL" zi="235" zo="344.628" ri="474.091" ro="515.705" w="267.15" eta="3" phi="3" /> ! <ABox n="MDT_BIL" zi="345" zo="454.628" ri="474.091" ro="515.705" w="267.15" eta="4" phi="1 2 3 4 5" /> ! <ABox n="MDT_BIL" zi="345" zo="436.607" ri="474.091" ro="515.705" w="267.15" eta="4" phi="7" /> ! <ABox n="MDT_BIL" zi="455" zo="546.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="1 2 3 4 5" /> ! <ABox n="MDT_BIL" zi="437" zo="528.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="7" /> ! <ABox n="MDT_BIL" zi="547" zo="656.628" ri="474.091" ro="515.705" w="267.15" eta="6" phi="1 2 3 5" /> ! <ABox n="MDT_BIL" zi="547" zo="638.607" ri="474.091" ro="515.705" w="267.15" eta="6" phi="4 7" /> ! <ABox n="MDT_BIS" zi="1" zo="110.628" ri="440.793" ro="474.707" w="167.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="111" zo="202.607" ri="440.793" ro="474.707" w="167.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="203" zo="294.607" ri="440.793" ro="474.707" w="167.15" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="295" zo="386.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="313" zo="404.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="387" zo="478.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="405" zo="496.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="479" zo="570.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="497" zo="588.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="571" zo="680.628" ri="440.793" ro="474.707" w="167.15" eta="7" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="589" zo="680.607" ri="440.793" ro="474.707" w="167.15" eta="7" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="681" zo="730.558" ri="454.864" ro="471.645" w="85.15" eta="8" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BML" zi="15" zo="184.698" ri="675.194" ro="754.205" w="357.6" eta="1" phi="1 2" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="39" zo="184.67" ri="675.194" ro="754.205" w="357.6" eta="1" phi="3 7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="87" zo="184.614" ri="675.194" ro="753.005" w="357.6" eta="1" phi="4 5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="63" zo="184.642" ri="675.194" ro="753.005" w="357.6" eta="1" phi="6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="185" zo="354.698" ri="675.194" ro="754.205" w="357.6" eta="2" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="355" zo="524.698" ri="675.194" ro="754.205" w="357.6" eta="3" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="525" zo="646.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="5" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="5" phi="7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="6" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="6" phi="7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="7" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="15" zo="184.698" ri="777.694" ro="842.905" w="309.6" eta="1" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="185" zo="364.5" ri="777.694" ro="842.905" w="309.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="368" zo="513.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="514" zo="691.35" ri="777.694" ro="842.905" w="309.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="692.5" zo="790.114" ri="777.694" ro="841.705" w="309.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="790.5" zo="936.17" ri="777.694" ro="842.905" w="309.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BOL" zi="15" zo="232.754" ri="924.444" ro="989.055" w="498.6" eta="1" phi="1 2" RPCo="15" /> ! <ABox n="MDT_BOL" zi="39" zo="232.726" ri="924.444" ro="989.055" w="498.6" eta="1" phi="3" RPCo="15" /> ! <ABox n="MDT_BOL" zi="87" zo="232.67" ri="924.444" ro="989.055" w="498.6" eta="1" phi="4 5" RPCo="15" /> ! <ABox n="MDT_BOL" zi="63" zo="232.698" ri="924.444" ro="989.055" w="498.6" eta="1" phi="6 7 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="233" zo="450.754" ri="924.444" ro="989.055" w="498.6" eta="2" phi="1 2 3 4 5 6 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="233" zo="378.67" ri="924.444" ro="989.055" w="498.6" eta="2" phi="7" RPCo="15" /> ! <ABox n="MDT_BOL" zi="451" zo="620.698" ri="924.444" ro="989.055" w="498.6" eta="3" phi="1 2 3 4 5 6 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="379" zo="524.67" ri="924.444" ro="989.055" w="498.6" eta="3" phi="7" RPCo="15" /> ! <ABox n="MDT_BOL" zi="621" zo="838.754" ri="924.444" ro="989.055" w="498.6" eta="4" phi="1 2 3 4 5 6 7 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="839" zo="1056.75" ri="924.444" ro="989.055" w="498.6" eta="5" phi="1 2 3 4 5 6 7 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="1057" zo="1226.7" ri="924.444" ro="989.055" w="498.6" eta="6" phi="1 2 3 4 5 6 7 8" RPCo="15" /> ! <ABox n="MDT_BOS" zi="1" zo="218.754" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="1 2 3 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="73" zo="218.67" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="4" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="219" zo="436.754" ri="1019.19" ro="1082.46" w="379.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="437" zo="654.754" ri="1019.19" ro="1082.46" w="379.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="655" zo="872.754" ri="1019.19" ro="1082.46" w="379.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="873" zo="1090.75" ri="1019.19" ro="1082.46" w="379.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="1091" zo="1284.73" ri="1019.19" ro="1082.46" w="379.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BEE" zi="889" zo="1034.67" ri="433.023" ro="452.33" w="91.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BEE" zi="1035" zo="1180.67" ri="433.023" ro="452.33" w="91.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="6" sh="11.65" /> ! <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="8" sh="-11.65" /> ! <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="6" sh="68.4" /> ! <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="8" sh="-68.4" /> ! <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="6" sh="46.85" /> ! <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="8" sh="-46.85" /> ! <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="6" sh="68.4" /> ! <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="8" sh="-68.4" /> ! <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="6" sh="68.4" /> ! <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="8" sh="-68.4" /> ! <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="6" sh="46.85" /> ! <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="8" sh="-46.85" /> ! <ABox n="MDT_BMF" zi="62.5" zo="280.254" ri="777.694" ro="842.905" w="309.6" eta="1" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMF" zi="406" zo="599.726" ri="777.694" ro="842.905" w="309.6" eta="2" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMF" zi="728" zo="873.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BOF" zi="62.57" zo="280.324" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOF" zi="405.46" zo="599.186" ri="1028.19" ro="1107.41" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOF" zi="727.92" zo="873.59" ri="1028.19" ro="1107.41" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOF" zi="1002.6" zo="1124.24" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="-60" zo="61.6418" ri="1028.19" ro="1093.06" w="379.6" eta="0" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="282.07" zo="403.712" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="602.73" zo="724.372" ri="1028.19" ro="1093.06" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="877.14" zo="998.782" ri="1028.19" ro="1106.21" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="1147.2" zo="1268.84" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> ! ! <ATrd n="MDT_EIL1" zi="749.146" zo="785.86" ri="207.6" ro="317.228" wi="132.15" wo="186.9" eta="1" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EIL2" zi="749.146" zo="785.86" ri="319.1" ro="428.728" wi="186.15" wo="240.9" eta="2" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.23" ro="464.774" wi="207.15" wo="207.15" eta="3" phi="1 2 3 4 5 7" /> ! <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="6" sh="-16.5" /> ! <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="8" sh="16.5" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="509.544" wi="153.65" wo="153.65" eta="4" phi="1 5" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="635.691" wi="235.15" wo="316.9" eta="4" phi="2 3 7" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="473.105" ro="636.796" wi="165.15" wo="246.9" eta="4" phi="4" sh="35" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="6" sh="-62.5" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="8" sh="62.5" /> ! <ATrd n="MDT_EIL5" zi="745.796" zo="782.51" ri="508.04" ro="635.689" wi="253.15" wo="316.9" eta="5" phi="1 5" /> ! <ATrd n="MDT_EML1" zi="1411.25" zo="1447.66" ri="177" ro="346.698" wi="118.65" wo="203.4" eta="1" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML2" zi="1411.25" zo="1447.66" ri="348.5" ro="542.226" wi="202.65" wo="299.4" eta="2" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML3" zi="1411.25" zo="1447.66" ri="544" ro="737.726" wi="298.65" wo="395.4" eta="3" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML4" zi="1411.25" zo="1447.66" ri="739.5" ro="933.226" wi="394.65" wo="491.4" eta="4" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML5" zi="1411.25" zo="1447.66" ri="935" ro="1128.73" wi="490.65" wo="587.4" eta="5" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EMS1" zi="1369.65" zo="1406.06" ri="177" ro="370.726" wi="83.55" wo="141.6" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS2" zi="1369.65" zo="1406.06" ri="372.5" ro="566.226" wi="141.15" wo="199.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS3" zi="1369.65" zo="1406.06" ri="568" ro="761.726" wi="198.75" wo="256.8" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS4" zi="1369.65" zo="1406.06" ri="763.5" ro="957.226" wi="256.35" wo="314.4" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS5" zi="1369.65" zo="1406.06" ri="959" ro="1152.73" wi="313.95" wo="372" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOL1" zi="2117.5" zo="2153.91" ri="277" ro="446.698" wi="168.15" wo="252.9" eta="1" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL2" zi="2117.5" zo="2153.91" ri="448.5" ro="618.198" wi="264.15" wo="348.9" eta="2" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL3" zi="2117.5" zo="2153.91" ri="620" ro="765.67" wi="348.15" wo="420.9" eta="3" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL4" zi="2117.5" zo="2153.91" ri="767.5" ro="913.17" wi="420.15" wo="492.9" eta="4" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL5" zi="2117.5" zo="2153.91" ri="915" ro="1060.67" wi="492.15" wo="564.9" eta="5" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL6" zi="2117.5" zo="2153.91" ri="1062.5" ro="1208.17" wi="564.15" wo="636.9" eta="6" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOS1" zi="2158.4" zo="2194.81" ri="277" ro="446.698" wi="124.95" wo="175.8" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS2" zi="2158.4" zo="2194.81" ri="448.5" ro="618.198" wi="175.35" wo="226.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS3" zi="2158.4" zo="2194.81" ri="620" ro="789.698" wi="225.75" wo="276.6" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS4" zi="2158.4" zo="2194.81" ri="791.5" ro="937.17" wi="276.15" wo="319.8" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS5" zi="2158.4" zo="2194.81" ri="939" ro="1084.67" wi="319.35" wo="363" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS6" zi="2158.4" zo="2194.81" ri="1086.5" ro="1232.17" wi="362.55" wo="406.2" eta="6" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="TGC_T1F1" zi="1327.15" zo="1334.15" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> ! <ATrd n="TGC_T1F1" zi="1345.05" zo="1352.05" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> ! <ATrd n="TGC_T1E1" zi="1345.05" zo="1359.95" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> ! <ATrd n="TGC_T1E1" zi="1327.15" zo="1342.05" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> ! <ATrd n="TGC_T2F1" zi="1460.05" zo="1464.42" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> ! <ATrd n="TGC_T2F1" zi="1475.55" zo="1479.92" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> ! <ATrd n="TGC_T2E1" zi="1475.55" zo="1485.42" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> ! <ATrd n="TGC_T2E1" zi="1460.05" zo="1469.92" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> ! <ATrd n="TGC_T3F1" zi="1502.05" zo="1506.42" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> ! <ATrd n="TGC_T3F1" zi="1517.55" zo="1521.92" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> ! <ATrd n="TGC_T3E1" zi="1517.55" zo="1527.42" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> ! <ATrd n="TGC_T3E1" zi="1502.05" zo="1511.92" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> ! <ATrd n="TGC_T4F1" zi="698.06" zo="702.43" ri="217" ro="443.4" wi="62.38" wo="121.99" eta="1" phi="1 3 4 6 7 9 10 12 13 15 16 18 19 21 22 24" dphi="7.5" /> ! <ATrd n="TGC_T4F1" zi="693.04" zo="697.41" ri="217" ro="433.4" wi="62.38" wo="119.36" eta="1" phi="2 5 8 11 14 17 20 23" dphi="7.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="1 4 7" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="2" dphi="-5.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="3 6" dphi="5.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="5 8" dphi="-5.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="9 12" dphi="15" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="10" dphi="9.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="11 14" dphi="20.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="13" dphi="9.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="15" dphi="15" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="16" dphi="35.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="17" dphi="30" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="18" dphi="24.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="19" dphi="45" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="20" dphi="39.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="21" dphi="50.5" /> ! <ATrd n="MDT_EIS1" zi="707.746" zo="744.46" ri="207.6" ro="335.249" wi="89.85" wo="128.1" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EIS2" zi="707.746" zo="744.46" ri="337.1" ro="446.728" wi="127.65" wo="160.5" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="CSC_CSS1" zi="708.06" zo="724.63" ri="87.0128" ro="206.473" wi="40.29" wo="74.75" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" a="-11.587" /> ! <ATrd n="CSC_CSL1" zi="744.319" zo="760.889" ri="92.4354" ro="207.125" wi="61.01" wo="112.87" eta="1" phi="1 2 3 4 5 6 7 8" a="-11.587" /> ! ! <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="8" sh="56.6" /> ! </AGeometry> --- 226,237 ---- <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> ! <AEndcapCryostat c="HCAL" n="Minimum Bias Trigger Scintillators" sampling="0" region="0" rMin="15.3" rMax="42.6" zMin="319.187" zMax="321.187" neta="1" nphi="8" /> ! <AEndcapCryostat c="HCAL" n="Minimum Bias Trigger Scintillators" sampling="1" region="0" rMin="42.6" rMax="89" zMin="319.187" zMax="321.187" neta="1" nphi="8" /> </AGeometry> + |
|
From: Julius H. <hr...@us...> - 2008-04-25 13:31:19
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9729/net/hep/atlas/graphics/JiveGeometry/GeometricModel Modified Files: JiveGeometryBuilder.java JiveRep.java Log Message: box and trd prototype added Index: JiveRep.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveRep.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JiveRep.java 17 Apr 2008 22:57:41 -0000 1.6 --- JiveRep.java 25 Apr 2008 13:30:44 -0000 1.7 *************** *** 15,18 **** --- 15,20 ---- import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; + import javax.media.j3d.TransformGroup; + import javax.media.j3d.Transform3D; import javax.media.j3d.Link; import javax.media.j3d.Shape3D; *************** *** 20,29 **** --- 22,38 ---- import javax.media.j3d.TransparencyAttributes; import javax.vecmath.Point2d; + import javax.vecmath.Point3d; + import javax.vecmath.Matrix3d; + import javax.vecmath.Vector3d; // FreeHEP import org.freehep.j3d.Ring; + import org.freehep.j3d.Trapezoid; + import org.freehep.j3d.Cuboid; // Java import static java.lang.Math.PI; + import static java.lang.Math.sin; + import static java.lang.Math.cos; // JAXB *************** *** 38,41 **** --- 47,53 ---- * <pre> * $Log$ + * Revision 1.7 2008/04/25 13:30:44 hrivnac + * box and trd prototype added + * * Revision 1.6 2008/04/17 22:57:41 hrivnac * using Atlantis to get geometry *************** *** 122,125 **** --- 134,207 ---- } + // TBD + /** Convert Atlantis geometry representation to GraXML one. + * Create corresponding {@link PolyGoneSegment}s. + * @param zrho The z-rho-coordinates of one solid quadrant. + * @param reflect The whether z-reflected solid should be created too. + * @param nPhi The number of solid' subdivisions in phi. + * @param color The name of the solid' color. + * @param name The solid' name. */ + protected void atlantis2GraXML(Point2d[] zrho, + double phi, + double widthM, + double widthP, + String color, + String name) { + + // Set info + String info = name; + + // Set Appearance + _appearance = builder().appearance(name, color); + //_appearance. setTransparencyAttributes(new TransparencyAttributes(TransparencyAttributes.NICEST, 0.5f)); + + // Create Box + use(cuboid(zrho, + phi, + widthM, + widthP), + name, info); + + } + + /** Draw one Jet0 as a {@link ConeSegment}. TBD + * @param name The name of the Jet0. + * @param x The x-coordinate of the Cone start point. + * @param y The y-coordinate of the Cone start point. + * @param z The z-coordinate of the Cone start point. + * @param r The r-coordinate of the Cone start point. + * @param phi The phi-coordinate of the Cone. + * @param delX The x-length of the Cone. + * @param delY The y-length of the Cone. + * @param delZ The z-length of the Cone. + * @param delR The r-length of the Cone. + * @param pt The pt of the Jet0. + * @return The {@link ConeSegment} representing the Jet0. */ + // TBD: simplify + private Shape3D cuboid(Point2d[] zrho, + double phi, + double widthM, + double widthP) { + Point3d[] points = {new Point3d(- widthM / 2.0, zrho[0].y, zrho[0].x), + new Point3d(- widthP / 2.0, zrho[1].y, zrho[1].x), + new Point3d(- widthP / 2.0, zrho[2].y, zrho[2].x), + new Point3d(- widthM / 2.0, zrho[3].y, zrho[3].x), + new Point3d( widthM / 2.0, zrho[0].y, zrho[0].x), + new Point3d( widthP / 2.0, zrho[1].y, zrho[1].x), + new Point3d( widthP / 2.0, zrho[2].y, zrho[2].x), + new Point3d( widthM / 2.0, zrho[3].y, zrho[3].x)}; + + Cuboid cuboid = new Cuboid(points, + _appearance); + Matrix3d m = new Matrix3d(UMATRIX); + m.rotZ(phi); + TransformGroup it = new TransformGroup(new Transform3D(m, + new Vector3d(0,0,0), + 1)); + tg().addChild(it); + setTg(it); + return cuboid; + } + /** Use Java3D {@link BranchGroup} as a GraXML building block: * <ul> *************** *** 223,226 **** --- 305,312 ---- private String _parent; + private static final Matrix3d UMATRIX = new Matrix3d(1.0, 0.0, 0.0, + 0.0, 1.0, 0.0, + 0.0, 0.0, 1.0); + /** Logging . */ private static Logger log = Logger.getLogger(JiveRep.class); Index: JiveGeometryBuilder.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/JiveGeometryBuilder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JiveGeometryBuilder.java 15 Oct 2007 15:46:54 -0000 1.7 --- JiveGeometryBuilder.java 25 Apr 2008 13:30:35 -0000 1.8 *************** *** 17,20 **** --- 17,30 ---- import java.util.Map; import java.util.TreeMap; + import java.io.InputStream; + import java.io.FileInputStream; + import javax.xml.parsers.DocumentBuilder; + import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Node; + + // Atlantis + import atlantis.parameters.APar; + import atlantis.utils.xml.AXMLUtils; + import atlantis.utils.xml.AXMLErrorHandler; // Log4J *************** *** 26,29 **** --- 36,42 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/25 13:30:35 hrivnac + * box and trd prototype added + * * Revision 1.7 2007/10/15 15:46:54 hrivnac * cleaning *************** *** 55,59 **** /** Perform configuration. */ public void configure() { ! BuildOptions.setColorPerMaterial(true); } --- 68,91 ---- /** Perform configuration. */ public void configure() { ! BuildOptions.setColorPerMaterial(true); ! ! // Atlantis ! String fileSep = System.getProperty("file.separator"); ! String userHome = System.getProperty("user.home"); ! String fileNameUser = userHome + fileSep + ".Atlantis-config.xml"; ! log.info("Reading Atlantis configuration from " + fileNameUser); ! try { ! InputStream isConfig = new FileInputStream(fileNameUser); ! DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); ! factory.setValidating(true); ! DocumentBuilder parser = factory.newDocumentBuilder(); ! parser.setErrorHandler(new AXMLErrorHandler()); ! Node rootNode = parser.parse(isConfig).getDocumentElement(); ! new APar(AXMLUtils.getChild(rootNode, "Parameters")); ! } ! catch (Exception e) { ! log.error("Atlantis configuration is unreadable", e); ! } ! } |
|
From: Julius H. <hr...@us...> - 2008-04-25 13:31:09
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9729/net/hep/atlas/graphics/JiveGeometry/Schema Modified Files: AGeometry.xsd Log Message: box and trd prototype added Index: AGeometry.xsd =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Schema/AGeometry.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AGeometry.xsd 17 Apr 2008 22:59:31 -0000 1.5 --- AGeometry.xsd 25 Apr 2008 13:30:49 -0000 1.6 *************** *** 5,8 **** --- 5,11 ---- <!-- $Log$ + Revision 1.6 2008/04/25 13:30:49 hrivnac + box and trd prototype added + Revision 1.5 2008/04/17 22:59:31 hrivnac using Atlantis to get geometry *************** *** 252,256 **** <xs:attribute name="ro" type="xs:double" use="required"/> <xs:attribute name="w" type="xs:double" use="required"/> ! <xs:attribute name="eta" type="xs:double" use="required"/> <xs:attribute name="phi" type="xs:string" use="required"/> <xs:attribute name="dphi" type="xs:double" use="required"/> --- 255,259 ---- <xs:attribute name="ro" type="xs:double" use="required"/> <xs:attribute name="w" type="xs:double" use="required"/> ! <xs:attribute name="eta" type="xs:int" use="required"/> <xs:attribute name="phi" type="xs:string" use="required"/> <xs:attribute name="dphi" type="xs:double" use="required"/> *************** *** 291,295 **** <xs:attribute name="wi" type="xs:double" use="required"/> <xs:attribute name="wo" type="xs:double" use="required"/> ! <xs:attribute name="eta" type="xs:double" use="required"/> <xs:attribute name="phi" type="xs:string" use="required"/> <xs:attribute name="dphi" type="xs:double" use="required"/> --- 294,298 ---- <xs:attribute name="wi" type="xs:double" use="required"/> <xs:attribute name="wo" type="xs:double" use="required"/> ! <xs:attribute name="eta" type="xs:int" use="required"/> <xs:attribute name="phi" type="xs:string" use="required"/> <xs:attribute name="dphi" type="xs:double" use="required"/> |
|
From: Julius H. <hr...@us...> - 2008-04-25 13:30:53
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9729/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeterDetectorProxy.java Added Files: ABox.java ABoxDetectorProxy.java ATrapezoidDetectorProxy.java ATrd.java Log Message: box and trd prototype added Index: ABarrelCalorimeterDetectorProxy.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeterDetectorProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ABarrelCalorimeterDetectorProxy.java 17 Apr 2008 22:58:03 -0000 1.1 --- ABarrelCalorimeterDetectorProxy.java 25 Apr 2008 13:30:46 -0000 1.2 *************** *** 12,15 **** --- 12,18 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/25 13:30:46 hrivnac + * box and trd prototype added + * * Revision 1.1 2008/04/17 22:58:03 hrivnac * using Atlantis to get geometry *************** *** 48,51 **** --- 51,55 ---- /** Give z-rho projection. * @return The z-rho projection. */ + // TBD: refactor public Point2d[] zrho() { double[][][] hv = getRZUser().hv; --- NEW FILE: ABox.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.ABoxType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Atlantis import atlantis.utils.AMath; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.media.j3d.TransformGroup; import javax.media.j3d.Transform3D; import javax.media.j3d.Appearance; import javax.vecmath.Point3d; import javax.vecmath.Point2d; import javax.vecmath.Vector3d; import javax.vecmath.Matrix3d; // FreeHEP import org.freehep.j3d.Trapezoid; // Java import static java.lang.Math.PI; import static java.lang.Math.sin; import static java.lang.Math.cos; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>ABox</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.ABox} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: ABox.java,v $ * Revision 1.1 2008/04/25 13:30:47 hrivnac * box and trd prototype added * * </pre> * </font></p> * @version $Id: ABox.java,v 1.1 2008/04/25 13:30:47 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ABox extends JiveRep { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); // Verify element type if (! (element instanceof ABoxType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Create container if (_g == null) { _g = new BranchGroup(); use(_g, "Box", "Box Container"); } set(builder, _g, "Box"); // Get element properties ABoxType aBox = (ABoxType)element; String name = aBox.getN(); double rI = aBox.getRi() / builder().norm(); double rO = aBox.getRo() / builder().norm(); double zI = aBox.getZi() / builder().norm(); double zO = aBox.getZo() / builder().norm(); double rpcI = aBox.getRPCi() / builder().norm(); double rpcO = aBox.getRPCo() / builder().norm(); double w = aBox.getW() / builder().norm(); double sh = aBox.getSh() / builder().norm(); int eta = aBox.getEta(); int[] phis = ints(aBox.getPhi()); double dPhi = aBox.getDphi(); Group orig = tg(); String name1; for (int i = 0; i < phis.length; i++) { // Get 2d representation from Atlantis // Find dimensions // Construct Atlantis representation double phi = calculatePhi(name, dPhi, phis[i]); for (int zSide = -1; zSide <= 1; zSide += 2) { name1 = name + "[" + eta + "/" + phis[i] + "/" + zSide + "]"; setTg(orig); atlantis2GraXML(new ABoxDetectorProxy(name, zSide * zI, zSide * zO, rI + rpcI, rO - rpcO, phi, sh, w, zSide * eta, phis[i]).zrho(), phi, - w / 2.0, w / 2.0, name, name1); if (rpcI > 0) { setTg(orig); atlantis2GraXML(new ABoxDetectorProxy("RPC" + name.substring(3) + "_I", zSide * zI, zSide * zO, rI, rI + rpcI, phi, sh, w, zSide * eta, phis[i]).zrho(), phi, - w / 2.0, w / 2.0, name, name1); } if (rpcO > 0) { setTg(orig); atlantis2GraXML(new ABoxDetectorProxy("RPC" + name.substring(3) + "_O", zSide * zI, zSide * zO, rO - rpcO, rO, phi, sh, w, zSide * eta, phis[i]).zrho(), phi, w, w, name, name1); } } } } // TBD static private double calculatePhi(String name, double phi0, int phiIndex) { String technology = name.substring(0, 3); if (technology.equals("TGC")) { if (name.charAt(6) == 'E' && name.charAt(5) != '4') { return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 24.; } else { return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 12.; } } else { return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 4.; } } private static int k = 0; private static BranchGroup _g; private static final Matrix3d UMATRIX = new Matrix3d(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); /** Logging . */ private static Logger log = Logger.getLogger(ABox.class); } --- NEW FILE: ATrd.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveGeometryBuilder; import net.hep.atlas.graphics.JiveGeometry.GeometricModel.JiveRep; // Generic Model import net.hep.atlas.graphics.JiveGeometry.JAXB.ATrdType; // GraXML import net.hep.graphics.GraXML.GraXMLJAXBRep; import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Atlantis import atlantis.utils.AMath; // Java3D import javax.media.j3d.Group; import javax.media.j3d.BranchGroup; import javax.media.j3d.TransformGroup; import javax.media.j3d.Transform3D; import javax.media.j3d.Appearance; import javax.vecmath.Point3d; import javax.vecmath.Point2d; import javax.vecmath.Vector3d; import javax.vecmath.Matrix3d; // FreeHEP import org.freehep.j3d.Trapezoid; // Java import static java.lang.Math.PI; import static java.lang.Math.sin; import static java.lang.Math.cos; import static java.lang.Math.sinh; import static java.lang.Math.toRadians; // Log4J import org.apache.log4j.Logger; /** GraXML representation {@link GraXMLJAXBRep} of <code>ATrd</code> JiveGeometry element * connected via JAXB {@link net.hep.atlas.graphics.JiveGeometry.JAXB.ATrd} generic JAXB * interface. * <p><font color="#880088"> * <pre> * $Log: ATrd.java,v $ * Revision 1.1 2008/04/25 13:30:49 hrivnac * box and trd prototype added * * </pre> * </font></p> * @version $Id: ATrd.java,v 1.1 2008/04/25 13:30:49 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public final class ATrd extends JiveRep { public final void traverse(MasterBuilder builder, Object element, Group tg, String parent) { // Set values set(builder, tg, parent); // Verify element type if (! (element instanceof ATrdType)) { log.error(element + " can't be traversed using " + getClass().getName() + " representation"); return; } // Create container if (_g == null) { _g = new BranchGroup(); use(_g, "Trd", "Trd Container"); } set(builder, _g, "Trd"); // Get element properties ATrdType aTrd = (ATrdType)element; String name = aTrd.getN(); double rI = aTrd.getRi() / builder().norm(); double rO = aTrd.getRo() / builder().norm(); double zI = aTrd.getZi() / builder().norm(); double zO = aTrd.getZo() / builder().norm(); double wI = aTrd.getWi() / builder().norm(); double wO = aTrd.getWo() / builder().norm(); double a = aTrd.getA() / builder().norm(); int eta = aTrd.getEta(); int[] phis = ints(aTrd.getPhi()); double dPhi = aTrd.getDphi(); Group orig = tg(); String name1; for (int i = 0; i < phis.length; i++) { // Get 2d representation from Atlantis // Find dimensions // Construct Atlantis representation double phi = calculatePhi(name, dPhi, phis[i]); for (int zSide = -1; zSide <= 1; zSide += 2) { name1 = name + "[" + eta + "/" + phis[i] + "/" + zSide + "]"; setTg(orig); atlantis2GraXML(new ATrapezoidDetectorProxy(name, zSide * zI, zSide * zO, rI, rO, phi, wI, wO, a, zSide * eta, phis[i]).zrho(), phi, wI, wO, name, name1); } } } // TBD static private double calculatePhi(String name, double phi0, int phiIndex) { String technology = name.substring(0, 3); if (technology.equals("TGC")) { if (name.charAt(6) == 'E' && name.charAt(5) != '4') { return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 24.; } else { return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 12.; } } else { return phi0 * AMath.DEGREES_TO_RADIANS + (phiIndex - 1) * Math.PI / 4.; } } private static int k = 0; private static BranchGroup _g; private static final Matrix3d UMATRIX = new Matrix3d(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0); /** Logging . */ private static Logger log = Logger.getLogger(ATrd.class); } --- NEW FILE: ABoxDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.ABoxDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link ABoxDetector}. * <p><font color="#880088"> * <pre> * $Log: ABoxDetectorProxy.java,v $ * Revision 1.1 2008/04/25 13:30:48 hrivnac * box and trd prototype added * * </pre> * </font></p> * @version $Id: ABoxDetectorProxy.java,v 1.1 2008/04/25 13:30:48 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class ABoxDetectorProxy extends ABoxDetector { /** Constructs a new barrel calorimeter prABoxDetectorProxy TBD * @param name The name of the object. * @param zMin The inner z. * @param zMax The outer z. * @param rMin The inner radius. * @param rMax The outer radius. * @param phi0 The start of the first cell in phi. * @param excl The start of the first cell in eta. * @param size The size of a cell in eta. * @param neta The number of cells in eta. * @param meta The eta index of the first cell. * @param nphi The number of cells in phi. */ public ABoxDetectorProxy(String name, double zMin, double zMax, double rMin, double rMax, double phi, double excl, double size, int stationEta, int stationPhi) { super(name, zMin, zMax, rMin, rMax, phi, excl, size, stationEta, stationPhi); _name = name; } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getXZRZUser(1.0).hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } // TBD public String name() { return _name; } private String _name; } --- NEW FILE: ATrapezoidDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.ATrapezoidDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link ATrapezoidDetector}. * <p><font color="#880088"> * <pre> * $Log: ATrapezoidDetectorProxy.java,v $ * Revision 1.1 2008/04/25 13:30:48 hrivnac * box and trd prototype added * * </pre> * </font></p> * @version $Id: ATrapezoidDetectorProxy.java,v 1.1 2008/04/25 13:30:48 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class ATrapezoidDetectorProxy extends ATrapezoidDetector { /** Constructs a new barrel calorimeter prABoxDetectorProxy TBD * @param name The name of the object. * @param color The name of the color used to draw this object. * @param sampling The sampling of this calorimeter part. * @param region The region of this calorimeter part. * @param rMin The inner radius. * @param rMax The outer radius. * @param zMin The inner z. * @param zMax The outer z. * @param eta0 The start of the first cell in eta. * @param deta The size of a cell in eta. * @param neta The number of cells in eta. * @param meta The eta index of the first cell. * @param phi0 The start of the first cell in phi. * @param nphi The number of cells in phi. */ public ATrapezoidDetectorProxy(String name, double zMin, double zMax, double rMin, double rMax, double phi, double sizeS, double sizeL, double alpha, int stationEta, int stationPhi) { super(name, zMin, zMax, rMin, rMax, phi, sizeS, sizeL, alpha, stationEta, stationPhi); _name = name; } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getXZRZUser(1.0).hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } // TBD public String name() { return _name; } private String _name; } |
|
From: Julius H. <hr...@us...> - 2008-04-25 13:30:49
|
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9729/net/hep/atlas/graphics/JiveGeometry/Test/data Modified Files: AGeometry.xml Log Message: box and trd prototype added Index: AGeometry.xml =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/Test/data/AGeometry.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AGeometry.xml 24 Jan 2007 17:00:43 -0000 1.4 --- AGeometry.xml 25 Apr 2008 13:30:50 -0000 1.5 *************** *** 1,36 **** <?xml version="1.0"?> <AGeometry> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="0.306424" tilt="-19.9962" nz="13" nphi="22" r0="5.10491" phi0="7.78997" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="0.307646" tilt="-19.9962" nz="13" nphi="38" r0="8.88103" phi0="4.60732" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="0.30793" tilt="-19.9962" nz="13" nphi="52" r0="12.2722" phi0="3.3937" zMin="-40.5702" zMax="40.5702" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="48.7" zMax="49.7" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="57.2" zMax="58.2" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="64.2" zMax="65.2" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="0" length="12.609" width="6.144" thickness="0.844888" tilt="11.0351" nz="6" nphi="32" r0="30.134" phi0="3.2" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="1" length="12.609" width="6.144" thickness="0.760799" tilt="11.0283" nz="6" nphi="40" r0="37.2063" phi0="2.6" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="2" length="12.609" width="6.144" thickness="0.841372" tilt="11.2742" nz="6" nphi="48" r0="44.4326" phi0="2.1" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="3" length="12.609" width="6.144" thickness="0.780462" tilt="11.2709" nz="6" nphi="56" r0="51.4694" phi0="1.799" zMin="-74.8272" zMax="74.8272" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="83.0567" zMax="84.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="0" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="86.0567" zMax="87.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="91.0768" zMax="92.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="1" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="91.6268" zMax="95.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="106.827" zMax="107.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="2" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="107.377" zMax="110.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="127.667" zMax="128.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="3" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="128.217" zMax="131.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="137.647" zMax="138.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="4" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="138.197" zMax="141.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="174.817" zMax="175.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="5" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="175.367" zMax="178.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="209.197" zMax="210.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="6" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="212.197" zMax="213.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="248.177" zMax="249.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="7" length="5.2475" width="6.83547" thickness="11.0247" nz="1" nphi="40" rMin="40.2836" rMax="45.7959" phi0="4.31982" zMin="251.177" zMax="252.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="8" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="1.03842" zMin="273.247" zMax="274.343" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="56.7302" rMax="69.8248" phiIn="-6.17382" phiOut="-10.7369" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="70.1346" rMax="86.6458" phiIn="-10.7202" phiOut="-5.99874" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> ! <AEndcapTRTDetector c="TRTElement" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="113.525" zMax="126.225" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="3" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="128.075" zMax="140.775" /> --- 1,42 ---- <?xml version="1.0"?> <AGeometry> + <!-- <ABarrelSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="0.306424" tilt="-19.9962" nz="13" nphi="22" r0="5.10491" phi0="7.78997" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="0.307646" tilt="-19.9962" nz="13" nphi="38" r0="8.88103" phi0="4.60732" zMin="-40.5702" zMax="40.5702" /> <ABarrelSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="0.30793" tilt="-19.9962" nz="13" nphi="52" r0="12.2722" phi0="3.3937" zMin="-40.5702" zMax="40.5702" /> + <AEndcapSiliconDetector c="PIX" n="Pixel" layer="0" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="48.7" zMax="49.7" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="1" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="57.2" zMax="58.2" /> <AEndcapSiliconDetector c="PIX" n="Pixel" layer="2" length="6.08" width="1.64" thickness="1.51617" nz="1" nphi="48" rMin="8.91479" rMax="14.9795" phi0="7.5" zMin="64.2" zMax="65.2" /> + <ABarrelSiliconDetector c="SIL" n="Silicon" layer="0" length="12.609" width="6.144" thickness="0.844888" tilt="11.0351" nz="6" nphi="32" r0="30.134" phi0="3.2" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="1" length="12.609" width="6.144" thickness="0.760799" tilt="11.0283" nz="6" nphi="40" r0="37.2063" phi0="2.6" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="2" length="12.609" width="6.144" thickness="0.841372" tilt="11.2742" nz="6" nphi="48" r0="44.4326" phi0="2.1" zMin="-74.8272" zMax="74.8272" /> <ABarrelSiliconDetector c="SIL" n="Silicon" layer="3" length="12.609" width="6.144" thickness="0.780462" tilt="11.2709" nz="6" nphi="56" r0="51.4694" phi0="1.799" zMin="-74.8272" zMax="74.8272" /> ! ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="01" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="83.0567" zMax="84.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="02" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="86.0567" zMax="87.1532" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="11" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="91.0768" zMax="92.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="12" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="91.6268" zMax="95.1732" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="20" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="106.827" zMax="107.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="21" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="107.377" zMax="110.923" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="30" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="127.667" zMax="128.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="31" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="128.217" zMax="131.763" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="40" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="137.647" zMax="138.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="41" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.5" zMin="138.197" zMax="141.743" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="50" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="174.817" zMax="175.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="51" length="11.77" width="6.31592" thickness="36.6061" nz="2" nphi="40" rMin="27.4928" rMax="45.7959" phi0="4.53514" zMin="175.367" zMax="178.913" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="60" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.06267" zMin="209.197" zMax="210.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="61" length="11.77" width="6.31592" thickness="24.0991" nz="1" nphi="40" rMin="33.7464" rMax="45.7959" phi0="4.5" zMin="212.197" zMax="213.293" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="70" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="-1.03842" zMin="248.177" zMax="249.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="71" length="5.2475" width="6.83547" thickness="11.0247" nz="1" nphi="40" rMin="40.2836" rMax="45.7959" phi0="4.31982" zMin="251.177" zMax="252.273" /> ! <AEndcapSiliconDetector c="SIL" n="Silicon" layer="80" length="12.1235" width="6.2019" thickness="24.7693" nz="1" nphi="52" rMin="43.8426" rMax="56.2272" phi0="1.03842" zMin="273.247" zMax="274.343" /> ! <ABarrelTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="56.7302" rMax="69.8248" phiIn="-6.17382" phiOut="-10.7369" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="70.1346" rMax="86.6458" phiIn="-10.7202" phiOut="-5.99874" zMin="-70.975" zMax="70.975" /> <ABarrelTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="86.9559" rMax="107.232" phiIn="-6.00171" phiOut="-10.9221" zMin="-70.975" zMax="70.975" /> + <AEndcapTRTDetector c="TRT" n="TRT" layer="0" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="84.425" zMax="97.125" /> ! <AEndcapTRTDetector c="TRT" n="TRT" layer="1" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="98.975" zMax="111.675" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="2" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="113.525" zMax="126.225" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="3" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="128.075" zMax="140.775" /> *************** *** 45,50 **** --- 51,58 ---- <AEndcapTRTDetector c="TRT" n="TRT" layer="12" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="247.975" zMax="258.375" /> <AEndcapTRTDetector c="TRT" n="TRT" layer="13" nphi="32" rMin="64.67" rMax="100.1" phi0="0" zMin="260.325" zMax="270.725" /> + <ADisc p="YX" c="Sol" n="Solenoid" rIn="122.9" rOut="127.4" /> <ARectangle p="RZ" c="Sol" n="Solenoid" xMin="-265" xMax="265" yMin="122.9" yMax="127.4" xR="NO" /> + <ABarrelCalorimeter c="ECAL" n="LAr Presampler" sampling="0" region="0" rMin="142.173" rMax="143.858" zMin="0" zMax="325.0" eta0="3.1225e-17" deta="0.025" neta="61" meta="0" phi0="-0.175783" nphi="64" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="1" region="0" rMin="148.175" rMax="158" zMin="0" zMax="325.0" eta0="0.003125" deta="0.003125" neta="447" meta="1" phi0="-0.175783" nphi="64" /> *************** *** 53,56 **** --- 61,65 ---- <ABarrelCalorimeter c="ECAL" n="LAr" sampling="2" region="1" rMin="158" rMax="184" zMin="0" zMax="325.0" eta0="1.4" deta="0.075" neta="1" meta="0" phi0="-0.175783" nphi="256" /> <ABarrelCalorimeter c="ECAL" n="LAr" sampling="3" region="0" rMin="184" rMax="198.47" zMin="0" zMax="325.0" eta0="0.0" deta="0.05" neta="27" meta="0" phi0="-0.175783" nphi="256" /> + <AEndcapCalorimeter c="ECAL" n="LAr Endcap Presampler" sampling="0" region="0" rMin="29.0" rMax="203.4" zMin="368.075" zMax="371.425" eta0="1.50988" deta="0.025" neta="12" meta="0" phi0="-0.234375" nphi="64" /> <AEndcapCalorimeter c="ECAL" n="LAr Outer Endcap" sampling="1" region="0" rMin="29.0" rMax="203.4" zMin="375.424" zMax="380.073" eta0="1.38444" deta="0.05" neta="1" meta="0" phi0="-0.234375" nphi="64" /> *************** *** 73,76 **** --- 82,86 ---- <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="0" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="1.7" deta="0.1" neta="8" meta="2" phi0="-3.97569e-16" nphi="64" /> <AEndcapCalorimeter c="HCAL" n="HEC" sampling="3" region="1" rMin="48.5" rMax="203.4" zMin="559" zMax="605" eta0="2.5" deta="0.2" neta="4" meta="0" phi0="-7.95139e-16" nphi="32" /> + <ADisc p="YX" c="ECAL" n="FCAL EM" rIn="7.84392" rOut="47.5" /> <ARectangle p="RZ" c="ECAL" n="FCAL EM" xMin="466.85" xMax="511.85" yMin="7.84392" yMax="47.5" /> *************** *** 79,82 **** --- 89,93 ---- <ADisc p="YX" c="HCAL" n="FCAL HAD 2" rIn="7.96007" rOut="47.5" /> <ARectangle p="RZ" c="HCAL" n="FCAL HAD 2" xMin="559.75" xMax="604.75" yMin="7.96007" yMax="47.5" /> + <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="0" region="0" rMin="229" rMax="260" zMin="0" zMax="282" eta0="0" deta="0.1" neta="10" meta="0" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="TILE Barrel" sampling="1" region="0" rMin="260" rMax="344" zMin="0" zMax="282" eta0="0" deta="0.1" neta="9" meta="0" phi0="0" nphi="64" /> *************** *** 85,93 **** <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> </AGeometry> --- 96,272 ---- <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="1" region="0" rMin="260" rMax="314" zMin="355.95" zMax="615" eta0="1" deta="0.1" neta="5" meta="10" phi0="0" nphi="64" /> <ABarrelCalorimeter c="HCAL" n="Extended TILE" sampling="2" region="0" rMin="314" rMax="386" zMin="355.95" zMax="615" eta0="0.9" deta="0.2" neta="2" meta="10" phi0="0" nphi="64" /> + <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="1" region="0" rMin="299" rMax="344" zMin="346.435" zMax="355.92" eta="9" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="2" region="0" rMin="344" rMax="386" zMin="325.05" zMax="355.95" eta="8" phi0="0" nphi="64" /> <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="0" rMin="264.6" rMax="295.9" zMin="354.45" zMax="355.95" eta="10" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="1" rMin="230.5" rMax="264.6" zMin="354.45" zMax="355.95" eta="11" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="2" rMin="182.7" rMax="230.5" zMin="353.2" zMax="354" eta="13" phi0="0" nphi="64" /> ! <AGapCalorimeter c="HCAL" n="ITC Gap" sampling="3" region="3" rMin="146.5" rMax="182.7" zMin="353.2" zMax="354" eta="15" phi0="0" nphi="64" /> ! --> ! <ABox n="MDT_BIL" zi="33" zo="124.607" ri="474.091" ro="515.705" w="267.15" eta="1" phi="1 2 3 7" /> ! <ABox n="MDT_BIL" zi="51" zo="124.586" ri="474.091" ro="515.705" w="267.15" eta="1" phi="4" /> ! <ABox n="MDT_BIL" zi="56" zo="147.607" ri="525.691" ro="567.305" w="267.15" eta="1" phi="5" /> ! <ABox n="MDT_BIL" zi="125" zo="234.628" ri="474.091" ro="515.705" w="267.15" eta="2" phi="1 2 3 4 5 7" /> ! <ABox n="MDT_BIL" zi="235" zo="326.607" ri="474.091" ro="515.705" w="267.15" eta="3" phi="1 2 4 5 7" /> ! <ABox n="MDT_BIL" zi="235" zo="344.628" ri="474.091" ro="515.705" w="267.15" eta="3" phi="3" /> ! <ABox n="MDT_BIL" zi="345" zo="454.628" ri="474.091" ro="515.705" w="267.15" eta="4" phi="1 2 3 4 5" /> ! <ABox n="MDT_BIL" zi="345" zo="436.607" ri="474.091" ro="515.705" w="267.15" eta="4" phi="7" /> ! <ABox n="MDT_BIL" zi="455" zo="546.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="1 2 3 4 5" /> ! <ABox n="MDT_BIL" zi="437" zo="528.607" ri="474.091" ro="515.705" w="267.15" eta="5" phi="7" /> ! <ABox n="MDT_BIL" zi="547" zo="656.628" ri="474.091" ro="515.705" w="267.15" eta="6" phi="1 2 3 5" /> ! <ABox n="MDT_BIL" zi="547" zo="638.607" ri="474.091" ro="515.705" w="267.15" eta="6" phi="4 7" /> ! <ABox n="MDT_BIS" zi="1" zo="110.628" ri="440.793" ro="474.707" w="167.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="111" zo="202.607" ri="440.793" ro="474.707" w="167.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="203" zo="294.607" ri="440.793" ro="474.707" w="167.15" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="295" zo="386.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="313" zo="404.607" ri="440.793" ro="474.707" w="167.15" eta="4" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="387" zo="478.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="405" zo="496.607" ri="440.793" ro="474.707" w="167.15" eta="5" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="479" zo="570.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="497" zo="588.607" ri="440.793" ro="474.707" w="167.15" eta="6" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="571" zo="680.628" ri="440.793" ro="474.707" w="167.15" eta="7" phi="1 2 3" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="589" zo="680.607" ri="440.793" ro="474.707" w="167.15" eta="7" phi="4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIS" zi="681" zo="730.558" ri="454.864" ro="471.645" w="85.15" eta="8" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BML" zi="15" zo="184.698" ri="675.194" ro="754.205" w="357.6" eta="1" phi="1 2" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="39" zo="184.67" ri="675.194" ro="754.205" w="357.6" eta="1" phi="3 7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="87" zo="184.614" ri="675.194" ro="753.005" w="357.6" eta="1" phi="4 5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="63" zo="184.642" ri="675.194" ro="753.005" w="357.6" eta="1" phi="6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="185" zo="354.698" ri="675.194" ro="754.205" w="357.6" eta="2" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="355" zo="524.698" ri="675.194" ro="754.205" w="357.6" eta="3" phi="1 2 3 4 5 6 7 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="525" zo="646.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="4" phi="7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="647" zo="768.642" ri="675.194" ro="753.005" w="357.6" eta="5" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="5" phi="7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="769" zo="914.67" ri="675.194" ro="754.205" w="357.6" eta="6" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="6" phi="7" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BML" zi="918" zo="966" ri="755.75" ro="765.75" w="304" eta="7" phi="1 2 3 4 5 6 8" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="15" zo="184.698" ri="777.694" ro="842.905" w="309.6" eta="1" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="185" zo="364.5" ri="777.694" ro="842.905" w="309.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="368" zo="513.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="514" zo="691.35" ri="777.694" ro="842.905" w="309.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="692.5" zo="790.114" ri="777.694" ro="841.705" w="309.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMS" zi="790.5" zo="936.17" ri="777.694" ro="842.905" w="309.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BOL" zi="15" zo="232.754" ri="924.444" ro="989.055" w="498.6" eta="1" phi="1 2" RPCo="15" /> ! <ABox n="MDT_BOL" zi="39" zo="232.726" ri="924.444" ro="989.055" w="498.6" eta="1" phi="3" RPCo="15" /> ! <ABox n="MDT_BOL" zi="87" zo="232.67" ri="924.444" ro="989.055" w="498.6" eta="1" phi="4 5" RPCo="15" /> ! <ABox n="MDT_BOL" zi="63" zo="232.698" ri="924.444" ro="989.055" w="498.6" eta="1" phi="6 7 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="233" zo="450.754" ri="924.444" ro="989.055" w="498.6" eta="2" phi="1 2 3 4 5 6 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="233" zo="378.67" ri="924.444" ro="989.055" w="498.6" eta="2" phi="7" RPCo="15" /> ! <ABox n="MDT_BOL" zi="451" zo="620.698" ri="924.444" ro="989.055" w="498.6" eta="3" phi="1 2 3 4 5 6 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="379" zo="524.67" ri="924.444" ro="989.055" w="498.6" eta="3" phi="7" RPCo="15" /> ! <ABox n="MDT_BOL" zi="621" zo="838.754" ri="924.444" ro="989.055" w="498.6" eta="4" phi="1 2 3 4 5 6 7 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="839" zo="1056.75" ri="924.444" ro="989.055" w="498.6" eta="5" phi="1 2 3 4 5 6 7 8" RPCo="15" /> ! <ABox n="MDT_BOL" zi="1057" zo="1226.7" ri="924.444" ro="989.055" w="498.6" eta="6" phi="1 2 3 4 5 6 7 8" RPCo="15" /> ! <ABox n="MDT_BOS" zi="1" zo="218.754" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="1 2 3 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="73" zo="218.67" ri="1019.19" ro="1082.46" w="379.6" eta="1" phi="4" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="219" zo="436.754" ri="1019.19" ro="1082.46" w="379.6" eta="2" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="437" zo="654.754" ri="1019.19" ro="1082.46" w="379.6" eta="3" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="655" zo="872.754" ri="1019.19" ro="1082.46" w="379.6" eta="4" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="873" zo="1090.75" ri="1019.19" ro="1082.46" w="379.6" eta="5" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BOS" zi="1091" zo="1284.73" ri="1019.19" ro="1082.46" w="379.6" eta="6" phi="1 2 3 4 5 8" dphi="22.5" RPCi="15" /> ! <ABox n="MDT_BEE" zi="889" zo="1034.67" ri="433.023" ro="452.33" w="91.15" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BEE" zi="1035" zo="1180.67" ri="433.023" ro="452.33" w="91.15" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="6" sh="11.65" /> ! <ABox n="MDT_BIR" zi="52" zo="143.607" ri="584.903" ro="626.517" w="267.15" eta="1" phi="8" sh="-11.65" /> ! <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="6" sh="68.4" /> ! <ABox n="MDT_BIR" zi="200" zo="291.607" ri="588.642" ro="630.255" w="153.65" eta="2" phi="8" sh="-68.4" /> ! <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="6" sh="46.85" /> ! <ABox n="MDT_BIR" zi="292" zo="392.617" ri="586.601" ro="628.214" w="110.55" eta="3" phi="8" sh="-46.85" /> ! <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="6" sh="68.4" /> ! <ABox n="MDT_BIR" zi="394" zo="485.607" ri="588.642" ro="630.255" w="153.65" eta="4" phi="8" sh="-68.4" /> ! <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="6" sh="68.4" /> ! <ABox n="MDT_BIR" zi="541" zo="614.586" ri="588.642" ro="630.255" w="153.65" eta="5" phi="8" sh="-68.4" /> ! <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="6" sh="46.85" /> ! <ABox n="MDT_BIR" zi="616" zo="725.628" ri="586.601" ro="628.214" w="110.55" eta="6" phi="8" sh="-46.85" /> ! <ABox n="MDT_BMF" zi="62.5" zo="280.254" ri="777.694" ro="842.905" w="309.6" eta="1" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMF" zi="406" zo="599.726" ri="777.694" ro="842.905" w="309.6" eta="2" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BMF" zi="728" zo="873.67" ri="777.694" ro="842.905" w="309.6" eta="3" phi="6 7" dphi="22.5" RPCi="15" RPCo="15" /> ! <ABox n="MDT_BOF" zi="62.57" zo="280.324" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOF" zi="405.46" zo="599.186" ri="1028.19" ro="1107.41" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOF" zi="727.92" zo="873.59" ri="1028.19" ro="1107.41" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOF" zi="1002.6" zo="1124.24" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="-60" zo="61.6418" ri="1028.19" ro="1093.06" w="379.6" eta="0" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="282.07" zo="403.712" ri="1028.19" ro="1093.06" w="379.6" eta="1" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="602.73" zo="724.372" ri="1028.19" ro="1093.06" w="379.6" eta="2" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="877.14" zo="998.782" ri="1028.19" ro="1106.21" w="379.6" eta="3" phi="6 7" dphi="22.5" RPCo="15" /> ! <ABox n="MDT_BOG" zi="1147.2" zo="1268.84" ri="1028.19" ro="1106.21" w="379.6" eta="4" phi="6 7" dphi="22.5" RPCo="15" /> ! ! <ATrd n="MDT_EIL1" zi="749.146" zo="785.86" ri="207.6" ro="317.228" wi="132.15" wo="186.9" eta="1" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EIL2" zi="749.146" zo="785.86" ri="319.1" ro="428.728" wi="186.15" wo="240.9" eta="2" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.23" ro="464.774" wi="207.15" wo="207.15" eta="3" phi="1 2 3 4 5 7" /> ! <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="6" sh="-16.5" /> ! <ATrd n="MDT_EIL3" zi="749.146" zo="785.86" ri="427.535" ro="465.079" wi="174.15" wo="174.15" eta="3" phi="8" sh="16.5" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="509.544" wi="153.65" wo="153.65" eta="4" phi="1 5" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="472" ro="635.691" wi="235.15" wo="316.9" eta="4" phi="2 3 7" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="473.105" ro="636.796" wi="165.15" wo="246.9" eta="4" phi="4" sh="35" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="6" sh="-62.5" /> ! <ATrd n="MDT_EIL4" zi="745.796" zo="782.51" ri="511.445" ro="639.094" wi="128.15" wo="191.9" eta="4" phi="8" sh="62.5" /> ! <ATrd n="MDT_EIL5" zi="745.796" zo="782.51" ri="508.04" ro="635.689" wi="253.15" wo="316.9" eta="5" phi="1 5" /> ! <ATrd n="MDT_EML1" zi="1411.25" zo="1447.66" ri="177" ro="346.698" wi="118.65" wo="203.4" eta="1" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML2" zi="1411.25" zo="1447.66" ri="348.5" ro="542.226" wi="202.65" wo="299.4" eta="2" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML3" zi="1411.25" zo="1447.66" ri="544" ro="737.726" wi="298.65" wo="395.4" eta="3" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML4" zi="1411.25" zo="1447.66" ri="739.5" ro="933.226" wi="394.65" wo="491.4" eta="4" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EML5" zi="1411.25" zo="1447.66" ri="935" ro="1128.73" wi="490.65" wo="587.4" eta="5" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EMS1" zi="1369.65" zo="1406.06" ri="177" ro="370.726" wi="83.55" wo="141.6" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS2" zi="1369.65" zo="1406.06" ri="372.5" ro="566.226" wi="141.15" wo="199.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS3" zi="1369.65" zo="1406.06" ri="568" ro="761.726" wi="198.75" wo="256.8" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS4" zi="1369.65" zo="1406.06" ri="763.5" ro="957.226" wi="256.35" wo="314.4" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EMS5" zi="1369.65" zo="1406.06" ri="959" ro="1152.73" wi="313.95" wo="372" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOL1" zi="2117.5" zo="2153.91" ri="277" ro="446.698" wi="168.15" wo="252.9" eta="1" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL2" zi="2117.5" zo="2153.91" ri="448.5" ro="618.198" wi="264.15" wo="348.9" eta="2" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL3" zi="2117.5" zo="2153.91" ri="620" ro="765.67" wi="348.15" wo="420.9" eta="3" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL4" zi="2117.5" zo="2153.91" ri="767.5" ro="913.17" wi="420.15" wo="492.9" eta="4" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL5" zi="2117.5" zo="2153.91" ri="915" ro="1060.67" wi="492.15" wo="564.9" eta="5" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOL6" zi="2117.5" zo="2153.91" ri="1062.5" ro="1208.17" wi="564.15" wo="636.9" eta="6" phi="1 2 3 4 5 6 7 8" /> ! <ATrd n="MDT_EOS1" zi="2158.4" zo="2194.81" ri="277" ro="446.698" wi="124.95" wo="175.8" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS2" zi="2158.4" zo="2194.81" ri="448.5" ro="618.198" wi="175.35" wo="226.2" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS3" zi="2158.4" zo="2194.81" ri="620" ro="789.698" wi="225.75" wo="276.6" eta="3" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS4" zi="2158.4" zo="2194.81" ri="791.5" ro="937.17" wi="276.15" wo="319.8" eta="4" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS5" zi="2158.4" zo="2194.81" ri="939" ro="1084.67" wi="319.35" wo="363" eta="5" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EOS6" zi="2158.4" zo="2194.81" ri="1086.5" ro="1232.17" wi="362.55" wo="406.2" eta="6" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="TGC_T1F1" zi="1327.15" zo="1334.15" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> ! <ATrd n="TGC_T1F1" zi="1345.05" zo="1352.05" ri="190" ro="397.54" wi="57.69" wo="112.34" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> ! <ATrd n="TGC_T1E1" zi="1345.05" zo="1359.95" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> ! <ATrd n="TGC_T1E1" zi="1327.15" zo="1342.05" ri="388" ro="1068.2" wi="64.49" wo="154.85" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> ! <ATrd n="TGC_T2F1" zi="1460.05" zo="1464.42" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> ! <ATrd n="TGC_T2F1" zi="1475.55" zo="1479.92" ri="252.59" ro="432.15" wi="75.51" wo="122.78" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> ! <ATrd n="TGC_T2E1" zi="1475.55" zo="1485.42" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> ! <ATrd n="TGC_T2E1" zi="1460.05" zo="1469.92" ri="418.4" ro="1191.7" wi="68.47" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> ! <ATrd n="TGC_T3F1" zi="1502.05" zo="1506.42" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23" dphi="7.5" /> ! <ATrd n="TGC_T3F1" zi="1517.55" zo="1521.92" ri="261" ro="440.56" wi="75.51" wo="122.79" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24" dphi="7.5" /> ! <ATrd n="TGC_T3E1" zi="1517.55" zo="1527.42" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="1 3 5 7 9 11 13 15 17 19 21 23 25 27 29 31 33 35 37 39 41 43 45 47" dphi="3.75" /> ! <ATrd n="TGC_T3E1" zi="1502.05" zo="1511.92" ri="436.56" ro="1191.7" wi="70.84" wo="170.84" eta="1" phi="2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48" dphi="3.75" /> ! <ATrd n="TGC_T4F1" zi="698.06" zo="702.43" ri="217" ro="443.4" wi="62.38" wo="121.99" eta="1" phi="1 3 4 6 7 9 10 12 13 15 16 18 19 21 22 24" dphi="7.5" /> ! <ATrd n="TGC_T4F1" zi="693.04" zo="697.41" ri="217" ro="433.4" wi="62.38" wo="119.36" eta="1" phi="2 5 8 11 14 17 20 23" dphi="7.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="1 4 7" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="2" dphi="-5.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="3 6" dphi="5.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="5 8" dphi="-5.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="9 12" dphi="15" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="10" dphi="9.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="11 14" dphi="20.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="13" dphi="9.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="15" dphi="15" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="16" dphi="35.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="17" dphi="30" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="470" ro="619" wi="83.33" wo="108.09" eta="1" phi="18" dphi="24.5" /> ! <ATrd n="TGC_T4E1" zi="730.87" zo="735.24" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="19" dphi="45" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="20" dphi="39.5" /> ! <ATrd n="TGC_T4E1" zi="737.53" zo="741.9" ri="520" ro="619" wi="91.64" wo="108.09" eta="1" phi="21" dphi="50.5" /> ! <ATrd n="MDT_EIS1" zi="707.746" zo="744.46" ri="207.6" ro="335.249" wi="89.85" wo="128.1" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="MDT_EIS2" zi="707.746" zo="744.46" ri="337.1" ro="446.728" wi="127.65" wo="160.5" eta="2" phi="1 2 3 4 5 6 7 8" dphi="22.5" /> ! <ATrd n="CSC_CSS1" zi="708.06" zo="724.63" ri="87.0128" ro="206.473" wi="40.29" wo="74.75" eta="1" phi="1 2 3 4 5 6 7 8" dphi="22.5" a="-11.587" /> ! <ATrd n="CSC_CSL1" zi="744.319" zo="760.889" ri="92.4354" ro="207.125" wi="61.01" wo="112.87" eta="1" phi="1 2 3 4 5 6 7 8" a="-11.587" /> ! ! <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="107" zo="216.628" ri="519.465" ro="561.079" w="153.65" eta="1" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="217" zo="326.628" ri="519.465" ro="561.079" w="153.65" eta="2" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="327" zo="436.628" ri="519.465" ro="561.079" w="153.65" eta="3" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="437" zo="546.628" ri="519.465" ro="561.079" w="153.65" eta="4" phi="8" sh="56.6" /> ! <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="6" sh="-56.6" /> ! <ABox n="MDT_BIM" zi="547" zo="656.628" ri="519.465" ro="561.079" w="153.65" eta="5" phi="8" sh="56.6" /> ! </AGeometry> |
|
From: Julius H. <hr...@us...> - 2008-04-25 13:23:12
|
Update of /cvsroot/graxml/Graphics/HEP3D/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6624 Modified Files: index.html Log Message: Cuboid added, Extrusion improved Index: index.html =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/index.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index.html 17 Apr 2008 10:20:24 -0000 1.12 --- index.html 25 Apr 2008 13:23:09 -0000 1.13 *************** *** 26,29 **** --- 26,30 ---- TorusSgment, Extrusion, + Cuboid, Ring, PointSet, *************** *** 156,159 **** --- 157,161 ---- <li>PointSet added.</li> <li>Ring added.</li> + <li>Cuboid added.</li> </ul> </li> |
|
From: Julius H. <hr...@us...> - 2008-04-25 13:22:49
|
Update of /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6358 Modified Files: Extrusion.java Test.java Added Files: Cuboid.java Log Message: Cuboid added, Extrusion improved Index: Test.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Test.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Test.java 17 Apr 2008 22:54:49 -0000 1.7 --- Test.java 25 Apr 2008 13:22:46 -0000 1.8 *************** *** 35,38 **** --- 35,41 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/25 13:22:46 hrivnac + * Cuboid added, Extrusion improved + * * Revision 1.7 2008/04/17 22:54:49 hrivnac * Ring changed *************** *** 305,308 **** --- 308,323 ---- transparentAppearance())); } + else if (name.equals("Cuboid")) { + Point3d[] points = {new Point3d(0.0, 0.1, 0.0), + new Point3d(0.4, 0.0, 0.2), + new Point3d(0.5, 0.4, 0.1), + new Point3d(0.0, 0.5, 0.0), + new Point3d(0.1, 0.1, 0.3), + new Point3d(0.5, 0.1, 0.5), + new Point3d(0.4, 0.3, 0.5), + new Point3d(0.1, 0.4, 0.5)}; + return(new Cuboid(points, // points + transparentAppearance())); + } else if (name.equals("BooleanTrapezoid")) { Trapezoid s1 = new Trapezoid(0.2, // xmu *************** *** 514,517 **** --- 529,533 ---- " PolyGone |\n" + " Extrusion |\n" + + " Cuboid |\n" + " BooleanTrapezoid |\n" + " BooleanConeSegment |\n" + --- NEW FILE: Cuboid.java --- package org.freehep.j3d; // Java3D import javax.media.j3d.Appearance; import javax.media.j3d.Shape3D; import javax.media.j3d.LineStripArray; import javax.media.j3d.GeometryArray; import javax.vecmath.Point2d; import javax.vecmath.Point3d; import javax.vecmath.Vector3d; // Java import java.lang.IllegalArgumentException; /** <code>Cuboid</code> defined from points. * <img src="doc-files/Cuboid.gif"> * <p><font color="#880088"> * <pre> * $Log: Cuboid.java,v $ * Revision 1.1 2008/04/25 13:22:45 hrivnac * Cuboid added, Extrusion improved * * </pre> * </font></p> * @opt attributes * @opt operations * @opt types * @opt visibility * @version $Id: Cuboid.java,v 1.1 2008/04/25 13:22:45 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ // TBD: documentation picture public class Cuboid extends Solid { // Constructors -------------------------------------------------------------- /** Initialise cuboid to be constructed later. */ protected Cuboid() {} /** Create cuboid. * @param points The array of {@link Point3d}s, points.length == 8. * It can be null. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ public Cuboid(Point3d[] points, Appearance appearance) throws IllegalArgumentException { construct(points, appearance); } // --------------------------------------------------------------------------- /** Perform the construction. // TBD: check for consistency * @param points The array of {@link Point3d}s, points.length == 8. * It can be null. * @param appearance The object' Appearance * @throws IllegalArgumentException if the parameters are invalid. */ protected void construct(Point3d[] points, Appearance appearance) throws IllegalArgumentException { // Check preconditins if (points != null && ! (points.length == 8)) { throw new IllegalArgumentException("There are not enough points (" + points.length + ")," + " it should be == 8."); } Point3d[][] sides = {{points[3], points[2], points[1], points[0]}, {points[1], points[5], points[4], points[0]}, {points[2], points[6], points[5], points[1]}, {points[3], points[7], points[6], points[2]}, {points[4], points[7], points[3], points[0]}, {points[5], points[6], points[7], points[4]}}; // Add Geometry for (int i = 0; i < 6; i++) { addCoordinates(sides[i]); } // Add Appearance setAppearance(appearance); } } Index: Extrusion.java =================================================================== RCS file: /cvsroot/graxml/Graphics/HEP3D/src/org/freehep/j3d/Extrusion.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Extrusion.java 14 Feb 2007 21:33:27 -0000 1.1 --- Extrusion.java 25 Apr 2008 13:22:45 -0000 1.2 *************** *** 18,21 **** --- 18,24 ---- * <pre> * $Log$ + * Revision 1.2 2008/04/25 13:22:45 hrivnac + * Cuboid added, Extrusion improved + * * Revision 1.1 2007/02/14 21:33:27 hrivnac * Extrussion added *************** *** 49,52 **** --- 52,71 ---- } + /** Create extrusion. + * @param points The array of {@link Point2d}s, points.length > 2. + * It can be null. + * @param z The z-dimension. + * @param direction The axis of extrusion ("z-axis"), + * <code>X</code>, <code>Y</code> or <code>Z</code>. + * @param appearance The object' Appearance + * @throws IllegalArgumentException if the parameters are invalid. */ + public Extrusion(Point2d[] points, + double z, + short direction, + Appearance appearance) throws IllegalArgumentException { + _direction = direction; + construct(points, z, appearance); + } + // --------------------------------------------------------------------------- *************** *** 73,77 **** for (int i = 0; i < points.length; i++) { bottom[points.length - 1 - i] = new Point3d(points[i].x, points[i].y, 0.0); ! top[ i] = new Point3d(points[i].x, points[i].y, z ); } int j = 0; --- 92,96 ---- for (int i = 0; i < points.length; i++) { bottom[points.length - 1 - i] = new Point3d(points[i].x, points[i].y, 0.0); ! top[ i] = new Point3d(points[i].x, points[i].y, z ); } int j = 0; *************** *** 85,88 **** --- 104,126 ---- } int[] strips = new int[]{points.length}; + + if (_direction == X) { + for (int i = 0; i < points.length; i++) { + bottom[i] = new Point3d(bottom[i].z, bottom[i].x, bottom[i].y); + top[ i] = new Point3d(top[ i].z, top[ i].x, top[ i].y); + } + for (int i = 0; i < 4 * points.length; i++) { + side[ i] = new Point3d(side[ i].z, side[ i].x, side[ i].y); + } + } + else if (_direction == Y) { + for (int i = 0; i < points.length; i++) { + bottom[i] = new Point3d(bottom[i].y, bottom[i].z, bottom[i].x); + top[ i] = new Point3d(top[ i].y, top[ i].z, top[ i].x); + } + for (int i = 0; i < 4 * points.length; i++) { + side[ i] = new Point3d(side[ i].y, side[ i].z, side[ i].x); + } + } // Add Geometry *************** *** 96,99 **** --- 134,145 ---- } + private short _direction = Z; + + public static short X = 0; + + public static short Y = 1; + + public static short Z = 2; + } |
|
From: Julius H. <hr...@us...> - 2008-04-17 23:03:39
|
Update of /cvsroot/graxml/Graphics/GraXML/ant In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11215 Modified Files: build.xml Log Message: using Atlantis to get geometry Index: build.xml =================================================================== RCS file: /cvsroot/graxml/Graphics/GraXML/ant/build.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** build.xml 17 Mar 2008 14:48:12 -0000 1.21 --- build.xml 17 Apr 2008 23:03:02 -0000 1.22 *************** *** 27,30 **** --- 27,32 ---- <pathelement path="${Java3D.vecmath}"/> <pathelement path="${Java3D.bool}"/> + <pathelement path="${Atlantis.core}"/> + <pathelement path="${Atlantis.commons}"/> <pathelement path="${AGDD.core}"/> <pathelement path="${GDML.core}"/> *************** *** 82,85 **** --- 84,89 ---- <fileset file="${Java3D.vecmath}"/> <fileset file="${Java3D.bool}"/> + <fileset file="${Atlantis.core}"/> + <fileset file="${Atlantis.commons}"/> <fileset file="${AGDD.core}"/> <fileset file="${GDML.core}"/> |
Update of /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10081/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps Modified Files: ABarrelCalorimeter.java ABarrelSiliconDetector.java ABarrelTRTDetector.java AEndcapCalorimeter.java AEndcapSiliconDetector.java AEndcapTRTDetector.java AGapCalorimeter.java Added Files: ABarrelCalorimeterDetectorProxy.java ABarrelSiliconDetectorProxy.java ABarrelTRTDetectorProxy.java AEndcapCalorimeterDetectorProxy.java AEndcapSiliconDetectorProxy.java AEndcapTRTDetectorProxy.java AGapCalorimeterDetectorProxy.java Log Message: using Atlantis to get geometry Index: ABarrelTRTDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelTRTDetector.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ABarrelTRTDetector.java 17 Oct 2007 13:22:47 -0000 1.3 --- ABarrelTRTDetector.java 17 Apr 2008 22:58:26 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/17 22:58:26 hrivnac + * using Atlantis to get geometry + * * Revision 1.3 2007/10/17 13:22:47 hrivnac * subdetectors grouped *************** *** 80,92 **** double dPhi = 2.0 * PI / nPhi; // Find dimensions ! name += "[" + layer + "]"; // Construct Atlantis representation ! double[] z = new double[] {zMax, zMin, zMin, zMax}; ! double[] r = new double[] {rMax, rMax, rMin, rMin}; ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, false, nPhi, color, name); } --- 84,97 ---- double dPhi = 2.0 * PI / nPhi; + // Get 2d reprtesentation from Atlantis + ABarrelTRTDetectorProxy detector = new ABarrelTRTDetectorProxy(name, color, layer, + nPhi, + rMin, rMax, phiIn, phiOut, zMin, zMax); + // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, false, 0, nPhi, color, name + "[" + layer + "]"); } Index: ABarrelSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelSiliconDetector.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ABarrelSiliconDetector.java 17 Oct 2007 13:22:47 -0000 1.3 --- ABarrelSiliconDetector.java 17 Apr 2008 22:58:11 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 36,39 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/17 22:58:11 hrivnac + * using Atlantis to get geometry + * * Revision 1.3 2007/10/17 13:22:47 hrivnac * subdetectors grouped *************** *** 87,101 **** double dPhi = 2.0 * PI / nPhi; // Find dimensions ! double rMin = r0 - abs(thickness * cos(tilt)) - abs(width * sin(tilt)); ! double rMax = r0 + abs(thickness * cos(tilt)) + abs(width * sin(tilt)); ! name += "[" + layer + "]"; // Construct Atlantis representation ! double[] z = new double[] {zMax, zMin, zMin, zMax}; ! double[] r = new double[] {rMax, rMax, rMin, rMin}; ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, false, nPhi, color, name); } --- 91,105 ---- double dPhi = 2.0 * PI / nPhi; + // Get 2d reprtesentation from Atlantis + ABarrelSiliconDetectorProxy detector = new ABarrelSiliconDetectorProxy(name, color, layer, + length, width, thickness, + nZ, nPhi, + tilt, r0, phi0, zMin, zMax); + // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, false, phi0, nPhi, color, name + "[" + layer + "]"); } --- NEW FILE: ABarrelSiliconDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.ABarrelSiliconDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link ABarrelSiliconDetector}. * <p><font color="#880088"> * <pre> * $Log: ABarrelSiliconDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:58:18 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: ABarrelSiliconDetectorProxy.java,v 1.1 2008/04/17 22:58:18 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class ABarrelSiliconDetectorProxy extends ABarrelSiliconDetector { /** Constructs a new barrel silicon proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * TBD */ public ABarrelSiliconDetectorProxy(String name, String color, int layer, double length, double width, double thickness, int numZ, int numPhi, double tilt, double r0, double phi0, double zMin, double zMax) { super(name, color, layer, length, width, thickness, numZ, numPhi, tilt, r0, phi0, zMin, zMax); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } Index: AEndcapTRTDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapTRTDetector.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AEndcapTRTDetector.java 17 Oct 2007 13:22:48 -0000 1.3 --- AEndcapTRTDetector.java 17 Apr 2008 22:59:03 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/17 22:59:03 hrivnac + * using Atlantis to get geometry + * * Revision 1.3 2007/10/17 13:22:48 hrivnac * subdetectors grouped *************** *** 79,91 **** double dPhi = 2.0 * PI / nPhi; // Find dimensions ! name += "[" + layer + "]"; // Construct Atlantis representation ! double[] z = new double[] {zMax, zMin, zMin, zMax}; ! double[] r = new double[] {rMax, rMax, rMin, rMin}; ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, true, nPhi, color, name); } --- 83,96 ---- double dPhi = 2.0 * PI / nPhi; + // Get 2d reprtesentation from Atlantis + AEndcapTRTDetectorProxy detector = new AEndcapTRTDetectorProxy(name, color, layer, + nPhi, + rMin, rMax, phi0, zMin, zMax); + // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, true, phi0, nPhi, color, name + "[" + layer + "]"); } --- NEW FILE: AGapCalorimeterDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.AGapCalorimeterDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link AGapCalorimeterDetector}. * <p><font color="#880088"> * <pre> * $Log: AGapCalorimeterDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:59:19 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: AGapCalorimeterDetectorProxy.java,v 1.1 2008/04/17 22:59:19 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class AGapCalorimeterDetectorProxy extends AGapCalorimeterDetector { /** Constructs a new gap calorimeter proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * @param sampling The sampling of this calorimeter part. * @param region The region of this calorimeter part. * @param rMin The inner radius. * @param rMax The outer radius. * @param zMin The inner z. * @param zMax The outer z. * @param eta The eta index of this cell. * @param phi0 The start of the first cell in phi. * @param nphi The number of cells in phi. */ public AGapCalorimeterDetectorProxy(String name, String color, int sampling, int region, double rMin, double rMax, double zMin, double zMax, int eta, double phi0, int nphi) { super(name, color, sampling, region, rMin, rMax, zMin, zMax, eta, phi0, nphi); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } Index: ABarrelCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/ABarrelCalorimeter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ABarrelCalorimeter.java 17 Oct 2007 13:22:47 -0000 1.7 --- ABarrelCalorimeter.java 17 Apr 2008 22:57:55 -0000 1.8 *************** *** 11,15 **** import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; ! import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D --- 11,15 ---- import net.hep.graphics.GraXML.MasterBuilder; import net.hep.graphics.GraXML.Disconnecter.DetachableConnection; ! import net.hep.graphics.GraXML.Disconnecter.ConnectionsDB; // Java3D *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.8 2008/04/17 22:57:55 hrivnac + * using Atlantis to get geometry + * * Revision 1.7 2007/10/17 13:22:47 hrivnac * subdetectors grouped *************** *** 90,96 **** double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); - double dPhi = 2.0 * PI / nPhi; double eta0 = aBarrelCalorimeter.getEta0(); ! double mEta = aBarrelCalorimeter.getMeta(); int nEta = aBarrelCalorimeter.getNeta(); double dEta = aBarrelCalorimeter.getDeta(); --- 94,99 ---- double phi0 = toRadians(aBarrelCalorimeter.getPhi0()); int nPhi = aBarrelCalorimeter.getNphi(); double eta0 = aBarrelCalorimeter.getEta0(); ! int mEta = aBarrelCalorimeter.getMeta(); int nEta = aBarrelCalorimeter.getNeta(); double dEta = aBarrelCalorimeter.getDeta(); *************** *** 99,128 **** builder().register(name + "_" + sampling + "_" + region, rMin, rMax, zMin, zMax); // Find dimensions ! double etaMax = eta0 + nEta * dEta; ! double etaMin; ! if (eta0 <= 0.0) { ! zMin = - zMax; ! etaMin = - etaMax; ! } ! else { ! etaMin = eta0; ! } ! name += "[" + sampling + "/" + region + "]"; // Construct Atlantis representation ! double[] z; ! double[] r; ! if (name.indexOf("TILE") >= 0) { ! z = new double[] {zMax, zMin, zMin, zMax}; ! r = new double[] {rMax, rMax, rMin, rMin}; ! } ! else { ! z = new double[] {rMax * sinh(etaMax), rMax * sinh(etaMin), rMin * sinh(etaMin), rMin * sinh(etaMax)}; ! r = new double[] {rMax, rMax, rMin, rMin }; ! } ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, eta0 > 0.0, nPhi, color, name); } --- 102,116 ---- builder().register(name + "_" + sampling + "_" + region, rMin, rMax, zMin, zMax); + // Get 2d reprtesentation from Atlantis + ABarrelCalorimeterDetectorProxy detector = new ABarrelCalorimeterDetectorProxy(name, color, sampling, region, + rMin, rMax, zMin, zMax, + eta0, dEta, nEta, mEta, + phi0, nPhi); + // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, eta0 > 0.0, phi0, nPhi, color, name + "[" + sampling + "/" + region + "]"); } --- NEW FILE: ABarrelTRTDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.ABarrelTRTDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link ABarrelTRTDetector}. * <p><font color="#880088"> * <pre> * $Log: ABarrelTRTDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:58:35 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: ABarrelTRTDetectorProxy.java,v 1.1 2008/04/17 22:58:35 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class ABarrelTRTDetectorProxy extends ABarrelTRTDetector { /** Constructs a new barrel TRT proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * TBD */ public ABarrelTRTDetectorProxy(String name, String color, int layer, int numPhi, double rMin, double rMax, double phiIn, double phiOut, double zMin, double zMax) { super(name, color, layer, numPhi, rMin, rMax, phiIn, phiOut, zMin, zMax); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } Index: AEndcapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapCalorimeter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AEndcapCalorimeter.java 17 Oct 2007 13:22:47 -0000 1.5 --- AEndcapCalorimeter.java 17 Apr 2008 22:58:39 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.6 2008/04/17 22:58:39 hrivnac + * using Atlantis to get geometry + * * Revision 1.5 2007/10/17 13:22:47 hrivnac * subdetectors grouped *************** *** 84,127 **** double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); - double dPhi = 2.0 * PI / nPhi; double eta0 = aEndcapCalorimeter.getEta0(); ! double mEta = aEndcapCalorimeter.getMeta(); int nEta = aEndcapCalorimeter.getNeta(); double dEta = aEndcapCalorimeter.getDeta(); // Find dimensions ! double etaMax = eta0 + nEta * dEta; ! double etaMin = eta0; ! double r1; ! double r2; ! if (name.equals("HEC")) { ! r1 = rMax; ! r2 = rMin; ! } ! else { ! if (name.indexOf("Inner") >= 0 || name.indexOf("Presampler") >= 0) { ! r1 = zMin / sinh(etaMin); ! } ! else { ! r1 = rMax; ! } ! r2 = zMin / sinh(etaMax); ! } ! name += "[" + sampling + "/" + region + "]"; // Construct Atlantis representation ! double[] z; ! double[] r; ! if (name.indexOf("HEC") >= 0) { ! z = new double[] {zMax, zMin, zMin, zMax}; ! r = new double[] {rMax, rMax, rMin, rMin}; ! } ! else { ! z = new double[] {zMax, zMin, zMin, zMax }; ! r = new double[] {zMax / sinh(etaMin), zMin / sinh(etaMin), zMin / sinh(etaMax), zMax / sinh(etaMax)}; ! } - // Use Atlantis representation - atlantis2GraXML(z, r, eta0 > 0.0, nPhi, color, name); } --- 88,108 ---- double phi0 = toRadians(aEndcapCalorimeter.getPhi0()); int nPhi = aEndcapCalorimeter.getNphi(); double eta0 = aEndcapCalorimeter.getEta0(); ! int mEta = aEndcapCalorimeter.getMeta(); int nEta = aEndcapCalorimeter.getNeta(); double dEta = aEndcapCalorimeter.getDeta(); + // Get 2d reprtesentation from Atlantis + AEndcapCalorimeterDetectorProxy detector = new AEndcapCalorimeterDetectorProxy(name, color, sampling, region, + rMin, rMax, zMin, zMax, + eta0, dEta, nEta, mEta, + phi0, nPhi); + // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, eta0 > 0.0, phi0, nPhi, color, name + "[" + sampling + "/" + region + "]"); } --- NEW FILE: AEndcapCalorimeterDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.AEndcapCalorimeterDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link AEndcapCalorimeterDetector}. * <p><font color="#880088"> * <pre> * $Log: AEndcapCalorimeterDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:58:40 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: AEndcapCalorimeterDetectorProxy.java,v 1.1 2008/04/17 22:58:40 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class AEndcapCalorimeterDetectorProxy extends AEndcapCalorimeterDetector { /** Constructs a new endcap calorimeter proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * @param sampling The sampling of this calorimeter part. * @param region The region of this calorimeter part. * @param rMin The inner radius. * @param rMax The outer radius. * @param zMin The inner z. * @param zMax The outer z. * @param eta0 The start of the first cell in eta. * @param deta The size of a cell in eta. * @param neta The number of cells in eta. * @param meta The eta index of the first cell. * @param phi0 The start of the first cell in phi. * @param nphi The number of cells in phi. */ public AEndcapCalorimeterDetectorProxy(String name, String color, int sampling, int region, double rMin, double rMax, double zMin, double zMax, double eta0, double deta, int neta, int meta, double phi0, int nphi) { super(name, color, sampling, region, rMin, rMax, zMin, zMax, eta0, deta, neta, meta, phi0, nphi); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } Index: AGapCalorimeter.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AGapCalorimeter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AGapCalorimeter.java 17 Oct 2007 13:22:48 -0000 1.4 --- AGapCalorimeter.java 17 Apr 2008 22:59:18 -0000 1.5 *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 33,36 **** --- 34,40 ---- * <pre> * $Log$ + * Revision 1.5 2008/04/17 22:59:18 hrivnac + * using Atlantis to get geometry + * * Revision 1.4 2007/10/17 13:22:48 hrivnac * subdetectors grouped *************** *** 81,96 **** double phi0 = toRadians(aGapCalorimeter.getPhi0()); int nPhi = aGapCalorimeter.getNphi(); ! double dPhi = 2.0 * PI / nPhi; ! double eta = aGapCalorimeter.getEta(); // Find dimensions ! name += "[" + sampling + "/" + region + "]"; // Construct Atlantis representation ! double[] z = new double[] {zMax, zMin, zMin, zMax}; ! double[] r = new double[] {rMax, rMax, rMin, rMin}; ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, zMin > 0.0, nPhi, color, name); } --- 85,101 ---- double phi0 = toRadians(aGapCalorimeter.getPhi0()); int nPhi = aGapCalorimeter.getNphi(); ! int eta = aGapCalorimeter.getEta(); ! ! // Get 2d reprtesentation from Atlantis ! AGapCalorimeterDetectorProxy detector = new AGapCalorimeterDetectorProxy(name, color, sampling, region, ! rMin, rMax, zMin, zMax, ! eta, ! phi0, nPhi); // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, eta > 0.0, phi0, nPhi, color, name + "[" + sampling + "/" + region + "]"); } --- NEW FILE: ABarrelCalorimeterDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.ABarrelCalorimeterDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link ABarrelCalorimeterDetector}. * <p><font color="#880088"> * <pre> * $Log: ABarrelCalorimeterDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:58:03 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: ABarrelCalorimeterDetectorProxy.java,v 1.1 2008/04/17 22:58:03 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class ABarrelCalorimeterDetectorProxy extends ABarrelCalorimeterDetector { /** Constructs a new barrel calorimeter proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * @param sampling The sampling of this calorimeter part. * @param region The region of this calorimeter part. * @param rMin The inner radius. * @param rMax The outer radius. * @param zMin The inner z. * @param zMax The outer z. * @param eta0 The start of the first cell in eta. * @param deta The size of a cell in eta. * @param neta The number of cells in eta. * @param meta The eta index of the first cell. * @param phi0 The start of the first cell in phi. * @param nphi The number of cells in phi. */ public ABarrelCalorimeterDetectorProxy(String name, String color, int sampling, int region, double rMin, double rMax, double zMin, double zMax, double eta0, double deta, int neta, int meta, double phi0, int nphi) { super(name, color, sampling, region, rMin, rMax, zMin, zMax, eta0, deta, neta, meta, phi0, nphi); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } Index: AEndcapSiliconDetector.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/JiveGeometry/src/net/hep/atlas/graphics/JiveGeometry/GeometricModel/Reps/AEndcapSiliconDetector.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AEndcapSiliconDetector.java 17 Oct 2007 13:22:47 -0000 1.3 --- AEndcapSiliconDetector.java 17 Apr 2008 22:58:44 -0000 1.4 *************** *** 17,20 **** --- 17,21 ---- import javax.media.j3d.BranchGroup; import javax.vecmath.Point3d; + import javax.vecmath.Point2d; import javax.media.j3d.Appearance; *************** *** 36,39 **** --- 37,43 ---- * <pre> * $Log$ + * Revision 1.4 2008/04/17 22:58:44 hrivnac + * using Atlantis to get geometry + * * Revision 1.3 2007/10/17 13:22:47 hrivnac * subdetectors grouped *************** *** 87,99 **** double dPhi = 2.0 * PI / nPhi; // Find dimensions ! name += "[" + layer + "]"; // Construct Atlantis representation ! double[] z = new double[] {zMax, zMin, zMin, zMax}; ! double[] r = new double[] {rMax, rMax, rMin, rMin}; ! ! // Use Atlantis representation ! atlantis2GraXML(z, r, true, nPhi, color, name); } --- 91,105 ---- double dPhi = 2.0 * PI / nPhi; + // Get 2d reprtesentation from Atlantis + AEndcapSiliconDetectorProxy detector = new AEndcapSiliconDetectorProxy(name, color, layer, + length, width, thickness, + nZ, nPhi, + rMin, rMax, phi0, zMin, zMax); + // Find dimensions ! Point2d[] points = detector.zrho(); // Construct Atlantis representation ! atlantis2GraXML(points, true, phi0, nPhi, color, name + "[" + layer + "]"); } --- NEW FILE: AEndcapTRTDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.AEndcapTRTDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link AEndcapTRTDetector}. * <p><font color="#880088"> * <pre> * $Log: AEndcapTRTDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:59:10 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: AEndcapTRTDetectorProxy.java,v 1.1 2008/04/17 22:59:10 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class AEndcapTRTDetectorProxy extends AEndcapTRTDetector { /** Constructs a new endcap TRT proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * TBD */ public AEndcapTRTDetectorProxy(String name, String color, int layer, int numPhi, double rMin, double rMax, double phi0, double zMin, double zMax) { super(name, color, layer, numPhi, rMin, rMax, phi0, zMin, zMax); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } --- NEW FILE: AEndcapSiliconDetectorProxy.java --- package net.hep.atlas.graphics.JiveGeometry.GeometricModel.Reps; // Atlantis import atlantis.geometry.AEndcapSiliconDetector; import atlantis.graphics.ACoord; // Java3D import javax.vecmath.Point2d; /** GraXML proxy to {@link AEndcapSiliconDetector}. * <p><font color="#880088"> * <pre> * $Log: AEndcapSiliconDetectorProxy.java,v $ * Revision 1.1 2008/04/17 22:58:50 hrivnac * using Atlantis to get geometry * * </pre> * </font></p> * @version $Id: AEndcapSiliconDetectorProxy.java,v 1.1 2008/04/17 22:58:50 hrivnac Exp $ * @author <a href="mailto:Jul...@ce...">J.Hrivnac</a> */ public class AEndcapSiliconDetectorProxy extends AEndcapSiliconDetector { /** Constructs a new endcap silicon proxy. * @param name The name of the object. * @param color The name of the color used to draw this object. * TBD */ public AEndcapSiliconDetectorProxy(String name, String color, int layer, double length, double width, double thickness, int numZ, int numPhi, double rMin, double rMax, double phi0, double zMin, double zMax) { super(name, color, layer, length, width, thickness, numZ, numPhi, rMin, rMax, phi0, zMin, zMax); } /** Give z-rho projection. * @return The z-rho projection. */ public Point2d[] zrho() { double[][][] hv = getRZUser().hv; int n = hv[0][0].length; Point2d[] p = new Point2d[n]; for (int i = 0; i < n; i++) { p[n - i - 1] = new Point2d(hv[0][0][i], hv[1][0][i]); } return p; } } |
