Commit graph

168 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
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 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
f9ae128e70 hetept: ppss.set_opheater_setpoint() with dc_estimate and shift 2022-01-21 12:49:13 +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
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
2c3c1b0f45 EPT l1l2 patch 9.2 - the actual code. :-( 2021-11-01 17:24:14 +01:00
Stephan I. Böttcher
9e523e0d01 Merge branch 'master' into step_dps 2021-07-27 21:40:10 +02:00
Stephan I. Böttcher
c812f09714 hetept_config_table: fix .connect() 2021-07-27 18:30:20 +02:00
Stephan I. Böttcher
521ba60a9d hetept_config_table: fix .connect() 2021-07-27 18:25:56 +02:00
Stephan I. Böttcher
dc54d5f7b7 hetept/l3: add some address logging 2021-07-27 17:53:45 +02:00
Stephan I. Böttcher
ba893fffbd hetept/l3trigger: fix verbosity iniz, add some verbosity
Reset `verbose` to zero with `-vq`.

Unconditionally emit the list of L3 args to stderr.
2021-07-27 17:51:03 +02:00
Stephan I. Böttcher
570167c044 do not print diagnostics to stdout, print() 2021-07-27 13:57:34 +02:00
Stephan I. Böttcher
a31e6039b0 do not print diagnostics to stdout, print() 2021-07-27 13:57:04 +02:00
Stephan I. Böttcher
ea8d782beb do not print diagnostics to stdout 2021-07-27 13:41:48 +02:00
Stephan I. Böttcher
cc6a213b91 do not print diagnostics to stdout 2021-07-27 13:41:05 +02:00
Stephan I. Böttcher
9d273e7ae2 hetept patch 9.1: add absolute C cut for AB~C/ABC 2021-07-27 13:19:30 +02:00
Stephan I. Böttcher
29116ca75f base_config: fix temp scratch default 2021-07-26 15:36:11 +02:00
Stephan I. Böttcher
8e94b94c12 step: write defs for low rate env, define scratch field for dps env 2021-07-25 12:09:32 +02:00
Stephan I. Böttcher
050a5b3b20 l3: fix format exception on Warning, move common code to parent. 2021-07-10 23:23:08 +02:00
7c077be9c3 adjust config update functions to work with eeprom pages 2021-02-21 21:39:43 +01:00
24abd5ba82 Add two scripts which can generate telecommands for updating the HET/EPT FM configurations. 2021-02-08 18:01:57 +01:00
f05e7a6a56 Inrceasing the HET/EPT PHA cadence from 3600s to 300s. 2021-02-08 18:01:57 +01:00
211d878fb5 SVN merge: svn_revision removed
hetept/config.py:

Increment version to v0009. Add a function for generating PHA cadence patches.

git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8152 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
ceaf59685b hetept/l3/ept_calib.l3:
Increasing ept_2dhist_cutoff from 125keV to 1MeV.
The EPT PHA buffer for penetrating particles is mainly filled with MIPs.
Increasing the cutoff to 1MeV should filter most MIPs and increase the number
of PHA words from non-relativistic particles. 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8151 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
bb9f6d686a hetept/data.py
New data products for EPT stopping particles:
Introducing NO_EPT_mag and NO_EPT_foil, two data products with fully symmetrical binning for INT and MAG with 77 energy channels covering the full range of the l3histogram above 25 keV at 1s/5s cadence in CLOSE/FAR mode.
Introducing B1_EPT_mag, a burst mode data product that can be used together with NO_EPT_mag to double the energy resolution up to 1.6MeV.
All other EPT data products for stopping particles have been removed. 



git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8150 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Stephan I. Böttcher
5245c4cd4b ept.l3: revert -c 8112
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8114 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Stephan I. Böttcher
35aedc7033 l3sim: remove misguided print() to stdout
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8113 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Stephan I. Böttcher
f308f0864f ept.l3:
PHA data for 2D EPT events is spammed by relativistic protons.
	This change adds an itot limit for inclusion into the EPD-2D PHA buffer.
	An extra instruction is required to implement this limit.  An upload of
	the complete L3 trigger is required for deployment.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8112 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Robert Elftmann
bb487a1693 het_stopping.l3: Added heavy ion contination rejection for 1D proton and 1D He hist. 2D He and 2D heavy ion hist unchanged. H, He and heavy ion PHA buffers also use contamination rejection - otherwise PHA buffers contain exclusively contamination. Added comments to make code more easy to understand for new HET personal.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8062 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
f1646fbc79 SVN merge: svn_revision removed
hetept/config.py: Increment version to v8. In v8 the HK_ANA candence is changed back from 600s to 60s. HET ABnC stopping proton PHA buffer reverted to status of r8033.

git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8061 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
d20a65a806 hetept/ppss.py: HK_ANA_cadence changed back from 600s to 60s
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8060 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Robert Elftmann
4362e801f0 hetept/l3/het_stopping.l3 and het_calib.l3: reverted proton PHA ABnC PHA buffer changes for new stable config back to r8033
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8059 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
49c4849fc4 SVN merge: svn_revision removed
hetept/config.py: increment version to v0007

git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8044 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
6c9693505b hetept/ppss.py: HK_ANA_cadence changed from 60s to 600s
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8043 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
daf02dcb4b hetept/data.py: EPT_e NOM_BURST_3 CLOSE cadence changed from 5s to 1s to match EPT_T_e NOM_STABLE CLOSE cadence
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8042 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Robert Elftmann
ff0aeb424b hetept/l3/het_stopping.l3: Changed PHA buffer for proton investigation during commissioning phase. Proton contamination is now stored in pha_invalid.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8035 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Robert Elftmann
8bd2490c7a hetept/l3: het_stopping.l3 and het_calib.l3 adjusted for proton pha buffer adjusted during comissioning
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@8034 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
Robert Elftmann
e9084ee0f9 data.py: Fixed var length encoding cadences for FAR mode for EPT and HET nom.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@7976 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
2b2119b817 solo/hetept/necp_telecom.py: Add comments to TCs.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@7900 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00
1f83c9c192 HET/EPT: Adding a script that generates TCs for the NECP.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda/python@7897 bc5caf13-1734-44f8-af43-603852e9ee25
2021-02-08 18:01:57 +01:00