added some example config files, cleaned up things a bit

alvra.py

@@ -5,21 +5,21 @@ from slic.daq import BS, DIA, Scanner
 from slic.utils import Channels, Config, Elog, Screenshot
 from slic.checkers import PVChecker
 
-from slic.devices.device import Device
-
 from alvra_devices import *
 from alvra_adhoc import *
 
 
-cfg = Config("/sf/alvra/config/exp/current_experiment.json")
+#fn_cfg = "/sf/alvra/config/exp/current_experiment.json"
+fn_cfg = "./slickits/alvra/config.json"
+cfg = Config(fn_cfg)
 
-elog = Elog(cfg.elog_url, cfg.user, cfg.screenshot_directory)
+elog = Elog(cfg.elog_url, cfg.screenshot_directory, user=cfg.user, password="supercorrect") #TODO: remove fake password
 screenshot = Screenshot(cfg.screenshot_directory)
 
 
 check_intensity = PVChecker("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=100, vmax=300, wait_time=3)
 
-bsdaqJF = DIA(
+bsdaqJF = DIA(#TODO: gain and pedestal?
     api_address="http://sf-daq-alvra:10000",
     jf_name="JF_4.5M",
     pgroup=cfg.pgroup
@@ -30,22 +30,28 @@ scansJF = Scanner(
     scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
     default_counters=[bsdaqJF],
     checker=check_intensity,
-    scan_directories=True,
+    scan_directories=True
 )
 
 
-channels = Channels("/sf/alvra/config/com/channel_lists/default_channel_list")
+#fn_channels = "/sf/alvra/config/com/channel_lists/default_channel_list"
+fn_channels = "./slickits/alvra/channel_list"
+channels = Channels(fn_channels)
 
 bsdaq = BS(channels, default_file_path="???")
 
 scansBSreadLocal = Scanner(
-    data_base_dir="/sf/alvra/config/com/data/scan_data",
-    scan_info_dir="/sf/alvra/config/com/data/scan_info",
+    data_base_dir="/sf/alvra/data/{}/res/scan_data".format(cfg.pgroup),
+    scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
     default_counters=[bsdaq],
+    scan_directories=True
 )
 
 
 
+#TODO: just some generic examples:
+from slic.devices.device import Device
+
 shut_und = Device(
     "SARFE10-OPSH044",
     description="Photon shutter after Undulator"
@@ -62,14 +68,3 @@ print(pbps_und)
 
 
 
-
-
-
-
-
-
-
-
-
-
-