Finally cleaned-up channels list
This commit is contained in:
@ -133,8 +133,6 @@ channels_EVR = [
|
|||||||
|
|
||||||
#######################
|
#######################
|
||||||
# Digitizer
|
# Digitizer
|
||||||
|
|
||||||
#Integration limits
|
|
||||||
channels_digitizer =[
|
channels_digitizer =[
|
||||||
"SARES30-LTIM01-EVR0:DUMMY_PV1_NBS",
|
"SARES30-LTIM01-EVR0:DUMMY_PV1_NBS",
|
||||||
"SARES30-LTIM01-EVR0:DUMMY_PV2_NBS",
|
"SARES30-LTIM01-EVR0:DUMMY_PV2_NBS",
|
||||||
@ -149,11 +147,11 @@ channels_digitizer =[
|
|||||||
#######################
|
#######################
|
||||||
# Other BS channels that we sometimes use
|
# Other BS channels that we sometimes use
|
||||||
channels_other = [
|
channels_other = [
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
bs_channels = (
|
bs_channels = (
|
||||||
channels_gas_monitor
|
camera_channels
|
||||||
|
+ channels_gas_monitor
|
||||||
+ channels_PBPS053
|
+ channels_PBPS053
|
||||||
+ channels_PBPS053
|
+ channels_PBPS053
|
||||||
+ channels_PSSS059
|
+ channels_PSSS059
|
||||||
@ -168,9 +166,6 @@ bs_channels = (
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
##########################################################################################################
|
##########################################################################################################
|
||||||
##########################################################################################################
|
##########################################################################################################
|
||||||
##########################################################################################################
|
##########################################################################################################
|
||||||
|
@ -23,6 +23,7 @@ from slic.core.acquisition import SFAcquisition, PVAcquisition
|
|||||||
from slic.core.condition import PVCondition
|
from slic.core.condition import PVCondition
|
||||||
from slic.core.scanner import Scanner
|
from slic.core.scanner import Scanner
|
||||||
from slic.core.device.simpledevice import SimpleDevice
|
from slic.core.device.simpledevice import SimpleDevice
|
||||||
|
from slic.devices.xdiagnostics.intensitymonitor import IntensityMonitorPBPS
|
||||||
|
|
||||||
from slic.devices.general.motor import Motor
|
from slic.devices.general.motor import Motor
|
||||||
from slic.devices.general.shutter import Shutter
|
from slic.devices.general.shutter import Shutter
|
||||||
@ -32,7 +33,7 @@ from slic.utils import Channels, Config, Elog, Screenshot, PV
|
|||||||
from slic.core.acquisition.fakeacquisition import FakeAcquisition
|
from slic.core.acquisition.fakeacquisition import FakeAcquisition
|
||||||
from slic.devices.timing.events import CTASequencer
|
from slic.devices.timing.events import CTASequencer
|
||||||
|
|
||||||
from channels import detectors, channels, pvs
|
from channels import detectors, bs_channels, pvs
|
||||||
from spreadsheet import overview
|
from spreadsheet import overview
|
||||||
from channels_minimal import detectors_min, channels_min, pvs_min
|
from channels_minimal import detectors_min, channels_min, pvs_min
|
||||||
from pp_shutter import PP_Shutter
|
from pp_shutter import PP_Shutter
|
||||||
@ -55,6 +56,20 @@ attenuator = Attenuator("SAROP31-OATA150", description="Cristallina attenuator O
|
|||||||
front_end_attenuator = Attenuator("SARFE10-OATT053", description="Front end attenuator OATT053")
|
front_end_attenuator = Attenuator("SARFE10-OATT053", description="Front end attenuator OATT053")
|
||||||
cta = CTASequencer("SAR-CCTA-ESC")
|
cta = CTASequencer("SAR-CCTA-ESC")
|
||||||
|
|
||||||
|
pbps113 = IntensityMonitorPBPS(
|
||||||
|
"SAROP31-PBPS113",
|
||||||
|
# VME_crate="SAROP11-CVME-PBPS2", # please check this!
|
||||||
|
# link=9,
|
||||||
|
description="Intensity/position monitor in the optics hutch (after first aperture))"
|
||||||
|
)
|
||||||
|
|
||||||
|
pbps149 = IntensityMonitorPBPS(
|
||||||
|
"SAROP31-PBPS149",
|
||||||
|
# VME_crate="SAROP11-CVME-PBPS2", # please check this!
|
||||||
|
# link=9,
|
||||||
|
description="Intensity/position monitor in the optics hutch (after first aperture))"
|
||||||
|
)
|
||||||
|
|
||||||
def test_attenuator():
|
def test_attenuator():
|
||||||
tfundamental = attenuator.get_transmission()
|
tfundamental = attenuator.get_transmission()
|
||||||
try:
|
try:
|
||||||
@ -109,7 +124,7 @@ pgroup = "p20841" # CrQ PMS commisioning 2 (Jan 2023)
|
|||||||
daq = SFAcquisition(
|
daq = SFAcquisition(
|
||||||
instrument,
|
instrument,
|
||||||
pgroup,
|
pgroup,
|
||||||
default_channels=channels ,
|
default_channels=bs_channels ,
|
||||||
default_pvs=pvs,
|
default_pvs=pvs,
|
||||||
default_detectors=detectors,
|
default_detectors=detectors,
|
||||||
rate_multiplicator=1,
|
rate_multiplicator=1,
|
||||||
@ -138,7 +153,7 @@ import daq_client as sf_daq_client
|
|||||||
CTA_sequence_start_PID = PV("SAR-CCTA-ESC:seq0Ctrl-StartedAt-O")
|
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.
|
# Number of pulses to ask from the SFDAQ. This will depend on the CTA sequence.
|
||||||
npulses=10
|
npulses = 22
|
||||||
|
|
||||||
def pulse(run_comment=None):
|
def pulse(run_comment=None):
|
||||||
# Start the CTA sequence
|
# Start the CTA sequence
|
||||||
@ -155,6 +170,7 @@ def pulse(run_comment=None):
|
|||||||
used_detectors = {}
|
used_detectors = {}
|
||||||
else:
|
else:
|
||||||
used_detectors = detectors
|
used_detectors = detectors
|
||||||
|
used_detectors = {"JF16T03V01":{}}
|
||||||
|
|
||||||
# Ask the DAQ client to download the data
|
# Ask the DAQ client to download the data
|
||||||
run_number = sf_daq_client.retrieve_data_from_buffer(pgroup=pgroup, user_tag=run_comment,
|
run_number = sf_daq_client.retrieve_data_from_buffer(pgroup=pgroup, user_tag=run_comment,
|
||||||
|
Reference in New Issue
Block a user