Commit graph

626 commits

Author SHA1 Message Date
Stephan I. Böttcher
e5e1bd6d91 hetept: VERSION=9.90 2024-02-27 17:06:50 +01:00
Stephan I. Böttcher
bc734a8248 EPT L3 Remove patch code for 9.3.
git diff 6c88a222^! solo/hetept/l3/ept.l3 | patch -R -p1

(n.b., previous commit was about patch 9.1 _HET_ L3, not EPR)
2024-02-27 16:23:53 +01:00
Stephan I. Böttcher
f3f2d50e58 ept L3: reapply patch 9.1 as baseline code 2024-02-27 16:17:15 +01:00
Stephan I. Böttcher
66daf02274 Revert "het L3: patch 9.1 to master"
This reverts commit 76c61fb9d9.

Patch 9.3 (not the misnamed 9.4 OH patch below) was never uploaded
to the spacecraft.  This patch hardwires both 9.1 and 9.3 into the
main code.  To obtain a reference for the configuration as flown
for the last few years, this change will here be reverted, and
afterwards 9.1 will be applied again.
2024-02-27 16:08:31 +01:00
Stephan I. Böttcher
983da039f7 hetept: VERSION=10 2024-02-26 13:53:24 +01:00
Stephan I. Böttcher
76c61fb9d9 het L3: patch 9.1 to master
incorporate the HET L3 changes from 9.1 to the main table
2024-02-26 13:49:02 +01:00
Stephan I. Böttcher
105a44f7c3 hetept l1l2: patch 9.2 to master
incorporate the EPT L2 trigger changes from 9.2 into the main table.
2024-02-26 13:25:30 +01:00
Stephan I. Böttcher
9d922f2e7c hetept ppss: patch 3 opheater changes
incorporate the op heater changes from patch 9.3 into the main config
2024-02-26 13:19:56 +01:00
Stephan I. Böttcher
df6eb79650 Merge branch 'hetept_v9_patches' 2024-02-26 12:30:08 +01:00
Stephan I. Böttcher
26b987267b hetept L3 gold with patchlevel=3 2024-02-26 10:59:57 +01:00
Stephan I. Böttcher
c1a96f7bea hetept L3 gold files update to old master code 2024-02-26 10:00:41 +01:00
Stephan Boettcher
855d6961a5 step_config_fs_v0009.defs: make 9/0 identical to 9/1 2022-12-06 22:34:18 +01:00
Stephan I. Böttcher
5aaa426c3d step_config_fs_v0009: export a real defs 2022-12-06 22:20:00 +01:00
Stephan Boettcher
2c1a7db78a step v9: patch the v8 defs 2022-12-06 20:57:23 +01:00
Stephan I. Böttcher
bd0f2e73ff step patch 8.3: erroneously tagged v9 in scratch
copy the v0008 defs to v0009
2022-06-14 09:28:32 +02:00
Stephan I. Böttcher
779b266a93 step_config_fs_v0008_patch3: add bit for readout of the deadtime register 2022-05-10 21:23:51 +02:00
Stephan I. Böttcher
1affdd7a0f step patch 8.3: reset counters after readout, at 60s cadence
Add flags to the HK counter readouts in the PPSS table, for the patch to
find them.

The patch copies the modulus (cadence) from the ICU counter read to the
HK counter reads, 60s replacing the 600s cadence.

The ICU counter reads gain a clear=True flag, i.e., address bit 0x80.

All counter reads happen in second 0.  HK first, ICU later.  16
counters each from 0x00 and 0x30.

This patch adds 8 bps to the STEP telemetry.
2022-05-07 22:06:48 +02:00
Stephan I. Böttcher
c2498e0a8d step v9.2 add interleaved small pixel mode
The PPSS gains six entries to overwrite the IX thresholds to enable
the small pixels at a selected cadences.

Enable with `table.ppss.interleaved_small(msg, 5)` to readout small
pixels in second 2 of each 5s interval.

The µs incr between IX config commands has been significantly reduced to
make space for the extra threshold writes.  Please test!
2022-04-11 13:58:35 +02:00
Stephan I. Böttcher
65c120725a hetept_config_opheater_patch4: add .revert() 2022-01-25 23:39:25 +01:00
Stephan I. Böttcher
a4b68dec65 patch: .revert() 2022-01-25 23:38:08 +01:00
Stephan I. Böttcher
c01ddc1a09 hetept_config_opheater_patch4: T_he2=-1°C, DC_ESTIMATE=60%, DCMAX=70% 2022-01-25 23:09:49 +01:00
Stephan I. Böttcher
c68aaaea6e Merge branch 'hetept_v9_patches'
HET/EPT patches 9.1, 9.2, 9.3 and 9.4 are merged.
Next: persist the changes in the code proper for version 10.
2022-01-25 22:54:32 +01:00
Stephan I. Böttcher
aeb11df9d2 hetept.ppss.set_opheater_setpoint(): fix info message 2022-01-25 21:15:19 +01:00
Stephan I. Böttcher
cd6eb3bf91 hetept patch 9.4 xml 2022-01-21 13:06:25 +01:00
Stephan I. Böttcher
400ec64f89 HET/EPT patch 9.4: activate OP heaters
Directly patch the parameters in the PPSS entry that triggeres the OP
heater once per minute.

Due to the nonlinearity of the regulator we can alway roughly assume we
heat with DC=70%.  We need to adjust the setpoint with a correspondig
offset.  This offset depends on the gain.  The default gain is
`shift=0`.  The DC will be ADC-setpoint.  A shift of 1, 2, or 3 will
reduce the DC by a power of two, i.e.,

  DC = (ADC - setpoint) >> shift

This patch keeps shift=0.

The target temperatures are

  HET/EPT1: -6.0°C
  HET/EPT2: -0.5°C

Usage:

(stephan)blaulicht:~/solo/solo_config$ ./solopath.py
SOLOPATH> from solo.configurations.hetept1.v0009.hetept_config_opheater_patch4 import *
…

SOLOPATH> main()
…

SOLOPATH> msg=solo.solomsgclass.msg_print()

SOLOPATH> patch1.send(msg)
msg(0x000f, 3, 0x0000093500090004)
Temp SPY: -6.0°C  -3.2°C  -8.8°C
Temp SPY: -6.0°C  -3.3°C  -5.9°C
Temp SPY: -6.0°C  -3.2°C  -6.0°C
Temp SPY: -6.0°C  -3.2°C  -6.0°C
Temp SPY: -6.0°C  -3.2°C  -6.0°C
msg(0x268c, 3, 0x0000af1f0000c002)
msg(0x268d, 3, 0x007270e009f99000)
OP heater setpoint: -6 C = 2553 ADC
msg(0x2697, 1, 0x00000000000000ff)
msg(0x2696, 3, 0x0003e8010000413c)

SOLOPATH> patch1.OH_SHIFT=1

SOLOPATH> patch1.send(msg)
msg(0x000f, 3, 0x0000093500090004)
Temp SPY: -6.0°C  -0.2°C  -11.8°C
Temp SPY: -6.0°C  -0.5°C  -5.7°C
Temp SPY: -6.0°C  -0.5°C  -6.0°C
Temp SPY: -6.0°C  -0.5°C  -6.0°C
Temp SPY: -6.0°C  -0.5°C  -6.0°C
msg(0x268c, 3, 0x0000af1f0000c002)
msg(0x268d, 3, 0x007270e019739000)
OP heater setpoint: -6 C = 2419 ADC
msg(0x2697, 1, 0x00000000000000ff)
msg(0x2696, 3, 0x0003e8010000413c)
2022-01-21 12:49:28 +01:00
Stephan I. Böttcher
f9ae128e70 hetept: ppss.set_opheater_setpoint() with dc_estimate and shift 2022-01-21 12:49:13 +01:00
Stephan I. Böttcher
acb6934395 step v9: restore multi to LL
The multi hit counts were part of nominal in solo_data().  They got lost
with version 8, when all DPS was reimplemented except for Low Latency.

This commit removes all old data products in solo_data except for low
latency.  The multi hit counts are kept and appended to LL.

The version number is bumped to 9.1.
2021-11-22 13:53:37 +01:00
Stephan I. Böttcher
b39cef8b46 Merge branch 'hetept_v9_patches' of gitlab.physik.uni-kiel.de:solo/solo_config into hetept_v9_patches 2021-11-15 12:31:53 +01:00
Stephan I. Böttcher
4dbb52dbfd hetept patch 9.2: fix clear of the anticoincidence
solo.l1l2.l2trigger.set() changes only the given parameters. It does not
imply a .reset(). Those lines were a NOP. We only need to clear none=(),
to prevent any anticoincidences.
2021-11-15 12:28:52 +01:00
Stephan I. Böttcher
350806d109 step v0008 change config_page
The STEP unit EEPROM contains v6 in page 0x00000/0x60000.  The ICU
config memory contains v7 in page 0x70000 and v8 in 0x60000.  We plan to
write v8 into page 0x10000/0x70000 to not overwrite v6.  v7 was never
written to EEPROM.  At ICU reboot (after EGAM), the v8 config will the
appear in 0x70000.

This patch creates the STEP config compiled for 0x70000.

A preliminary xml to burn it into EEPORM is included.  Missing from that
xml is the restart of the unit after burn.
2021-11-04 16:51:41 +01:00
f6cd9a3968 updating hetept v0009 patch23 XMLs again 2021-11-03 17:30:09 +01:00
83d6e8c0c5 Revert "update hetept v0009 patch23 XMLs"
This reverts commit fabf4f0eb9.
2021-11-03 17:15:40 +01:00
fabf4f0eb9 update hetept v0009 patch23 XMLs 2021-11-03 17:04:51 +01:00
567bc7cab8 fix version number in hetept92.main() 2021-11-03 16:26:35 +01:00
1f413d3f86 solo.patch: adjust output format in .patch.xml() 2021-11-03 16:12:24 +01:00
4fa211e47d solo.patch: adjust output format in .patch.xml() 2021-11-03 16:10:17 +01:00
Stephan I. Böttcher
6c88a22201 EPT L3 test for negative signals
Apply the anticoincidence cuts to the negative values as well.
Patch3 is orthogonal to patch2.
2021-11-01 23:32:44 +01:00
Stephan I. Böttcher
8b1fd53b96 EPT l1l2: and update output 2021-11-01 17:33:21 +01:00
Stephan I. Böttcher
287edae51c EPT l1l2: increment subversion 2021-11-01 17:30:55 +01:00
Stephan I. Böttcher
2c3c1b0f45 EPT l1l2 patch 9.2 - the actual code. :-( 2021-11-01 17:24:14 +01:00
Stephan I. Böttcher
d0019e5194 EPT l1l2: trigger in anticoincidence hits
To investigate the x-talk issues, remove the anticoincidence condition
from EPT L₂.
Trigger on Ax channels with L₁ thr=1MeV.
2021-11-01 17:20:52 +01:00
Stephan I. Böttcher
84d95aa5d3 step v0008 bins 2021-10-28 15:52:37 +02:00
Stephan I. Böttcher
0d721ac99a step v0005 defs
why is there no defs for v0005?  I copied v0006.
2021-10-28 15:51:24 +02:00
Stephan I. Böttcher
ed38864a19 step dps: fix tag collision
In high rate, MAIN and AUX were using the same tag/flg.
Use tag=0x5f for STEP AUX.
2021-10-11 21:42:10 +02:00
Stephan I. Böttcher
3a2ef9102f step: checkout 2021-10-08 11:14:43 +02:00
Stephan I. Böttcher
f049631bdd config_table: pass SUBVERSION (scratch) to CONFIG() 2021-10-08 11:01:30 +02:00
Stephan I. Böttcher
3c161b13d0 step v8.2 part 3 checkout 2021-09-30 22:29:26 +02:00
Stephan I. Böttcher
190e385e66 STEP ppss: fix small pixel flg
Those flags appear to be broken in old configs. Or maybe I broke them
earlier.
2021-09-30 22:10:48 +02:00
Solar Orbiter GSE ops
3676eae88d Merge branch 'step_dps' of ssh://git.psjt.org/home/pott/git/solo/solo_config into step_dps 2021-09-30 19:20:29 +02:00
Stephan I. Böttcher
0318976eac STEP v8.2 checkout 2021-09-30 19:19:08 +02:00