SlicDiagnostics/src/org/lcsim/slic/diagnostics

diff -u -r1.14 -r1.15
--- CalorimeterHitPlots.java	29 Sep 2005 21:08:14 -0000	1.14
+++ CalorimeterHitPlots.java	29 Sep 2005 21:43:31 -0000	1.15
@@ -68,7 +68,7 @@

         CalorimeterIDDecoder segmentation = (CalorimeterIDDecoder)decoder;
         Subdetector detector = ((SubdetectorIDDecoder)decoder).getSubdetector();
         

-        if ( decoder != null )

+        if ( segmentation != null && detector != null )

         {
             if ( segmentation instanceof ProjectiveCylinder )
             {

@@ -161,8 +161,11 @@

                     mcpMissingCount += 1;
                 }
                 

-                /* Fill plots specific to type of segmentation. */
-                segmentationPlots.fill(segmentation);

+                /* Fill plots that are specific to the type of segmentation. */
+                if ( segmentationPlots != null )
+                {
+                    segmentationPlots.fill(segmentation);
+                }

                 
                 /* corrected energy */
                 if (haveSF)

@@ -238,7 +241,13 @@

             
             aida.cloud2D(plots.makePlotName("Theta vs Theta Bin")).fill(
                     segmentation.getTheta(),

-                    (double)segmentation.getValue("theta"));

+                    (double)segmentation.getValue("theta")
+                    );
+            
+            aida.cloud2D(plots.makePlotName("Phi Bin vs Theta Bin")).fill(
+                    (double)segmentation.getValue("phi"),
+                    (double)segmentation.getValue("theta")
+                    );

         }
     }
     

@@ -261,6 +270,11 @@

                     segmentation.getZ(),
                     (double)segmentation.getValue("z")
                     );

+            
+            aida.cloud2D(plots.makePlotName("Phi Bin vs Z Bin")).fill(
+                    (double)segmentation.getValue("phi"),
+                    (double)segmentation.getValue("z")
+                    );

         }
     }
     

@@ -282,6 +296,11 @@

                     segmentation.getZ(),
                     (double)segmentation.getValue("y")
                     );

+            
+            aida.cloud2D(makePlotName("X Bin vs Y Bin")).fill(
+                    (double)segmentation.getValue("x"),
+                    (double)segmentation.getValue("y")
+                    );

         }
     }
     

@@ -303,6 +322,11 @@

                     segmentation.getZ(),
                     (double)segmentation.getValue("z")
                     );

+            
+            aida.cloud2D(makePlotName("X Bin vs Z Bin")).fill(
+                    (double)segmentation.getValue("x"),
+                    (double)segmentation.getValue("z")
+                    );

         }

-    }    

+    }

 }

\ No newline at end of file