Skip to content

Commit

Permalink
Merge pull request #359 from lnls-sirius/PR-add-pvs-ps-ioc-fap-4p
Browse files Browse the repository at this point in the history
Pr add pvs ps ioc fap 4p
  • Loading branch information
xresende authored Feb 3, 2020
2 parents 1edee73 + 90ca181 commit ce2f431
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 9 deletions.
2 changes: 1 addition & 1 deletion siriuspy/siriuspy/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.0
1.11.0
27 changes: 26 additions & 1 deletion siriuspy/siriuspy/csdevice/pwrsupply.py
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ def _get_ps_FAP_propty_database():
'IntlkIIB-Cte': {'type': 'string',
'count': len(_et.IIB_INTLCK_FAP),
'value': _et.IIB_INTLCK_FAP},
'IIBLeakCurrent-Mon': {'type': 'float', 'value': 0.0,
'IIBLeakCurrent-Mon': {'type': 'float', 'value': 0.0,
'prec': DEFAULT_PS_CURRENT_PRECISION,
'unit': 'A'},
'IIBInductorTemperature-Mon': {'type': 'float', 'value': 0.0,
Expand Down Expand Up @@ -1357,6 +1357,31 @@ def _get_ps_FAP_4P_propty_database():
'count': len(_et.IIB_INTLCK_FAP_4P),
'value': _et.IIB_INTLCK_FAP_4P},

'IIB1InductorTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB1HeatSinkTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB2InductorTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB2HeatSinkTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB3InductorTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB3HeatSinkTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB4InductorTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},
'IIB4HeatSinkTemperature-Mon': {'type': 'float', 'value': 0.0,
'prec': 2,
'unit': 'C'},

}
propty_db.update(db_ps)
return propty_db
Expand Down
31 changes: 24 additions & 7 deletions siriuspy/siriuspy/pwrsupply/psmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,9 @@ class PSModelFAC_DCDC(PSModelFBP):
"""FAC power supply model."""

_variables = {
'WfmSyncPulseCount-Mon': _psbsmp.ConstFAC_DCDC.V_COUNTER_SYNC_PULSE,
'IntlkSoft-Mon': _psbsmp.ConstFAC_DCDC.V_PS_SOFT_INTERLOCKS,
'IntlkHard-Mon': _psbsmp.ConstFAC_DCDC.V_PS_HARD_INTERLOCKS,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFBP.V_COUNTER_SYNC_PULSE,
'Current-RB': _psbsmp.ConstFAC_DCDC.V_PS_SETPOINT,
'CurrentRef-Mon': _psbsmp.ConstFAC_DCDC.V_PS_REFERENCE,
'Current-Mon': _psbsmp.ConstFAC_DCDC.V_I_LOAD_MEAN,
Expand Down Expand Up @@ -372,9 +372,9 @@ class PSModelFAC_2S_DCDC(PSModelFBP):
_variables = {
'Current-RB': _psbsmp.ConstFAC_2S_DCDC.V_PS_SETPOINT,
'CurrentRef-Mon': _psbsmp.ConstFAC_2S_DCDC.V_PS_REFERENCE,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFAC_2S_DCDC.V_COUNTER_SYNC_PULSE,
'IntlkSoft-Mon': _psbsmp.ConstFAC_2S_DCDC.V_PS_SOFT_INTERLOCKS,
'IntlkHard-Mon': _psbsmp.ConstFAC_2S_DCDC.V_PS_HARD_INTERLOCKS,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFBP.V_COUNTER_SYNC_PULSE,
'Current-Mon': _psbsmp.ConstFAC_2S_DCDC.V_I_LOAD_MEAN,
'Current1-Mon': _psbsmp.ConstFAC_2S_DCDC.V_I_LOAD1,
'Current2-Mon': _psbsmp.ConstFAC_2S_DCDC.V_I_LOAD2,
Expand Down Expand Up @@ -422,9 +422,10 @@ class PSModelFAC_2P4S_DCDC(PSModelFAC_DCDC):
_variables = {
'Current-RB': _psbsmp.ConstFAC_2P4S_DCDC.V_PS_SETPOINT,
'CurrentRef-Mon': _psbsmp.ConstFAC_2P4S_DCDC.V_PS_REFERENCE,
'WfmSyncPulseCount-Mon':
_psbsmp.ConstFAC_2P4S_DCDC.V_COUNTER_SYNC_PULSE,
'IntlkSoft-Mon': _psbsmp.ConstFAC_2P4S_DCDC.V_PS_SOFT_INTERLOCKS,
'IntlkHard-Mon': _psbsmp.ConstFAC_2P4S_DCDC.V_PS_HARD_INTERLOCKS,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFBP.V_COUNTER_SYNC_PULSE,
'Current-Mon': _psbsmp.ConstFAC_2P4S_DCDC.V_I_LOAD_MEAN,
'Current1-Mon': _psbsmp.ConstFAC_2P4S_DCDC.V_I_LOAD1,
'Current2-Mon': _psbsmp.ConstFAC_2P4S_DCDC.V_I_LOAD2,
Expand Down Expand Up @@ -525,18 +526,18 @@ class PSModelFAP(PSModelFBP):
"""FAP power supply model."""

_variables = {
'WfmSyncPulseCount-Mon': _psbsmp.ConstFAP.V_COUNTER_SYNC_PULSE,
'IntlkSoft-Mon': _psbsmp.ConstFAP.V_PS_SOFT_INTERLOCKS,
'IntlkHard-Mon': _psbsmp.ConstFAP.V_PS_HARD_INTERLOCKS,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFBP.V_COUNTER_SYNC_PULSE,
'IntlkIIB-Mon': _psbsmp.ConstFAP.V_IIB_INTERLOCKS,
'Current-RB': _psbsmp.ConstFAP.V_PS_SETPOINT,
'CurrentRef-Mon': _psbsmp.ConstFAP.V_PS_REFERENCE,
'Current-Mon': _psbsmp.ConstFAP.V_I_LOAD_MEAN,
'Current1-Mon': _psbsmp.ConstFAP.V_I_LOAD1,
'Current2-Mon': _psbsmp.ConstFAP.V_I_LOAD2,
'IIBLeakCurrent-Mon': _psbsmp.ConstFAP.V_I_LEAKAGE_IIB,
'IIBInductorTemperature-Mon': _psbsmp.ConstFAP.V_TEMP_INDUCTOR_IIB,
'IIBHeatSinkTemperature-Mon': _psbsmp.ConstFAP.V_TEMP_HEATSINK_IIB,
'IIBLeakCurrent-Mon': _psbsmp.ConstFAP.V_I_LEAKAGE_IIB,
}

@property
Expand All @@ -559,9 +560,9 @@ class PSModelFAP_4P(PSModelFBP):
"""FAP_4P power supply model."""

_variables = {
'WfmSyncPulseCount-Mon': _psbsmp.ConstFAP_4P.V_COUNTER_SYNC_PULSE,
'IntlkSoft-Mon': _psbsmp.ConstFAP_4P.V_PS_SOFT_INTERLOCKS,
'IntlkHard-Mon': _psbsmp.ConstFAP_4P.V_PS_HARD_INTERLOCKS,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFBP.V_COUNTER_SYNC_PULSE,
'Intlk1IIB-Mon': _psbsmp.ConstFAP_4P.V_IIB_INTERLOCKS_1,
'Intlk2IIB-Mon': _psbsmp.ConstFAP_4P.V_IIB_INTERLOCKS_2,
'Intlk3IIB-Mon': _psbsmp.ConstFAP_4P.V_IIB_INTERLOCKS_3,
Expand All @@ -579,6 +580,22 @@ class PSModelFAP_4P(PSModelFBP):
'Mod2Current-Mon': _psbsmp.ConstFAP_4P.V_I_MOD_2,
'Mod3Current-Mon': _psbsmp.ConstFAP_4P.V_I_MOD_3,
'Mod4Current-Mon': _psbsmp.ConstFAP_4P.V_I_MOD_4,
'IIB1InductorTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_INDUCTOR_IIB_1,
'IIB1HeatSinkTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_HEATSINK_IIB_1,
'IIB2InductorTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_INDUCTOR_IIB_2,
'IIB2HeatSinkTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_HEATSINK_IIB_2,
'IIB3InductorTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_INDUCTOR_IIB_3,
'IIB3HeatSinkTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_HEATSINK_IIB_3,
'IIB4InductorTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_INDUCTOR_IIB_4,
'IIB4HeatSinkTemperature-Mon':
_psbsmp.ConstFAP_4P.V_TEMP_HEATSINK_IIB_4,
}

@property
Expand All @@ -601,9 +618,9 @@ class PSModelFAP_2P2S(PSModelFBP):
"""FAP_2P2S power supply model."""

_variables = {
'WfmSyncPulseCount-Mon': _psbsmp.ConstFAP_2P2S.V_COUNTER_SYNC_PULSE,
'IntlkSoft-Mon': _psbsmp.ConstFAP_2P2S.V_PS_SOFT_INTERLOCKS,
'IntlkHard-Mon': _psbsmp.ConstFAP_2P2S.V_PS_HARD_INTERLOCKS,
'WfmSyncPulseCount-Mon': _psbsmp.ConstFBP.V_COUNTER_SYNC_PULSE,
'Current-RB': _psbsmp.ConstFAP_2P2S.V_PS_SETPOINT,
'CurrentRef-Mon': _psbsmp.ConstFAP_2P2S.V_PS_REFERENCE,
'Current-Mon': _psbsmp.ConstFAP_2P2S.V_I_LOAD_MEAN,
Expand Down

0 comments on commit ce2f431

Please sign in to comment.