diff -u -r1.2 -r1.3
--- HPSAPV25.java	12 Mar 2012 23:00:27 -0000	1.2
+++ HPSAPV25.java	30 Mar 2012 23:54:47 -0000	1.3
@@ -17,7 +17,7 @@

 /**
  *
  * @author Omar Moreno <[log in to unmask]>

- * @version $Id: HPSAPV25.java,v 1.2 2012/03/12 23:00:27 omoreno Exp $

+ * @version $Id: HPSAPV25.java,v 1.3 2012/03/30 23:54:47 omoreno Exp $

  */
 public class HPSAPV25 {
     

@@ -196,13 +196,13 @@

         
         // Loop over all channels and readout the cells which the
         // trigger pointer points to

-        for(int channel = 0; channel < pipelineMap.size(); channel++ ){

+        for(int channelN = 0; channelN < pipelineMap.size(); channelN++ ){

             
             output 

-               = apv25Map.get((int) Math.floor(channel/APV25_CHANNELS));

+               = apv25Map.get((int) Math.floor(channelN/APV25_CHANNELS));

-            output[channel%128 + 12]
-               += (pipelineMap.get(channel).readOut()/APV25_FRONT_END_GAIN)*APV25_MULTIPLEXER_GAIN + analogDCLevel;

+            output[channelN%128 + 12]
+               += (pipelineMap.get(channelN).readOut()/APV25_FRONT_END_GAIN)*APV25_MULTIPLEXER_GAIN + analogDCLevel;

         
         }
         return apv25Map;

@@ -310,7 +310,7 @@

                     // the apv25, however, it will clean up the signal a bit
                     // for simulation purposes
                     // This should be done by the data processing module

-                    if( sample > 0.001 /*(1*noiseRMS/MIP)*APV25_FRONT_END_GAIN)*/) {

+                    if( sample > 0.0001 /*(1*noiseRMS/MIP)*APV25_FRONT_END_GAIN)*/) {

                        analogPipeline.addToCell(cell, sample );
                     }
                 }

@@ -373,7 +373,7 @@

 
                 public  int _trigger_pointer = 0;
                 public int _writer_pointer = 0;

-                int _trigger_latency = 200;

+                int _trigger_latency = 220;

                 
                 int overflow_pos = 0;
            

@@ -522,6 +522,7 @@

                 /**
                  * 
                  */

+                @Override

                 public Iterator<Double> iterator(){ 
                     return new APV25AnalogPipelineIterator( );
                 }

@@ -543,6 +544,7 @@

                     /**
                      * Checks to see if the next element in the buffer exist
                      */

+                    @Override

                     public boolean hasNext( ) {
                         return index < ANALOG_PIPELINE_LENGTH;
                     }

@@ -551,6 +553,7 @@

                     /**
                      * 
                      */

+                    @Override

                     public Double next( ){ 
                         if( !hasNext() ) throw new NoSuchElementException( );
                         return pipeline[index++];

@@ -560,7 +563,8 @@

                     /**
                      * 
                      */

-                    public void remove( ) { 

+                   @Override
+                   public void remove( ) { 

                         throw new UnsupportedOperationException(
                             "Not Supported!");
                     }