diff -u -r1.5 -r1.6
--- TempCalHit.java	27 Jun 2005 21:49:09 -0000	1.5
+++ TempCalHit.java	14 Jan 2006 00:10:11 -0000	1.6
@@ -8,7 +8,7 @@

  * hit information between modifiers.
  *
  * @author Guilherme Lima

- * @version $Id: TempCalHit.java,v 1.5 2005/06/27 21:49:09 lima Exp $

+ * @version $Id: TempCalHit.java,v 1.6 2006/01/14 00:10:11 lima Exp $

  */
 class TempCalHit {
 

@@ -52,6 +52,10 @@

 	return totEnergy;
     }
 

+    /** Scales the global energy.  This changes the energy of each
+     *	contribution by the same factor.
+     * @param factor Applied to each contribution separately
+     */

     public void scaleEnergy(double factor) {
 	for( HitContrib contr : _simHits ) {
 	    contr.scale(factor);

@@ -59,7 +63,7 @@

 	_energy *= factor;
     }
 

-    /** changes global energy.  Actually, this changes the energy of

+    /** Changes global energy.  Actually, this changes the energy of

      *	each contribution by the same factor, so that final energy
      *	gets updated to the value provided.
      * @param energy Final value of total energy

@@ -75,7 +79,7 @@

      *	contribution.
      */
     public void setTime(double time) {

-	// This should be avoid if possible, because it is better to

+	// This should be avoided if possible, because it is better to

 	// set the timing of each contribution separately
 	if(!_warned1) {
 // 	  System.out.println("***** TempCalHit.setTime() called.  Please avoid it.");

@@ -86,7 +90,7 @@

 
     /**
      * Primary time: either earliest time or time from largest contribution.

-     * It is currently set as the tim

+     * It is currently set as the earliest time

      */
     public double getPrimaryTime() {
 	if(_time>0.0) return _time;

@@ -175,6 +179,10 @@

 	return cellIDs;
     }
 

+    public long getChannelID() {
+	return _rawID;
+    }
+

     //===  FIELDS  ===
 
     /** Temp hit id, supposedly the same as channel ID */

diff -u -r1.2 -r1.3
--- DigiSimConditionsConverter.java	7 Dec 2005 18:31:00 -0000	1.2
+++ DigiSimConditionsConverter.java	14 Jan 2006 00:10:11 -0000	1.3
@@ -9,7 +9,7 @@

  * A Class to manage DigiSim configurations under possibly different
  * run conditions.
  * @author Guilherme Lima

- * @version $Id: DigiSimConditionsConverter.java,v 1.2 2005/12/07 18:31:00 lima Exp $

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

  */
 public class DigiSimConditionsConverter implements ConditionsConverter<DigiSimSetup>
 {

@@ -20,8 +20,8 @@

         {
             InputStream in = conditions.getInputStream();
 	    ConfigReader reader = new ConfigReader(in);

-            DigiSimSetup conf = reader.digiSimParse();
-            return conf;

+            DigiSimSetup setup = reader.digiSimParse();
+            return setup;

         }
         catch (Exception x)
         {

diff -u -r1.2 -r1.3
--- ExponentialNoise.java	28 Jun 2005 21:55:39 -0000	1.2
+++ ExponentialNoise.java	14 Jan 2006 00:10:11 -0000	1.3
@@ -13,7 +13,7 @@

  * exponential distribution.
  *
  * @author Guilherme Lima

- * @version $Id: ExponentialNoise.java,v 1.2 2005/06/28 21:55:39 lima Exp $

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

  */
 class ExponentialNoise extends RandomNoise {
 

@@ -21,12 +21,12 @@

     public void init(Vector<Double> params) {
       super.init(params);
 

-      if(_debug>0) {

+       if(_debug>0) {

 	  int i=0;
 	  for( Double x : params ) {
 	      System.out.println(_name+".init(): _par["+(i++)+"] = "+x);
 	  }

-      }

+       }

 
       // decode parameters
       _beta = params.get(5);

diff -u -r1.2 -r1.3
--- GaussianNoise.java	28 Jun 2005 21:55:39 -0000	1.2
+++ GaussianNoise.java	14 Jan 2006 00:10:11 -0000	1.3
@@ -13,7 +13,7 @@

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

- * @version $Id: GaussianNoise.java,v 1.2 2005/06/28 21:55:39 lima Exp $

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

  */
 class GaussianNoise extends RandomNoise {
 

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

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

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

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

 	return gauss;
       }
       catch(MathException x) {