diff --git a/config/devices.properties b/config/devices.properties index 1994f88..f1290d2 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -11,3 +11,5 @@ PassEnergy=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:PASS_ENERGY_RBV|| ElementSet=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:ELEMENT_SET_RBV||| StepSize=ch.psi.pshell.epics.ChannelDouble|NAPP-SCIENTA:cam1:STEP_SIZE_RBV||| NumIterations=ch.psi.pshell.epics.ChannelDouble|NAPP-SCIENTA:cam1:NumExposures_RBV||| +EntranceSlit=ch.psi.pshell.epics.ChannelDouble|X07DB-OP-SH1:TR1||| +ExitSlit=ch.psi.pshell.epics.ChannelDouble|X07DB-OP-SH2:TR1||| diff --git a/config/variables.properties b/config/variables.properties index 92e3b89..cfae221 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Jan 21 11:27:16 CET 2020 -FileSequentialNumber=0 +#Tue Feb 25 08:06:21 CET 2020 +FileSequentialNumber=8 diff --git a/script/local.py b/script/local.py index 0125d4f..a5015cd 100644 --- a/script/local.py +++ b/script/local.py @@ -21,7 +21,10 @@ diag_channels.append(scienta.numSlices) diag_channels.append(scienta.numChannels) diag_channels.append(scienta.lowEnergy) diag_channels.append(scienta.centerEnergy) -diag_channels.append(scienta.highEnergy) +diag_channels.append(scienta.highEnergy) +diag_channels.append(scienta.stepTime) +diag_channels.append(scienta.frames) + diag_channels.append(AcquisitionMode) diag_channels.append(EnergyMode) @@ -32,6 +35,9 @@ diag_channels.append(ElementSet) diag_channels.append(StepSize) diag_channels.append(NumIterations) +diag_channels.append(EntranceSlit) +diag_channels.append(ExitSlit) + diag_channels = sorted(diag_channels, key=lambda channel: channel.name) def get_diag_name(diag):