diff -u -r1.3 -r1.4
--- HPSMCParticlePlotsDriver.java	7 Sep 2012 04:35:27 -0000	1.3
+++ HPSMCParticlePlotsDriver.java	19 Sep 2012 16:24:17 -0000	1.4
@@ -2,6 +2,7 @@

 
 import hep.aida.ICloud1D;
 import hep.aida.ICloud2D;

+import hep.aida.IHistogram1D;

 
 import java.util.ArrayList;
 import java.util.Comparator;

@@ -17,7 +18,7 @@

  * Diagnostic plots for HPS ECal.
  *
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: HPSMCParticlePlotsDriver.java,v 1.3 2012/09/07 04:35:27 phansson Exp $

+ * @version $Id: HPSMCParticlePlotsDriver.java,v 1.4 2012/09/19 16:24:17 phansson Exp $

  */
 public class HPSMCParticlePlotsDriver extends Driver {
 

@@ -30,20 +31,20 @@

 	ICloud1D fsCountEventTypePlot2;
 	ICloud1D fsCountTypePlot500;
 	ICloud1D fsEPlot;

-	ICloud1D fsGammaEPlot;
-	ICloud1D fsElectronEPlot;
-	ICloud1D fsPositronEPlot;

+	IHistogram1D fsGammaEPlot;
+	IHistogram1D fsElectronEPlot;
+	IHistogram1D fsPositronEPlot;

 	ICloud1D fsGammaThetaPlot;

-	ICloud1D fsGammaThetayPlot;
-	ICloud1D fsGammaThetayTrigPlot;

+	IHistogram1D fsGammaThetayPlot;
+	IHistogram1D fsGammaThetayTrigPlot;

 	ICloud2D fsGammaThetayEPlot;
 	ICloud1D fsElectronThetaPlot;

-	ICloud1D fsElectronThetayPlot;
-	ICloud1D fsElectronThetayTrigPlot;

+	IHistogram1D fsElectronThetayPlot;
+	IHistogram1D fsElectronThetayTrigPlot;

 	ICloud2D fsElectronThetayEPlot;
 	ICloud1D fsPositronThetaPlot;

-	ICloud1D fsPositronThetayPlot;
-	ICloud1D fsPositronThetayTrigPlot;

+	IHistogram1D fsPositronThetayPlot;
+	IHistogram1D fsPositronThetayTrigPlot;

 	ICloud2D fsPositronThetayEPlot;
         ICloud1D eventEPlot;
 

@@ -82,22 +83,22 @@

 		fsEPlot = aida.cloud1D("MCParticle: FS Particle E");
 		fsEPlot.annotation().addItem("xAxisLabel", "Particle E [GeV]");
 

-		fsGammaEPlot = aida.cloud1D("MCParticle: FS Gamma E");

+		fsGammaEPlot = aida.histogram1D("MCParticle: FS Gamma E",100,0,5);

 		fsGammaEPlot.annotation().addItem("xAxisLabel", "Particle E [GeV]");
 

-		fsElectronEPlot = aida.cloud1D("MCParticle: FS Electron E");

+		fsElectronEPlot = aida.histogram1D("MCParticle: FS Electron E",100,0,5);

 		fsElectronEPlot.annotation().addItem("xAxisLabel", "Particle E [GeV]");
 

-		fsPositronEPlot = aida.cloud1D("MCParticle: FS Positron E");

+		fsPositronEPlot = aida.histogram1D("MCParticle: FS Positron E",100,0,5);

 		fsPositronEPlot.annotation().addItem("xAxisLabel", "Particle E [GeV]");
 
 		fsGammaThetaPlot = aida.cloud1D("MCParticle: FS Gamma Theta");
 		fsGammaThetaPlot.annotation().addItem("xAxisLabel", "Particle angle [rad]");
 

-                fsGammaThetayPlot = aida.cloud1D("MCParticle: FS Gamma Thetay");

+                fsGammaThetayPlot = aida.histogram1D("MCParticle: FS Gamma Thetay",100,0,1.0);

 		fsGammaThetayPlot.annotation().addItem("xAxisLabel", "Particle Thetay angle [rad]");
 

-                fsGammaThetayTrigPlot = aida.cloud1D("MCParticle: FS Gamma Thetay Trig");

+                fsGammaThetayTrigPlot = aida.histogram1D("MCParticle: FS Gamma Thetay Trig",100,0,1.0);

 		fsGammaThetayTrigPlot.annotation().addItem("xAxisLabel", "Particle Thetay angle [rad]");
              
                 fsGammaThetayEPlot = aida.cloud2D("MCParticle: FS Gamma Thetay vs E");

@@ -107,10 +108,10 @@

 		fsElectronThetaPlot = aida.cloud1D("MCParticle: FS Electron Theta");
 		fsElectronThetaPlot.annotation().addItem("xAxisLabel", "Particle angle [rad]");
 

-                fsElectronThetayPlot = aida.cloud1D("MCParticle: FS Electron Thetay");

+                fsElectronThetayPlot = aida.histogram1D("MCParticle: FS Electron Thetay",100,0,1.0);

 		fsElectronThetayPlot.annotation().addItem("xAxisLabel", "Particle Thetay angle [rad]");
 

-                fsElectronThetayTrigPlot = aida.cloud1D("MCParticle: FS Electron Thetay Trig");

+                fsElectronThetayTrigPlot = aida.histogram1D("MCParticle: FS Electron Thetay Trig",100,0,1.0);

 		fsElectronThetayTrigPlot.annotation().addItem("xAxisLabel", "Particle Thetay angle [rad]");
 
                 fsElectronThetayEPlot = aida.cloud2D("MCParticle: FS Electron Thetay vs E");

@@ -120,10 +121,10 @@

 		fsPositronThetaPlot = aida.cloud1D("MCParticle: FS Positron Theta");
 		fsPositronThetaPlot.annotation().addItem("xAxisLabel", "Particle angle [rad]");
 

-                fsPositronThetayPlot = aida.cloud1D("MCParticle: FS Positron Thetay");

+                fsPositronThetayPlot = aida.histogram1D("MCParticle: FS Positron Thetay",100,0,1.0);

 		fsPositronThetayPlot.annotation().addItem("xAxisLabel", "Particle Thetay angle [rad]");
 

-                fsPositronThetayTrigPlot = aida.cloud1D("MCParticle: FS Positron Thetay Trig");

+                fsPositronThetayTrigPlot = aida.histogram1D("MCParticle: FS Positron Thetay Trig",100,0,1.0);

 		fsPositronThetayTrigPlot.annotation().addItem("xAxisLabel", "Particle Thetay angle [rad]");
 
                 fsPositronThetayEPlot = aida.cloud2D("MCParticle: FS Positron Thetay vs E");

@@ -157,7 +158,7 @@

                 int[] npositrons = {0,0};
                 int[] ngammas = {0,0};
                 int count = 0;

-                double trigThr = 0.5;

+                double trigThr = 0.2;

 		for (MCParticle fs : fsParticles) {
                         //System.out.println("Index " + count);