Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/subdetector on MAIN
PolyhedraEndcapCalorimeter.java+6-71.3 -> 1.4
JM: Reintroduce PolyhedraEndcapCalorimeter code for endcaps.

GeomConverter/src/org/lcsim/geometry/subdetector
PolyhedraEndcapCalorimeter.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- PolyhedraEndcapCalorimeter.java	7 Mar 2006 01:06:38 -0000	1.3
+++ PolyhedraEndcapCalorimeter.java	12 Oct 2006 22:03:56 -0000	1.4
@@ -57,7 +57,7 @@
         return zmax;
     }
     
-  /*  public void appendHepRep(HepRepFactory factory, HepRep heprep)
+    public void appendHepRep(HepRepFactory factory, HepRep heprep)
     {
         HepRepInstanceTree instanceTree = heprep.getInstanceTreeTop("Detector","1.0");
         HepRepTypeTree typeTree = heprep.getTypeTree("DetectorType","1.0");
@@ -67,8 +67,7 @@
         type.addAttValue("drawAs","Polygon");
         
         HepRepInstance instance = factory.createHepRepInstance(instanceTree, type);
-        
-         compute section (x,y) coordinates 
+                  
         double rmin = getInnerR();
         
         double x1 = rmin * tan(getHalfSectionPhi());
@@ -89,7 +88,7 @@
         double y3 = y4;
         
         
-         * Place nsides sections by applying matrix transform to starting coordinates.
+        // Place nsides sections by applying matrix transform to starting coordinates.
          
         double phi = 0;
         double flip = 1;
@@ -111,13 +110,13 @@
                 double ix4 = x4 * cos(phi) - y4 * sin(phi);
                 double iy4 = x4 * sin(phi) + y4 * cos(phi);
                 
-                 +z face 
+                // +z face 
                 factory.createHepRepPoint(instance, ix1, iy1, flip*z1);
                 factory.createHepRepPoint(instance, ix2, iy2, flip*z1);
                 factory.createHepRepPoint(instance, ix3, iy3, flip*z1);
                 factory.createHepRepPoint(instance, ix4, iy4, flip*z1);
                 
-                 -z face 
+                // -z face 
                 factory.createHepRepPoint(instance, ix4, iy4, flip*z2);
                 factory.createHepRepPoint(instance, ix3, iy3, flip*z2);
                 factory.createHepRepPoint(instance, ix2, iy2, flip*z2);
@@ -128,5 +127,5 @@
             if (!getReflect() || flip<0) break;
             flip = -1;
         }
-    }*/
+    }
 }
\ No newline at end of file
CVSspam 0.2.8