diff -u -r1.21 -r1.22
--- HPSSVTCalibrationConstants.java	21 Nov 2012 08:33:18 -0000	1.21
+++ HPSSVTCalibrationConstants.java	18 Dec 2012 19:53:07 -0000	1.22
@@ -14,7 +14,7 @@

 /**
  *
  * @author Mathew Graham <[log in to unmask]>

- * $Id: HPSSVTCalibrationConstants.java,v 1.21 2012/11/21 08:33:18 omoreno Exp $

+ * $Id: HPSSVTCalibrationConstants.java,v 1.22 2012/12/18 19:53:07 omoreno Exp $

  */
 public class HPSSVTCalibrationConstants {
 

@@ -191,6 +191,12 @@

         // Clear the previously loaded bad channels
         badChannelMap.clear();
         System.out.println("Loading the SVT bad channels for run " + runNumber);

+        
+        // If the calibrations are ideal (run < 0) don't load any bad channels
+        if (runNumber < 0) {
+            System.out.println("Running using ideal SVT calibrations. Bad channels will not be loaded.");
+            return;
+        }

 
         ConditionsManager conditions = ConditionsManager.defaultInstance();
         BufferedReader reader;

@@ -203,11 +209,8 @@

         } catch (IOException exception) {
             throw new RuntimeException("Unable to load bad channels for list " + filePath, exception);
         }

-

+        

         // Load the bad channels for the specified run number

-        if (runNumber < 0) {
-            return;
-        }

         filePath = "daqmap/svt" + runNumber + ".badchannels";
         try {
             reader = new BufferedReader(conditions.getRawConditions(filePath).getReader());