Skip to content

Fix: Setting of Ac2106 435 Signal Conditioning Gains and Offsets in a more efficient way, i.e using PyEpics. #2432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
santorofer merged 10 commits into from
Dec 23, 2021
Merged

Fix: Setting of Ac2106 435 Signal Conditioning Gains and Offsets in a more efficient way, i.e using PyEpics. #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
425cc7e
Fix: add new setChanScaleGlobal() to correctly set the global gains a…
santorofer Dec 4, 2021
0af720b
Different approach to setting gains and offsets: no global values
santorofer Dec 7, 2021
f4fe684
Remove def_gains and def_offset from parts values
santorofer Dec 8, 2021
1f0bc64
Change setGainsOffsets to only set when node has a new value
santorofer Dec 9, 2021
12ad410
Improve the change setGainsOffsets to only set when node has a new value
santorofer Dec 9, 2021
b34693b
Add 3 threads for each call to setGainsOffsets() to change the gains …
santorofer Dec 10, 2021
fd6ac70
Using EPICS calls to set all the gains. Ask for the hostname of the ACQ.
santorofer Dec 20, 2021
07867c3
Bring back the setting of offsets, for consistency
santorofer Dec 22, 2021
8b2bfa5
Improved comment on the EPICS PV variable definitions
santorofer Dec 22, 2021
909398c
Remove threading when setting each of the sites' gains
santorofer Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 66 additions & 60 deletions pydevices/HtsDevices/acq2106_435sc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


import MDSplus
import importlib


acq2106_435st = importlib.import_module('acq2106_435st')

class _ACQ2106_435SC(acq2106_435st._ACQ2106_435ST):
Expand All @@ -34,34 +36,6 @@ class _ACQ2106_435SC(acq2106_435st._ACQ2106_435ST):
"""

sc_parts = [
{
# IS_GLOBAL controls if the GAINS and OFFSETS are set globally or per channel
'path': ':IS_GLOBAL',
'type': 'numeric',
'value': 1, # mean, global settings are used in the D-Tacq SC device.
'options': ('no_write_shot',)
},
{
# Global D-Tacq SC GAIN1
'path': ':DEF_GAIN1',
'type': 'numeric',
'value': 1,
'options': ('no_write_shot',)
},
{
# Global D-Tacq SC GAIN2
'path': ':DEF_GAIN2',
'type': 'numeric',
'value': 1,
'options': ('no_write_shot',)
},
{
# Global D-Tacq SC OFFSET
'path': ':DEF_OFFSET',
'type': 'numeric',
'value': 0,
'options': ('no_write_shot',)
},
{
# Resampling factor. This is used during streaming by makeSegmentResampled()
'path': ':RES_FACTOR',
Expand Down Expand Up @@ -89,27 +63,8 @@ def init(self):
"FREQ must be 10000, 20000, 40000, 80000 or 128000; not %d" % (freq,))

for card in self.slots:
if self.is_global.data() == 1:
# Global controls for GAINS and OFFSETS
self.slots[card].SC32_OFFSET_ALL = self.def_offset.data()

if self.debug:
print("Site %s OFFSET ALL %d" % (card, int(self.def_offset.data())))

self.slots[card].SC32_G1_ALL = self.def_gain1.data()

if self.debug:
print("Site %s GAIN 1 ALL %d" % (card, int(self.def_gain1.data())))

self.slots[card].SC32_G2_ALL = self.def_gain2.data()

if self.debug:
print("Site %s GAIN 2 ALL %d" % (card, int(self.def_gain2.data())))
else:
self.setGainsOffsets(card)

self.setGainsOffsets(card)
self.slots[card].SC32_GAIN_COMMIT = 1

if self.debug:
print("GAINs Committed for site %s" % (card,))

Expand All @@ -119,26 +74,76 @@ def init(self):
super(_ACQ2106_435SC, self).init(resampling=True)

INIT=init


def getUUT(self):
import acq400_hapi
uut = acq400_hapi.Acq2106(self.node.data(), monitor=False, has_wr=True)
return uut


def setGainsOffsets(self, card):
import epics
import socket

domainName = socket.gethostbyaddr(str(self.node.data()))[0]
splitDomainName = domainName.split(".")

#For EPICS PV definitions hardcoded in D-Tacq's "/tmp/records.dbl",
# the ACQs DNS hostnames/domain names should be of the format <chassis name> _ <three digits serial number>
if "-" in splitDomainName[0]:
epicsDomainName = splitDomainName[0].replace("-", "_")
else:
epicsDomainName = splitDomainName[0]

for ic in range(1,32+1):
if card == 1:
setattr(self.slots[card], 'SC32_OFFSET_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_OFFSET' % (ic,)).data())
setattr(self.slots[card], 'SC32_G1_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_GAIN1' % (ic,)).data())
setattr(self.slots[card], 'SC32_G2_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_GAIN2' % (ic,)).data())
pvg1 = "{}:{}:SC32:G1:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg1)
valueg1 = str(getattr(self, 'INPUT_%3.3d:SC_GAIN1' % (ic,)).data())
pv.put(valueg1, wait=True)

pvg2 = "{}:{}:SC32:G2:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg2)
valueg2 = str(getattr(self, 'INPUT_%3.3d:SC_GAIN2' % (ic,)).data())
pv.put(valueg2, wait=True)

pvg3 = "{}:{}:SC32:OFFSET:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg3)
valueg3 = str(getattr(self, 'INPUT_%3.3d:SC_OFFSET' % (ic,)).data())
pv.put(valueg3, wait=True)

elif card == 3:
setattr(self.slots[card], 'SC32_OFFSET_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_OFFSET' % (ic+32,)).data())
setattr(self.slots[card], 'SC32_G1_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_GAIN1' % (ic+32,)).data())
setattr(self.slots[card], 'SC32_G2_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_GAIN2' % (ic+32,)).data())
pvg1 = "{}:{}:SC32:G1:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg1)
valueg1 = str(getattr(self, 'INPUT_%3.3d:SC_GAIN1' % (ic+32,)).data())
pv.put(valueg1, wait=True)

pvg2 = "{}:{}:SC32:G2:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg2)
valueg2 = str(getattr(self, 'INPUT_%3.3d:SC_GAIN2' % (ic+32,)).data())
pv.put(valueg2, wait=True)

pvg3 = "{}:{}:SC32:OFFSET:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg3)
valueg3 = str(getattr(self, 'INPUT_%3.3d:SC_OFFSET' % (ic+32,)).data())
pv.put(valueg3, wait=True)

elif card == 5:
setattr(self.slots[card], 'SC32_OFFSET_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_OFFSET' % (ic+64,)).data())
setattr(self.slots[card], 'SC32_G1_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_GAIN1' % (ic+64,)).data())
setattr(self.slots[card], 'SC32_G2_%2.2d' % (ic,), getattr(self, 'INPUT_%3.3d:SC_GAIN2' % (ic+64,)).data())
pvg1 = "{}:{}:SC32:G1:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg1)
valueg1 = str(getattr(self, 'INPUT_%3.3d:SC_GAIN1' % (ic+64,)).data())
pv.put(valueg1, wait=True)

pvg2 = "{}:{}:SC32:G2:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg2)
valueg2 = str(getattr(self, 'INPUT_%3.3d:SC_GAIN2' % (ic+64,)).data())
pv.put(valueg2, wait=True)

pvg3 = "{}:{}:SC32:OFFSET:{:02d}".format(epicsDomainName, card, ic)
pv = epics.PV(pvg3)
valueg3 = str(getattr(self, 'INPUT_%3.3d:SC_OFFSET' % (ic+64,)).data())
pv.put(valueg3, wait=True)

def setChanScale(self, node, num):
#Raw input channel, where the conditioning has been applied:
Expand All @@ -151,6 +156,7 @@ def setChanScale(self, node, num):
MDSplus.SUBTRACT(input_chan.OFFSET, input_chan.SC_OFFSET))
)


def assemble(cls):
cls.parts = list(_ACQ2106_435SC.carrier_parts + _ACQ2106_435SC.sc_parts)
for i in range(cls.sites*32):
Expand Down Expand Up @@ -182,21 +188,21 @@ def assemble(cls):
# Local (per channel) SC gains
'path': ':INPUT_%3.3d:SC_GAIN1' % (i+1,),
'type':'NUMERIC',
'valueExpr':'head.def_gain1',
'value':1,
'options':('no_write_shot',)
},
{
# Local (per channel) SC gains
'path': ':INPUT_%3.3d:SC_GAIN2' % (i+1,),
'type':'NUMERIC',
'valueExpr':'head.def_gain2',
'value':1,
'options':('no_write_shot',)
},
{
# Local (per channel) SC offsets
'path': ':INPUT_%3.3d:SC_OFFSET' % (i+1,),
'type':'NUMERIC',
'valueExpr':'head.def_offset',
'value':0,
'options':('no_write_shot',)
},
{
Expand Down
10 changes: 5 additions & 5 deletions pydevices/HtsDevices/acq2106_435st.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class _ACQ2106_435ST(MDSplus.Device):
{
'path': ':HW_FILTER',
'type': 'numeric',
'value': 0,
'value': 1,
'options': ('no_write_shot',)
},
{
Expand Down Expand Up @@ -495,8 +495,9 @@ def init(self, resampling=False):
for card in self.slots:
self.slots[card].nacc = ('%d' % nacc_samp).strip()
else:
print("WARNING: Hardware Filter samples must be in the range [0,32]. 0 => Disabled == 1")
self.slots[card].nacc = '1'
print("WARNING: Hardware Filter samples must be in the range [1,32]. A value of 0 => Disabled == 1")
for card in self.slots:
self.slots[card].nacc = '1'

self.running.on = True
# If resampling == 1, then resampling is used during streaming:
Expand Down Expand Up @@ -543,8 +544,7 @@ def getUUT(self):

def setChanScale(self, num):
chan = self.__getattr__('INPUT_%3.3d' % num)
chan.setSegmentScale(MDSplus.ADD(MDSplus.MULTIPLY(
chan.COEFFICIENT, MDSplus.dVALUE()), chan.OFFSET))
chan.setSegmentScale(MDSplus.ADD(MDSplus.MULTIPLY(chan.COEFFICIENT, MDSplus.dVALUE()), chan.OFFSET))


def assemble(cls):
Expand Down