[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps Box.java,1.1,1.2 Para.java,1.1,1.2 Tra
Brought to you by:
hrivnac
Menu
▾
▴
[GraXML-commit] DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps Box.java,1.1,1.2 Para.java,1.1,1.2 Trap.java,1.1,1.2 Trd.java,1.1,1.2
|
From: starXML <st...@us...> - 2006-02-09 20:09:55
|
Update of /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22658/AGDD/src/net/hep/AGDD/TGeoModel/Reps Modified Files: Box.java Para.java Trap.java Trd.java Log Message: Updated the code for better structure. Para and Trap still not functional. Index: Trap.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Trap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Trap.java 9 Feb 2006 19:25:54 -0000 1.1 --- Trap.java 9 Feb 2006 20:09:47 -0000 1.2 *************** *** 31,36 **** * <pre> * $Log$ ! * Revision 1.1 2006/02/09 19:25:54 starxml ! * *** empty log message *** * * Revision 1.3 2005/03/24 14:24:30 hrivnac --- 31,36 ---- * <pre> * $Log$ ! * Revision 1.2 2006/02/09 20:09:47 starxml ! * Updated the code for better structure. Para and Trap still not functional. * * Revision 1.3 2005/03/24 14:24:30 hrivnac *************** *** 74,102 **** String name0 = trap.getName(); String name = builder().name(name0); // Verify reuse ! if (isLink(name0, name, parent, tg)) { ! return; ! } ! ! // Create Trapezod and use it ! // builder().setMaterial(trap.getMaterial().toString()); ! use(new Trapezoid(xmumdpupdympz[0], ! xmumdpupdympz[1], ! xmumdpupdympz[2], ! xmumdpupdympz[3], ! xmumdpupdympz[4], ! xmumdpupdympz[5], ! xmumdpupdympz[6], ! inclination[0], ! inclination[1], ! declination[0], ! declination[1], ! builder.appearance(name0, builder().material())), ! name, ! parent, ! tg); ! } /** Logging . */ --- 74,98 ---- String name0 = trap.getName(); String name = builder().name(name0); + setColor(trap); // Verify reuse ! if (!isLink(name0, name, parent, tg)) { ! use(new Trapezoid(xmumdpupdympz[0], ! xmumdpupdympz[1], ! xmumdpupdympz[2], ! xmumdpupdympz[3], ! xmumdpupdympz[4], ! xmumdpupdympz[5], ! xmumdpupdympz[6], ! inclination[0], ! inclination[1], ! declination[0], ! declination[1], ! builder().appearance(name0, rgb(), transparency())), ! name, ! parent, ! tg); } + } /** Logging . */ Index: Box.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Box.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Box.java 8 Feb 2006 21:20:14 -0000 1.1 --- Box.java 9 Feb 2006 20:09:47 -0000 1.2 *************** *** 36,41 **** * <pre> * $Log$ ! * Revision 1.1 2006/02/08 21:20:14 starxml ! * This is a first check-in of the working Box rep in the AGDD/TGeo system * * </pre> --- 36,41 ---- * <pre> * $Log$ ! * Revision 1.2 2006/02/09 20:09:47 starxml ! * Updated the code for better structure. Para and Trap still not functional. * * </pre> *************** *** 67,73 **** setColor(box); - String x = evaluator.formatted(xyz[0]/2.0f); - String y = evaluator.formatted(xyz[1]/2.0f); - String z = evaluator.formatted(xyz[2]/2.0f); if (!isLink(name0, name, parent, tg)) { // Verify reuse --- 67,70 ---- *************** *** 77,82 **** --- 74,84 ---- //------------------------------------- TGEO ProcessMediumAndMaterial(element); + + String x = evaluator.formatted(xyz[0]/2.0f); + String y = evaluator.formatted(xyz[1]/2.0f); + String z = evaluator.formatted(xyz[2]/2.0f); String key = _nameCore+";"+x+";"+y+";"+z; String agddName=""; + if (!InKeyHash(key)) { // only construct if not already have done so agddName = ToKeyHash(key,_nameCore); Index: Trd.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Trd.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Trd.java 9 Feb 2006 19:25:54 -0000 1.1 --- Trd.java 9 Feb 2006 20:09:47 -0000 1.2 *************** *** 29,34 **** * <pre> * $Log$ ! * Revision 1.1 2006/02/09 19:25:54 starxml ! * *** empty log message *** * * Revision 1.3 2005/03/24 14:24:30 hrivnac --- 29,34 ---- * <pre> * $Log$ ! * Revision 1.2 2006/02/09 20:09:47 starxml ! * Updated the code for better structure. Para and Trap still not functional. * * Revision 1.3 2005/03/24 14:24:30 hrivnac *************** *** 49,106 **** public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { ! // Verify and set builder type ! setBuilder(builder); - // Verify element type if (! (element instanceof TrdType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } // Get element properties Evaluator evaluator = builder().evaluator(); TrdType trd = (TrdType)element; // not used: trd.isSensitive(); String lUnit = trd.getUnitLength(); String aUnit = trd.getUnitAngle(); float[] xmpympz = evaluator.valueOf(trd.getXmpYmpZ(), lUnit); float[] inclination = evaluator.valueOf(trd.getInclination(), lUnit); String name0 = trd.getName(); String name = builder().name(name0); ! // Verify reuse ! if (isLink(name0, name, parent, tg)) { ! return; ! } ! ! // Create Trapezod and use it ! // builder().setMaterial(trd.getMaterial().toString()); ! use(new Trapezoid(xmpympz[0], ! xmpympz[1], ! xmpympz[2], ! xmpympz[3], ! xmpympz[4], ! inclination[0], ! inclination[1], ! builder.appearance(name0, builder().material())), ! name, ! parent, ! tg); ! ! String x1 = evaluator.formatted(xmpympz[0]/2.0f); ! String x2 = evaluator.formatted(xmpympz[1]/2.0f); ! String y1 = evaluator.formatted(xmpympz[2]/2.0f); ! String y2 = evaluator.formatted(xmpympz[3]/2.0f); ! String dz = evaluator.formatted(xmpympz[4]/2.0f); ! String key = _nameCore+";"+x1+";"+x2+";"+y1+";"+y2+";"+dz; ! System.out.println("trd "+_nameCore+" key: "+key); String agddName=""; ! //----------------------- TGEO if (!InKeyHash(key)) { // only construct if not already have done so agddName = ToKeyHash(key,_nameCore); ! System.out.println("Creating trd "+ agddName); ! builder().cxx("TGeoVolume *"+agddName+" = gGeoManager->MakeTrd2(\""+agddName+"\",medSTANDARD,"+x1+","+x2+","+y1+","+y2+","+dz+");"); } else { --- 49,102 ---- public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { ! setBuilder(builder); // Verify and set builder type if (! (element instanceof TrdType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } // Get element properties Evaluator evaluator = builder().evaluator(); TrdType trd = (TrdType)element; + // not used: trd.isSensitive(); String lUnit = trd.getUnitLength(); String aUnit = trd.getUnitAngle(); + float[] xmpympz = evaluator.valueOf(trd.getXmpYmpZ(), lUnit); float[] inclination = evaluator.valueOf(trd.getInclination(), lUnit); String name0 = trd.getName(); String name = builder().name(name0); + setColor(trd); ! if (!isLink(name0, name, parent, tg)) { // Verify reuse ! use(new Trapezoid(xmpympz[0], ! xmpympz[1], ! xmpympz[2], ! xmpympz[3], ! xmpympz[4], ! inclination[0], ! inclination[1], ! builder().appearance(name0, rgb(), transparency())), ! name, ! parent, ! tg); ! } + //------------------------------------- TGEO + ProcessMediumAndMaterial(element); ! String x1 = evaluator.formatted(xmpympz[0]/2.0f); ! String x2 = evaluator.formatted(xmpympz[1]/2.0f); ! String y1 = evaluator.formatted(xmpympz[2]/2.0f); ! String y2 = evaluator.formatted(xmpympz[3]/2.0f); ! String dz = evaluator.formatted(xmpympz[4]/2.0f); ! String key = _nameCore+";"+x1+";"+x2+";"+y1+";"+y2+";"+dz; // System.out.println("trd "+_nameCore+" key: "+key); String agddName=""; ! if (!InKeyHash(key)) { // only construct if not already have done so agddName = ToKeyHash(key,_nameCore); ! System.out.println("Creating trd "+ agddName + " made of "+_medName); ! builder().cxx("TGeoVolume *"+agddName+" = gGeoManager->MakeTrd2(\""+agddName+"\","+_medName+","+x1+","+x2+","+y1+","+y2+","+dz+");"); } else { Index: Para.java =================================================================== RCS file: /cvsroot/graxml/DetDescr/AGDD/src/net/hep/AGDD/TGeoModel/Reps/Para.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Para.java 9 Feb 2006 19:25:54 -0000 1.1 --- Para.java 9 Feb 2006 20:09:47 -0000 1.2 *************** *** 35,40 **** * <pre> * $Log$ ! * Revision 1.1 2006/02/09 19:25:54 starxml ! * *** empty log message *** * * Revision 1.3 2005/03/24 14:24:30 hrivnac --- 35,40 ---- * <pre> * $Log$ ! * Revision 1.2 2006/02/09 20:09:47 starxml ! * Updated the code for better structure. Para and Trap still not functional. * * Revision 1.3 2005/03/24 14:24:30 hrivnac *************** *** 55,66 **** public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { ! // Verify and set builder type ! setBuilder(builder); - // Verify element type if (! (element instanceof ParaType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } // Get element properties --- 55,64 ---- public final void traverse(MasterBuilder builder, Element element, Group tg, String parent) { ! setBuilder(builder); // Verify and set builder type if (! (element instanceof ParaType)) { ! log.error(element + " can't be traversed using " + getClass().getName() + " representation"); ! return; ! } // Get element properties *************** *** 70,73 **** --- 68,72 ---- String lUnit = para.getUnitLength(); String aUnit = para.getUnitAngle(); + float[] xyz = evaluator.valueOf(para.getXYZ(), lUnit); float[] alpha = evaluator.valueOf(para.getAlpha(), aUnit); *************** *** 76,104 **** String name0 = para.getName(); String name = builder().name(name0); // Verify reuse ! if (isLink(name0, name, parent, tg)) { ! return; ! } ! ! // Create Trapezod and use it ! // builder().setMaterial(para.getMaterial().toString()); ! use(new Trapezoid(xyz[0], ! xyz[0], ! xyz[0], ! xyz[0], ! xyz[1], ! xyz[1], ! xyz[2], ! atan(tan(theta[0]) * cos(phi[0])), ! atan(tan(theta[0]) * sin(phi[0])), ! alpha[0], ! alpha[0], ! builder.appearance(name0, builder().material())), ! name, ! parent, ! tg); ! } /** Logging . */ --- 75,100 ---- String name0 = para.getName(); String name = builder().name(name0); + setColor(para); // Verify reuse ! if (!isLink(name0, name, parent, tg)) { ! use(new Trapezoid(xyz[0], ! xyz[0], ! xyz[0], ! xyz[0], ! xyz[1], ! xyz[1], ! xyz[2], ! atan(tan(theta[0]) * cos(phi[0])), ! atan(tan(theta[0]) * sin(phi[0])), ! alpha[0], ! alpha[0], ! builder.appearance(name0, builder().material())), ! name, ! parent, ! tg); } + + } /** Logging . */ |
