detector configs; CTA stuff; Huber positions

alvra.py

@@ -5,7 +5,9 @@ from slic.core.acquisition import SFAcquisition
 #from slic.core.acquisition.bschannels import BSChannels
 from slic.core.scanner import Scanner
 from slic.core.acquisition import BSChannels, PVChannels, DetectorConfig
+from slic.core.acquisition.fakeacquisition import FakeAcquisition
 from slic.core.adjustable import DummyAdjustable
+from slic.core.sensor import PVSensor
 from slic.utils import Config, Elog, Screenshot, load_channels
 from slic.core.condition import PVCondition
 from slic.gui import GUI
@@ -57,9 +59,17 @@ pvs       = PVChannels.from_file(fn_pvs)
 detectors_raw = DetectorConfig("JF06T32V02", "JF02T09V03")
 
 detectors_config = DetectorConfig()
-#detectors_config.add("JF06T32V02")
+
-#detectors_config.add("JF06T08V02")
+#detectors_config.add("JF06T32V02", remove_raw_files=True)
-detectors_config.add("JF02T09V03", disabled_modules=[0, 1, 2, 3, 5, 6, 7], remove_raw_files=True)
+#detectors_config.add("JF06T32V03")
+
+#detectors_config.add("JF06T08V03")
+detectors_config.add("JF06T08V03", adc_to_energy=True, compression=True, crystfel_lists_laser=True, double_pixels_action='mask', factor=0.25, remove_raw_files=True)
+
+#detectors_config.add("JF02T09V03", disabled_modules=[0, 3, 4, 7, 8], remove_raw_files=True)
+#detectors_config.add("JF02T09V03")
+#detectors_config.add("JF02T09V03", adc_to_energy=True, geometry=True, roi={'Cr2UP':[290, 320, 2800, 3500], 'Cr2DW':[200, 230, 2800, 3500]})
+
 
 
 #detectors = None
@@ -70,16 +80,17 @@ detectors = detectors_config
 #check_intensity = PVCondition("SARFE10-PBPG050:HAMP-INTENSITY-CAL", vmin=0, vmax=1500, wait_time=0.25, required_fraction=0.8)#
 check_intensity = PVCondition("SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-US", vmin=0, vmax=2000, wait_time=0.5, required_fraction=0.8)
 #check_intensity = PVCondition("SARFE10-PBPS053:INTENSITY", vmin=0.05,vmax=2, wait_time=0.5, required_fraction=0.8)
-#check_intensity = PVCondition("SAROP11-PBPS110:INTENSITY", vmin=0.05,vmax=5, wait_time=0.5, required_fraction=0.8)
+#check_intensity = PVCondition("SAROP11-PBPS110:INTENSITY", vmin=0.05,vmax=20, wait_time=0.5, required_fraction=0.8)
 #check_intensity = PVCondition("SAROP11-PBPS122:INTENSITY", vmin=0.1,vmax=10, wait_time=0.5, required_fraction=0.8)
 
-daq = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=list(pvs), default_detectors=detectors, append_user_tag_to_data_dir=True)
+daq = SFAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=list(pvs), default_detectors=detectors, append_user_tag_to_data_dir=True, rate_multiplicator=1)
 
 scan = Scanner(
     scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
 #    scan_info_dir="./",
     default_acquisitions=[daq],
     condition=check_intensity,
+    default_sensor=None
 )
 
 gui = GUI(scan, show_spec=True, show_goto=True, show_run=True)
@@ -100,6 +111,21 @@ scansJF = Deprecator("scansJF", "scan")
 #)
 
 
+
+from CTAstuff import CCAcquisition, ccta
+
+ccdaq = CCAcquisition(cfg.instrument, cfg.pgroup, default_channels=channels, default_pvs=list(pvs), default_detectors=detectors, append_user_tag_to_data_dir=True)
+
+ccscan = Scanner(
+    scan_info_dir="/sf/alvra/data/{}/res/scan_info".format(cfg.pgroup),
+    default_acquisitions=[ccdaq],
+    condition=check_intensity,
+)
+
+ccgui = GUI(ccscan, show_spec=True, show_goto=True, show_run=True)
+
+
+
 dummy = DummyAdjustable("A Dummy Adjustable")
 
 
@@ -129,7 +155,8 @@ def SiN():
 
 @as_shortcut
 def ThinYAG():
-    huber_pos(16.6, -2.5, 0)
+    huber_pos(16.6, -2.5, 0)  #center hole
+    #huber_pos(15, 4, 0)        #side hole
 
 @as_shortcut
 def FrostedYAG():
@@ -137,11 +164,11 @@ def FrostedYAG():
 
 @as_shortcut
 def KnifeEdgeX():
-    huber_pos(-9.3, 9, 2.5, att=1e-5)
+    huber_pos(-9.3, 9, 0, att=1e-5)
 
 @as_shortcut
 def KnifeEdgeY():
-    huber_pos(-6, 14, 2.5, att=1e-5)
+    huber_pos(-6, 14, 0, att=1e-5)
 
 #@as_shortcut
 #def JetYAG():