Channel list cleanup and split to bs_channels and pv_channels

cristallina.py

@@ -33,7 +33,8 @@ from slic.utils import Channels, Config, Elog, Screenshot, PV
 from slic.core.acquisition.fakeacquisition import FakeAcquisition
 from slic.devices.timing.events import CTASequencer 
 
-from channels import detectors, bs_channels, pvs
+from bs_channels import detectors, bs_channels
+from pv_channels import pvs
 from spreadsheet import overview
 from channels_minimal import detectors_min, channels_min, pvs_min
 from pp_shutter import PP_Shutter
@@ -157,7 +158,7 @@ import daq_client as sf_daq_client
 CTA_sequence_start_PID = PV("SAR-CCTA-ESC:seq0Ctrl-StartedAt-O")
 
 # Number of pulses to ask from the SFDAQ. This will depend on the CTA sequence.
-npulses = 22
+# npulses = 100
 
 def pulse(run_comment=None):
     # Start the CTA sequence
@@ -176,11 +177,12 @@ def pulse(run_comment=None):
         used_detectors = detectors
         used_detectors = {"JF16T03V01":{}}
 
+    # TODO: change to SFAcquisition.retrieve(...) from slic
     # Ask the DAQ client to download the data
     run_number = sf_daq_client.retrieve_data_from_buffer(pgroup=pgroup, user_tag=run_comment,
-                              camera_channels=[], bsread_channels=channels, epics_channels=pvs,
+                              camera_channels=[], bsread_channels=bs_channels, epics_channels=pvs,
                               detectors=used_detectors,
-                              start_pulseid=start_PID, stop_pulseid=start_PID+npulses,
+                              start_pulseid=start_PID-90, stop_pulseid=start_PID+20,
                               rate_multiplicator=1,
                             )
     print('\n')