hps-java/src/main/java/org/lcsim/hps/evio

diff -u -r1.3 -r1.4
--- EvioConsumer.java	12 Mar 2012 21:09:07 -0000	1.3
+++ EvioConsumer.java	12 Mar 2012 21:30:36 -0000	1.4
@@ -234,7 +234,12 @@

                     timedOut = true;
                 }                
                 if (timedOut) {

-                    System.out.println("press any key to exit");

+                    
+                    // Save AIDA plots.
+                    aida.saveAs("EtTestPlots.aida");
+                    
+                    // Exit after user pressed enter.
+                    System.out.println("press ENTER to exit");

                     System.console().readLine();
                     System.exit(0);
                 }

@@ -243,7 +248,7 @@

                     System.out.println("EvioConsumer read event #" + eventCount);
                 
                 if (mevs.length > 1) {

-                    throw new RuntimeException("Did not expect more than 1 event!");

+                    throw new RuntimeException("Did not expect more than 1 event in array!");

                 }
                 
                 EtEvent mev = mevs[0];

@@ -258,7 +263,6 @@

 
                 // Get CompositeData using event buffer.
                 ByteBuffer buf = mev.getDataBuffer();

-                //System.out.println("buf.pos = " + buf.position());

                 EvioReader reader = new EvioReader(buf);
                 EvioEvent evioEvent = null;
                 try {

@@ -283,12 +287,13 @@

                     Long id = (Long)items.get(i);
                     int time = (Integer)items.get(i+1);
                     int adcValue = (Integer)items.get(i+2);

-                    //System.out.println("EvioConsumer --> id=0x"+Long.toHexString(id)+"; time="+time+"; adcValue="+adcValue);

+                    if (debug)
+                        System.out.println("EvioConsumer --> id=0x"+Long.toHexString(id)+"; time="+time+"; adcValue="+adcValue);

                     RawTrackerHit hit = new BaseRawTrackerHit(id, time, new short[] {(short)adcValue});
                     hits.add(hit);
                 }         
                 if (debug)

-                    System.out.println("Made " + hits.size() + " RawTrackerHits from EtEvent");

+                    System.out.println("made " + hits.size() + " RawTrackerHits from EtEvent");

 
                 hitCountPlot.fill(hits.size());
 

@@ -320,6 +325,5 @@

             System.out.println("Error using ET system as consumer");
             ex.printStackTrace();
         }

-    }
-    
-}

+    }   
+}

\ No newline at end of file