lcsim/src/org/lcsim/digisim

diff -u -r1.3 -r1.4
--- ExponentialNoise.java	14 Jan 2006 00:10:11 -0000	1.3
+++ ExponentialNoise.java	18 Jan 2006 00:25:50 -0000	1.4
@@ -5,6 +5,8 @@

 import org.apache.commons.math.distribution.DistributionFactory;
 import org.apache.commons.math.distribution.ExponentialDistribution;
 import org.apache.commons.math.MathException;

+import org.lcsim.util.aida.AIDA;
+import hep.aida.ICloud1D;

 
 /**
  * Noise parametrization based on an exponential distribution.  This

@@ -13,7 +15,7 @@

  * exponential distribution.
  *
  * @author Guilherme Lima

- * @version $Id: ExponentialNoise.java,v 1.3 2006/01/14 00:10:11 lima Exp $

+ * @version $Id: ExponentialNoise.java,v 1.4 2006/01/18 00:25:50 lima Exp $

  */
 class ExponentialNoise extends RandomNoise {
 

@@ -33,6 +35,10 @@

 
       // create distribution
       _expo = DistributionFactory.newInstance().createExponentialDistribution(_beta);

+
+      // debug histo
+      _cloudAll = _aida.cloud1D("allExpo");
+      _cloudAbove = _aida.cloud1D("noiseOnlyExpo");

     }
 
     /** Probability to get noise above the threshold */

@@ -53,7 +59,7 @@

       try {
 	double flat = _random.nextDouble();
 	double expo = _expo.inverseCumulativeProbability( flat );

-	org.lcsim.util.aida.AIDA.defaultInstance().cloud1D("allExpo").fill(expo);

+	_cloudAll.fill(expo);

 	return expo;
       }
       catch(MathException x) {

@@ -82,7 +88,8 @@

       catch(MathException x) {
 	  assert false : "MathException caught: " + x;
       }

-      org.lcsim.util.aida.AIDA.defaultInstance().cloud1D("noiseOnlyExpo").fill(noise);

+      
+      _cloudAbove.fill(noise);

       return noise;
     }
 

@@ -121,4 +128,8 @@

     private ExponentialDistribution _expo;
     /** Global instance, used only for registration */
     private static ExponentialNoise _me = new ExponentialNoise();

+
+    private AIDA _aida = AIDA.defaultInstance();
+    private ICloud1D _cloudAll = null;
+    private ICloud1D _cloudAbove = null;

 }

lcsim/src/org/lcsim/digisim

diff -u -r1.3 -r1.4
--- GaussianNoise.java	14 Jan 2006 00:10:11 -0000	1.3
+++ GaussianNoise.java	18 Jan 2006 00:25:50 -0000	1.4
@@ -6,6 +6,7 @@

 import org.apache.commons.math.distribution.NormalDistribution;
 import org.apache.commons.math.MathException;
 import org.lcsim.util.aida.AIDA;

+import hep.aida.ICloud1D;

 
 /**
  * Noise parametrization based on a gaussian distribution.  This class

@@ -13,7 +14,7 @@

  * Hence the next two parameters are the gaussian mean and width.
  *
  * @author Guilherme Lima

- * @version $Id: GaussianNoise.java,v 1.3 2006/01/14 00:10:11 lima Exp $

+ * @version $Id: GaussianNoise.java,v 1.4 2006/01/18 00:25:50 lima Exp $

  */
 class GaussianNoise extends RandomNoise {
 

@@ -38,6 +39,10 @@

 
       // create distribution
       _gauss = DistributionFactory.newInstance().createNormalDistribution(_mean,_sigma);

+
+      // debug histo
+      _cloudAll = _aida.cloud1D("allGaussian");
+      _cloudAbove = _aida.cloud1D("noiseOnlyGaussian");

     }
 
     //*** Defining modifier interface ***

@@ -66,7 +71,7 @@

       try {
 	double flat = _random.nextDouble();
 	double gauss = _gauss.inverseCumulativeProbability( flat );

-	AIDA.defaultInstance().cloud1D("allGauss").fill(gauss);

+	_cloudAll.fill(gauss);

 	return gauss;
       }
       catch(MathException x) {

@@ -103,7 +108,7 @@

       catch(MathException e) {
 	  System.out.println("MathException caught: "+e);
       }

-      AIDA.defaultInstance().cloud1D("noiseOnlyGauss").fill(noise);

+      _cloudAbove.fill(noise);

       return noise;
     }
 

@@ -169,4 +174,8 @@

     private boolean _keepNegative;
     /** Global instance, used only for registration */
     private static GaussianNoise _me = new GaussianNoise();

+
+    private AIDA _aida = AIDA.defaultInstance();
+    private ICloud1D _cloudAll = null;
+    private ICloud1D _cloudAbove = null;

 }