diff -u -r1.3 -r1.4
--- CalorimeterPlotsNoDetector.java	29 Apr 2008 19:32:54 -0000	1.3
+++ CalorimeterPlotsNoDetector.java	4 Sep 2008 17:37:54 -0000	1.4
@@ -1,5 +1,6 @@

 package org.lcsim.slic.diagnostics.calorimeterhit;
 

+import org.lcsim.slic.diagnostics.util.AidaHelper;

 import static org.lcsim.slic.diagnostics.util.AidaHelper.c1d;
 import static org.lcsim.slic.diagnostics.util.AidaHelper.c2d;
 import static org.lcsim.slic.diagnostics.util.VecUtil.getCylindricalRadius;

@@ -9,6 +10,7 @@

 import hep.physics.vec.BasicHep3Vector;
 import hep.physics.vec.Hep3Vector;
 import hep.physics.vec.VecOp;

+import org.lcsim.util.aida.AIDA;

 
 import java.util.HashSet;
 import java.util.List;

@@ -63,13 +65,14 @@

 	public void definePlots()
 	{
 		super.definePlots();

-		

+		System.out.println(getCollectionName() + " - baseDir = " + getBaseDir());
+		AidaHelper.cd(getBaseDir());

 		x = c1d("X Position", "X [mm]", "Number of Entries");
 		y = c1d("Y Position", "Y [mm]", "Number of Entries"); 
 		z = c1d("Z Position", "Z [mm]", "Number of Entries");
 		xy = c2d("X vs Y", "X [mm]", "Y [mm]");			
 		zx = c2d("Z vs X", "Z [mm]", "X [mm]");

-		zy = c2d("X vs Y", "Z [mm]", "Y [mm]");

+		zy = c2d("Z vs Y", "Z [mm]", "Y [mm]");

 		sphr = c1d("Spherical Radius", "R [mm]", "Number of Entries");
 		cylr = c1d("Cylindrical Radius", "R [mm]", "Number of Entries");
 		time = c1d("Time","Time [ns]","Number of Entries");

@@ -97,10 +100,10 @@

 	{
 		// Changes to correct directory.
 		super.fill(event);

-					

+								

 		if (collection.size() == 0) 

-			return;
-

+			return;			
+		

 		int hits = 0;
 		int contribs = 0;
 		double timeSum = 0.;