Skip to content

Commit

Permalink
Added the ion chamber window file, and made ion chamber counts not us…
Browse files Browse the repository at this point in the history
…e auto monitor.
  • Loading branch information
Sector 25 ID-C User committed Nov 14, 2023
1 parent 4816d6e commit 5dccc2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 1 addition & 4 deletions src/firefly/ion_chamber.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import warnings

import haven
from firefly import display


class IonChamberDisplay(display.FireflyDisplay):

"""A GUI window for changing settings in an ion chamber."""
def ui_filename(self):
return "ion_chamber.ui"
5 changes: 3 additions & 2 deletions src/haven/instrument/ion_chamber.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,12 @@ class IonChamber(ScalerTriggered, Device, flyers.FlyerInterface):
)
# Signal chain devices
preamp = FCpt(IonChamberPreAmplifier, "{preamp_prefix}")
voltmeter = FCpt(Voltmeter, "{voltmeter_prefix}")
voltmeter = FCpt(Voltmeter, "{voltmeter_prefix}", kind=Kind.hinted)
# Measurement signals
volts: OphydObject = Cpt(VoltageSignal, derived_from="counts", kind=Kind.normal)
amps: OphydObject = Cpt(CurrentSignal, derived_from="volts", kind=Kind.hinted)
counts: OphydObject = FCpt(
EpicsSignalRO, "{scaler_prefix}:scaler1.S{ch_num}", kind=Kind.normal
EpicsSignalRO, "{scaler_prefix}:scaler1.S{ch_num}", kind=Kind.normal, auto_monitor=False,
)
gate: OphydObject = FCpt(
EpicsSignal,
Expand Down Expand Up @@ -396,6 +396,7 @@ class IonChamber(ScalerTriggered, Device, flyers.FlyerInterface):
"volts",
"exposure_time",
"net_counts",
"voltmeter",
]

def __init__(
Expand Down

0 comments on commit 5dccc2e

Please sign in to comment.