re-wrote DIA counter, separated pedestal code (needs work still), also added DB Counter to alvra script

alvra.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 from slic.controls import PV
-from slic.daq import BSCounter, DIACounter
+from slic.daq import BSCounter, DBCounter, DIACounter
 from slic.scans import Scanner
 from slic.utils import Channels, Config, Elog, Screenshot
 from slic.checkers import PVChecker
@@ -20,13 +20,17 @@ elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="sup
 screenshot = Screenshot(cfg.screenshot_directory)
 
 
+#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
+fn_channels = "./slickits/alvra/config/channel_list"
+channels = Channels(fn_channels)
+
+
 check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=-100, vmax=300, wait_time=3)
 
 bsdaqJF = DIACounter(#TODO: gain and pedestal?
     instrument="alvra",
-    api_address="http://sf-daq-alvra:10000",
-    jf_name="JF_4.5M",
-    pgroup=cfg.pgroup
+    pgroup=cfg.pgroup,
+    default_channels=channels
 )
 
 scansJF = Scanner(
@@ -39,10 +43,6 @@ scansJF = Scanner(
 )
 
 
-#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
-fn_channels = "./slickits/alvra/config/channel_list"
-channels = Channels(fn_channels)
-
 bsdaq = BSCounter(channels)
 
 scansBSreadLocal = Scanner(
@@ -55,6 +55,9 @@ scansBSreadLocal = Scanner(
 )
 
 
+bsdaqDB = DBCounter(channels)
+
+
 
 #TODO: just some generic examples:
 from slic.devices.device import Device