--- java/trunk/users/src/main/java/org/hps/users/jeremym/MockDataChallengeDiagnosticDriver.java	2014-05-16 18:30:59 UTC (rev 589)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/MockDataChallengeDiagnosticDriver.java	2014-05-16 18:32:59 UTC (rev 590)
@@ -179,6 +179,8 @@

             aida.histogram1D("Item Count", 20, 0., 20);
             aida.histogram1D("Cluster_E over Track_P", 200, 0., 10.);
             aida.histogram1D("Energy", 200, 0., 5.0);

+            aida.histogram1D("P", 80, 0., 8.);
+            aida.histogram1D("Mass", 100, 0., 1.);

         }
         
         void plot(List<ReconstructedParticle> collection) {

@@ -188,12 +190,11 @@

                 aida.cloud1D("N Clusters").fill(particle.getClusters().size());
                 aida.cloud1D("N Tracks").fill(particle.getTracks().size());
                 Hep3Vector momentum = particle.getMomentum();

-                aida.cloud1D("P").fill(momentum.magnitude());

+                aida.histogram1D("P").fill(momentum.magnitude());

                 aida.cloud1D("Px").fill(momentum.x());
                 aida.cloud1D("Py").fill(momentum.y());
                 aida.cloud1D("Pz").fill(momentum.z());

-                aida.cloud1D("Mass").fill(particle.getMass());
-                aida.cloud1D("Energy").fill(particle.getEnergy());

+                aida.histogram1D("Mass").fill(particle.getMass());                

                 aida.cloud1D("Goodness of PID").fill(particle.getGoodnessOfPID());
                 aida.cloud1D("N Particles").fill(particle.getParticles().size());
                 Hep3Vector refPoint = particle.getReferencePoint();

@@ -293,7 +294,12 @@

     }
     
     class MCParticlePlotter extends CollectionPlotter<MCParticle> {

-                

+        
+        void definePlots() {
+            super.definePlots();
+            aida.histogram1D("Production Time", 90, 0., 30.);
+        }
+        

         void plot(List<MCParticle> collection) {
             super.plot(collection);
             for (MCParticle particle : collection) {

@@ -320,7 +326,7 @@

                 aida.cloud1D("Origin X").fill(origin.x());
                 aida.cloud1D("Origin Y").fill(origin.y());
                 aida.cloud1D("Origin Z").fill(origin.z());

-                aida.cloud1D("Production Time").fill(prodTime);

+                aida.histogram1D("Production Time").fill(prodTime);

             }
         }
     }

--- java/trunk/users/src/test/java/org/hps/users/jeremym/MockDataChallengeDiagnosticDriverTest.java	2014-05-16 18:30:59 UTC (rev 589)
+++ java/trunk/users/src/test/java/org/hps/users/jeremym/MockDataChallengeDiagnosticDriverTest.java	2014-05-16 18:32:59 UTC (rev 590)
@@ -10,8 +10,7 @@

 
 public class MockDataChallengeDiagnosticDriverTest {
     

-    //String mockDataUrl = "http://www.slac.stanford.edu/~meeg/hps2/meeg/mock_data/tritrig-beam-tri_1-10_recon.slcio";
-        

+    //String mockDataUrl = "http://www.slac.stanford.edu/~meeg/hps2/meeg/mock_data/tritrig-beam-tri_1-10_recon.slcio";        

     static String mockDataUrl = "file:///u1/projects/svn/hps/java/trunk/recon/target/MockDataReconTest.slcio";
     
     public void testSimpleMdcAnalysisDriver() throws Exception {

@@ -25,7 +24,6 @@

         eventMarkerDriver.setEventInterval(100);
         loop.add(eventMarkerDriver);
         MockDataChallengeDiagnosticDriver analysisDriver = new MockDataChallengeDiagnosticDriver();

-        //analysisDriver.setVerbose(true);

         loop.add(analysisDriver);
         loop.loop(-1);
     }