diff --git a/config/config.properties b/config/config.properties index 5656188c..eed431ea 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Wed Nov 10 15:34:29 CET 2021 +#Tue Nov 23 15:01:22 CET 2021 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -26,7 +26,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index e34545f1..fb1db193 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Wed Nov 10 15:34:29 CET 2021 -pgroup=p17274 +#Tue Nov 23 17:00:29 CET 2021 +pgroup=p19371 proposal= -proposer=bl-dev +proposer=heinrich_m prefix= -sample= -authors= +sample=VA2122 - sample 2 - reversed +authors=Martin Heinrich diff --git a/config/variables.properties b/config/variables.properties index 8858c46b..ee4347be 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Tue Nov 16 11:07:28 CET 2021 -LastRunDate=211116 -FileSequentialNumber=10033 -DaySequentialNumber=11 +#Tue Nov 23 17:28:28 CET 2021 +LastRunDate=211123 +FileSequentialNumber=10077 +DaySequentialNumber=5 diff --git a/devices/ps1img.properties b/devices/ps1img.properties index 43ad0380..f8b72c64 100644 --- a/devices/ps1img.properties +++ b/devices/ps1img.properties @@ -1,4 +1,4 @@ -#Wed Nov 17 19:10:29 CET 2021 +#Thu Nov 18 10:18:06 CET 2021 spatialCalOffsetY=NaN spatialCalOffsetX=NaN dataPolling=500 @@ -8,7 +8,7 @@ scale=1.0 grayscale=false spatialCalScaleX=NaN spatialCalScaleY=NaN -colormapMax=255.0 +colormapMax=4096.0 rescaleOffset=0.0 roiWidth=-1 colormap=Grayscale diff --git a/script/keithley.py b/script/keithley.py index 5f734ce0..0a82b3a4 100644 --- a/script/keithley.py +++ b/script/keithley.py @@ -13,6 +13,7 @@ class Keithley(object): self.triggered = False self.base_channel = base_channel self.base_name = base_name + self.usermodeCh = None self.rangeCh = None self.scanCh = None self.ttypeCh = None @@ -23,8 +24,12 @@ class Keithley(object): self.dotriggerCh = None self.dofetchCh = None self.readoutCh = None + self.invertreadoutCh = None + self.setvoltageCh = None + self.voltoutCh = None def initialize(self): + self.usermodeCh = epics.ChannelString(self.base_name + "UserMode", self.base_channel + "USER_MODE") self.rangeCh = epics.ChannelInteger(self.base_name + "Range", self.base_channel + "RANGE") self.scanCh = epics.ChannelInteger(self.base_name + "Scan", self.base_channel + "READSCAN.SCAN") self.ttypeCh = epics.ChannelInteger(self.base_name + "TType", self.base_channel + "TTYPE") @@ -35,13 +40,16 @@ class Keithley(object): self.dotriggerCh = epics.ChannelInteger(self.base_name + "DoTrigger", self.base_channel + "DOTRIGGER") self.dofetchCh = epics.ChannelInteger(self.base_name + "DoFetch", self.base_channel + "DOFETCH") self.readoutCh = epics.ChannelDouble(self.base_name + "Readout", self.base_channel + "READOUT") + self.invertreadoutCh = epics.ChannelInteger(self.base_name + "InvertReadout", self.base_channel + "INVERTREADOUT") + self.setvoltageCh = epics.ChannelDouble(self.base_name + "SetVoltage", self.base_channel + "SETVOLTAGE") + self.voltoutCh = epics.ChannelInteger(self.base_name + "VoltOut", self.base_channel + "VOLTOUT") # DOZCHOFF # ZCH_SP # DOCURRENT # DORESET # DOSETDEFAULT - # USER_MODE + self.usermodeCh.initialize() self.rangeCh.initialize() self.scanCh.initialize() self.ttypeCh.initialize() @@ -52,6 +60,9 @@ class Keithley(object): self.dotriggerCh.initialize() self.dofetchCh.initialize() self.readoutCh.initialize() + self.invertreadoutCh.initialize() + self.setvoltageCh.initialize() + self.voltoutCh.initialize() def setup(): """ diff --git a/script/local.py b/script/local.py index d59381c2..585f31a5 100644 --- a/script/local.py +++ b/script/local.py @@ -283,7 +283,22 @@ if get_device("ManipulatorCoolFlowSet"): diag_channels.append(ManipulatorCoolFlowSet) diag_channels.append(MonoGrating) +snap_channels = [] +snap_channels.append(KeiSample.rangeCh) +snap_channels.append(KeiSample.usermodeCh) +snap_channels.append(KeiSample.tottimeCh) +snap_channels.append(KeiSample.setvoltageCh) +snap_channels.append(KeiSample.voltoutCh) +snap_channels.append(KeiSample.invertreadoutCh) +snap_channels.append(KeiReference.rangeCh) +snap_channels.append(KeiReference.usermodeCh) +snap_channels.append(KeiReference.tottimeCh) +snap_channels.append(KeiReference.setvoltageCh) +snap_channels.append(KeiReference.voltoutCh) +snap_channels.append(KeiReference.invertreadoutCh) + diag_channels = sorted(diag_channels, key=lambda channel: channel.name) +snap_channels = sorted(snap_channels, key=lambda channel: channel.name) def get_diag_name(diag): return ch.psi.utils.Str.toTitleCase(diag.getName()).replace(" ", "").replace("Readback", "") diff --git a/script/otf.py b/script/otf.py index 9708fea2..64fdcd72 100644 --- a/script/otf.py +++ b/script/otf.py @@ -24,7 +24,7 @@ else: raise Exception("Invalid energy") wait_beam() -sensors = SampleCurrent, RefCurrent, MonoBeta, MonoTheta, MonoEnergy +sensors = SampleCurrent, RefCurrent, MonoBeta, MonoTheta, MonoEnergy, MonoCff #dev_run='ca://X03DA-OTF:RUN?monitored=true&type=d' #dev_sts='ca://X03DA-OTF:STATUS?monitored=true&type=d'