Print

Print


Commit in GeomConverter/src/org/lcsim/geometry/compact/converter/pandora on MAIN
Main.java+4-31.5 -> 1.6


GeomConverter/src/org/lcsim/geometry/compact/converter/pandora
Main.java 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- Main.java	3 Feb 2010 21:02:00 -0000	1.5
+++ Main.java	8 Feb 2010 23:19:16 -0000	1.6
@@ -79,8 +79,8 @@
         root.addContent(calorimeters);
         
         DecimalFormat xlen = new DecimalFormat("#.########");
-        DecimalFormat xthick = new DecimalFormat("#.##");
         DecimalFormat xfrac = new DecimalFormat("#.########");
+        DecimalFormat xthick = new DecimalFormat("#.######");        
         
         for ( Subdetector subdetector : detector.getSubdetectors().values() )
         {
@@ -147,13 +147,13 @@
                         layersElem.addContent(layerElem);
                      
                         double intLen = 0;
-                        double radLen = 0;
+                        double radLen = 0;                        
                                                                                                
                         for (int j=0; j<layer.getNumberOfSlices(); j++)
                         {
                             LayerSlice slice = layer.getSlice(j);
                             radLen += slice.getThickness() / slice.getMaterial().getRadiationLength();
-                            intLen += slice.getThickness() / slice.getMaterial().getNuclearInteractionLength();                       
+                            intLen += slice.getThickness() / slice.getMaterial().getNuclearInteractionLength();                            
                         }
                         
                         double layerD2 = layerD + layer.getThicknessToSensitiveMid();
@@ -161,6 +161,7 @@
                         layerElem.setAttribute("distanceToIp", xthick.format(layerD2));
                         layerElem.setAttribute("radLen", xlen.format(radLen));
                         layerElem.setAttribute("intLen", xlen.format(intLen));
+                        layerElem.setAttribute("cellThickness", xthick.format(layer.getSensorThickness()));
                         
                         double samplingFraction = SamplingFractionManager.defaultInstance().getSamplingFraction(subdetector,i);
                         layerElem.setAttribute("samplingFraction", xfrac.format(samplingFraction));
CVSspam 0.2.8