java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots

--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java	2014-07-29 18:45:13 UTC (rev 826)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalDaqPlots.java	2014-07-29 19:06:35 UTC (rev 827)
@@ -18,7 +18,7 @@

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 /*Conditions system imports*/

-import org.hps.conditions.DatabaseConditionsManager;

+//import org.hps.conditions.DatabaseConditionsManager;

 import org.hps.conditions.DefaultTestSetup;
 import org.hps.conditions.TableConstants;
 

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

     
     private EcalConditions conditions;
     private EcalChannel.EcalChannelCollection channels;

-    private DatabaseConditionsManager manager;

+    //private DatabaseConditionsManager manager;

     //private ConditionsManager manager;
     public EcalDaqPlots() {

-    	manager = DatabaseConditionsManager.getInstance();

+    	//manager = DatabaseConditionsManager.getInstance();

     	//manager = ConditionsManager.defaultInstance();
     }
 

@@ -84,8 +84,8 @@

         
         
     	/*Setup the conditions system*/

-        conditions=manager.getConditionsData(EcalConditions.class,TableConstants.ECAL_CONDITIONS);
-        channels = conditions.getChannelCollection(); 

+        //conditions=manager.getConditionsData(EcalConditions.class,TableConstants.ECAL_CONDITIONS);
+        //channels = conditions.getChannelCollection(); 

 
     	 // Get the channel information from the database.                
         //channels = manager.getCachedConditions(EcalChannel.EcalChannelCollection.class, "ecal_channels").getCachedData();