lcsim/src/org/lcsim/mc/fast/cluster/ronan
diff -u -r1.10 -r1.11
--- MCFastRonan.java 8 Sep 2006 03:19:43 -0000 1.10
+++ MCFastRonan.java 7 Oct 2006 00:25:31 -0000 1.11
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Random;
+import org.lcsim.mc.fast.MCFast;
import org.lcsim.conditions.ConditionsEvent;
import org.lcsim.conditions.ConditionsListener;
import org.lcsim.conditions.ConditionsSet;
@@ -18,7 +19,7 @@
/**
* Fast Monte Carlo cluster simulator
* @author M.Ronan Oct 2000 - Added "refined" cluster simulation
- * @version $Id: MCFastRonan.java,v 1.10 2006/09/08 03:19:43 ngraf Exp $
+ * @version
*/
public class MCFastRonan extends Driver implements ConditionsListener
{
@@ -32,7 +33,6 @@
private final static int Neutralino2 = 1000023;
private final static int Neutralino3 = 1000025;
private final static int Neutralino4 = 1000035;
- private static long iprint=0;
private ClusterResolutionTables clusterParm;
@@ -132,8 +132,7 @@
neg_energy_total+=((ReconCluster)rcl).getNegEnergy();
pos_energy_weight_total+=((ReconCluster)rcl).getNegEnergy() < 0. ? 0. : Math.min(((ReconCluster)rcl).getSigma(),((ReconCluster)rcl).getEnergy());
}
- iprint++;
- if(iprint < -20) System.out.println(" MCFast neg_energy_total= "+neg_energy_total+" pos_energy_weight_total= "+pos_energy_weight_total);
+ MCFast.log.info(" MCFast neg_energy_total= "+neg_energy_total+" pos_energy_weight_total= "+pos_energy_weight_total);
if( neg_energy_total < -Double.MIN_VALUE ) for (Cluster rcl : cl ) if( Math.abs(((ReconCluster)rcl).getMCParticle().getCharge()) < Double.MIN_VALUE && ((ReconCluster)rcl).getNegEnergy() >= 0. )
((ReconCluster)rcl).adjustEnergy(neg_energy_total,pos_energy_weight_total);
event.put(EventHeader.CLUSTERS, cl, Cluster.class, 0);