hps-java/src/main/java/org/lcsim/hps/readout/ecal

diff -u -r1.1 -r1.2
--- FADCTriggerVariableDriver.java	2 Sep 2013 21:57:12 -0000	1.1
+++ FADCTriggerVariableDriver.java	3 Sep 2013 16:42:37 -0000	1.2
@@ -25,23 +25,33 @@

     private int _pairs = 0;
 
     public FADCTriggerVariableDriver() {

+    }
+
+    @Override
+    public void startOfData() {

         if(!"".equals(outputFileName)) {
             try {
                 outputStream = new PrintWriter(outputFileName);
             } catch (FileNotFoundException ex) {
                 Logger.getLogger(FADCTriggerVariableDriver.class.getName()).log(Level.SEVERE, null, ex);
             }

+        } else {
+            throw new RuntimeException("Need to supply a output file!");

         }

+        
+        String str = "event/I:beamenergy/F:pairid/I:cl1E/F:cl1posx/F:cl1posy/F:cl2E/F:cl2posx/F:cl2posy/F";
+        
+        outputStream.println(str);
+

     }
 

+    
+    

     @Override
     public void detectorChanged(Detector detector) {
         setBeamEnergy(getBeamEnergyFromDetector(detector));
     }
 

-    @Override
-    public void startOfData() {
-    }

 
     @Override
     public void process(EventHeader event) {

@@ -49,13 +59,14 @@

 
         if (event.hasCollection(HPSEcalCluster.class, clusterCollectionName)) {
 

-            

+

             List<HPSEcalCluster> clusters = event.get(HPSEcalCluster.class, clusterCollectionName);

-          

+
+            //System.out.printf("%d ecal clusters in event\n", clusters.size());
+

             
             boolean clusterPairs1 = getClusterPairs(clusters);
             

-            String str = "event/I:beamenergy/F:pairid/I:cl1E/F:cl1posx/I:cl1posy/I:cl2E/F:cl2posx/I:cl2posy/I";

             
             int ipair = 0;
             for(HPSEcalCluster[] pair : clusterPairs) {

@@ -68,10 +79,11 @@

                     int quad = ECalUtils.getQuadrant(cluster);
                     double E = cluster.getEnergy();
                     double pos[] = cluster.getSeedHit().getPosition();

-                    System.out.printf("x %f y %f ix %d iy %d \n", pos[0], pos[1], cluster.getSeedHit().getIdentifierFieldValue("ix"), cluster.getSeedHit().getIdentifierFieldValue("iy"));

+                    //System.out.printf("x %f y %f ix %d iy %d \n", pos[0], pos[1], cluster.getSeedHit().getIdentifierFieldValue("ix"), cluster.getSeedHit().getIdentifierFieldValue("iy"));

-                    evString += String.format("%f %d %d ", E, pos[0], pos[1]);

+                    evString += String.format("%f %f %f ", E, pos[0], pos[1]);

                 }

+                System.out.printf("%s\n",evString);

                 outputStream.println(evString);
                 ++ipair;     
                 ++_pairs;

@@ -79,6 +91,9 @@

 
              
         } // has clusters 

+        else {
+            System.out.printf("No ecal cluster collection in event %d \n", event.getEventNumber());
+        }

@@ -89,6 +104,9 @@

         
             System.out.printf("%s: processed %d pairs\n",this.getClass().getSimpleName(),this._pairs);
     

+            outputStream.close();
+            
+            

     }