lcsim-cal-calib/src/org/lcsim/cal/calib

diff -u -r1.2 -r1.3
--- SamplingFractionAnalysisDriver.java	20 May 2008 17:59:12 -0000	1.2
+++ SamplingFractionAnalysisDriver.java	21 May 2008 20:30:20 -0000	1.3
@@ -3,7 +3,7 @@

  *
  * Created on May 19, 2008, 11:54 AM
  *

- * $Id: SamplingFractionAnalysisDriver.java,v 1.2 2008/05/20 17:59:12 ngraf Exp $

+ * $Id: SamplingFractionAnalysisDriver.java,v 1.3 2008/05/21 20:30:20 ngraf Exp $

  */
 
 package org.lcsim.cal.calib;

@@ -183,16 +183,17 @@

             for(Cluster c : clusters)
             {
 //                System.out.println(c);

-                aida.cloud1D("cluster energy").fill(c.getEnergy());

+                aida.cloud1D("cluster energy for all clusters").fill(c.getEnergy());

             }
             
             // proceed only if we found a single cluster above threshold

-            if(clusters.size()==1)

+	    // too restrictive! simply take the highest energy cluster           
+            if(clusters.size()>0) 

             {
                 Cluster c = clusters.get(0);
                 

-                aida.cloud1D("Single cluster events cluster energy").fill(c.getEnergy());
-                aida.cloud1D("Single cluster events cluster number of cells").fill(c.getCalorimeterHits().size());

+                aida.cloud1D("Highest energy cluster energy").fill(c.getEnergy());
+                aida.cloud1D("Highest energy cluster number of cells").fill(c.getCalorimeterHits().size());

                 
                 double clusterEnergy = c.getEnergy();
                 double mcMass = mcpart.getType().getMass();