diff -u -r1.9 -r1.10
--- SvtPerformance.java	12 Nov 2013 08:07:19 -0000	1.9
+++ SvtPerformance.java	13 Nov 2013 23:20:49 -0000	1.10
@@ -32,7 +32,7 @@

  * Driver that looks at the performance of the SVT.
  * 
  * @author Omar Moreno <[log in to unmask]>

- * @version $Id: SvtPerformance.java,v 1.9 2013/11/12 08:07:19 omoreno Exp $

+ * @version $Id: SvtPerformance.java,v 1.10 2013/11/13 23:20:49 omoreno Exp $

  */
 public class SvtPerformance extends Driver {
 

@@ -48,9 +48,9 @@

     int plotterIndex = 0;
 
     int eventNumber = 0; 

+    int runNumber = 0; 

     double totalTracks = 0;
     double totalTwoTrackEvents = 0;

-    double idealNoise = 886; // e-

 
     double[] topLayers;
     double[] bottomLayers;

@@ -110,13 +110,23 @@

     /**
      * Set the name of the file to which data will be written.
      * 

-     * @param outputFileName
-     *            : Name of the output file

+     * @param outputFileName: Name of the output file
+     * 

      */
     public void setOutputFileName(String outputFileName){
         this.outputFileName = outputFileName;
     }
 

+    /**
+     * Set the run number
+     * 
+     * @param runNumber 
+     * 
+     */
+    public void setRunNumber(int runNumber){
+    	this.runNumber = runNumber; 
+    }
+    

     protected void detectorChanged(Detector detector) {
 
         this.printDebug("Setting up plots");

@@ -164,16 +174,18 @@

 
                 writer = new BufferedWriter(new FileWriter(outputFile.getAbsoluteFile()));
 

-                writer.write("! event\n");
-                writer.write("! volume\n");
-                writer.write("! layer\n");
-                writer.write("! channel\n");
-                writer.write("! noise\n");
-                writer.write("! cluster_hits\n");
-                writer.write("! bad_channel\n");
-                writer.write("! chi_squared\n");
-                writer.write("! hit_x\n");
-                writer.write("! hit_y\n");

+                writer.write("! run I\n");
+                writer.write("! event I\n");
+                writer.write("! volume I\n");
+                writer.write("! layer I\n");
+                writer.write("! channel I\n");
+                writer.write("! amplitude D\n");
+                writer.write("! noise D\n");
+                writer.write("! cluster_hits I\n");
+                writer.write("! bad_channel I\n");
+                writer.write("! chi_squared D\n");
+                writer.write("! hit_x D\n");
+                writer.write("! hit_y D\n");

                 
             } catch (IOException exception) {
                 exception.printStackTrace();

@@ -258,6 +270,14 @@

                         		|| HPSSVTCalibrationConstants.isBadChannel(sensor, channel-1)){
                         	bad_channel = 1; 
                         }

+                        
+                        /*
+                        if(sensor.getNoise(channel) > 80 
+                        		|| sensor.getNoise(channel+1) > 80 
+                        		|| sensor.getNoise(channel-1) > 80){
+                        	bad_channel = 1; 
+                        }*/
+                        

                         constants = HPSSVTCalibrationConstants.getChannelConstants(sensor, channel);
                         fit = shaperFitter.fitShape(rawHit, constants);
                         if (fit.getAmp() > maxClusterAmplitude) {

@@ -267,7 +287,7 @@

                         if(stripHit.rawhits().size() == 1){
                         	chi_squared = fit.getChiSq();
                         }

-                        noise += Math.pow(constants.getNoise(), 2);

+                        noise += Math.pow(sensor.getNoise(channel), 2);

                         clusterAmplitude += fit.getAmp();
                     }
 

@@ -277,13 +297,13 @@

                         try {
                             if (sensor.isTopLayer()) {
                                 plotTitle = "Top - Layer " + sensor.getLayerNumber() + " - Cluster Charge";

-                                writer.write(eventNumber + " 0 " + sensor.getLayerNumber() + " " + maxClusterChannel + " ");

+                                writer.write(runNumber + " " + eventNumber + " 0 " + sensor.getLayerNumber() + " ");

                             } else {
                                 plotTitle = "Bottom - Layer " + sensor.getLayerNumber() + " - Cluster Charge";

-                                writer.write(eventNumber + " 1 " + sensor.getLayerNumber() + " " + maxClusterChannel + " ");

+                                writer.write(runNumber + " " + eventNumber + " 1 " + sensor.getLayerNumber() + " ");

                             }

-                                writer.write(clusterAmplitude + " " + noise + " " + hitsPerCluster + " " + bad_channel + " " 
-                                			+ chi_squared + " " + hitX + " " + hitY + "\n");

+                                writer.write(maxClusterChannel + " " + clusterAmplitude + " " + noise + " " + hitsPerCluster + " " 
+                                			 + bad_channel + " " + chi_squared + " " + hitX + " " + hitY + "\n");

                         } catch (IOException exception) {
                         	exception.printStackTrace(); 
                         }