Commit graph

456 commits

Author SHA1 Message Date
Jan Christoph Terasa
8f5a8259f2 l3sim.py: Partially revert 7092 by using get_no_fastpath at relevant places.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7094 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-13 11:37:57 +00:00
Robert Elftmann
2db6a88e44 l3sim.py: Do not pick data from fastpath in case of PRINT. Fix issue with PHA reg initialiation.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7092 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-12 10:41:19 +00:00
Robert Elftmann
e627488630 hetept/l3sim.py: Correctly import l3trigger class.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7091 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-12 10:36:19 +00:00
Jan Christoph Terasa
5b7049999c solo/cdpu/telecom.py: Add s6_check_table_crc telecommand.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7088 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-09 10:38:17 +00:00
Jan Christoph Terasa
4529f8a513 solo/configtable.py, solo/cdpu/telecom.py: Add delay parameter to update exec, implement PO format for 128,103.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7087 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-09 10:05:43 +00:00
Jan Christoph Terasa
9087345805 solo/configtable.py: Use different base address for uploads. Do a full reset unless insertion slots are used for updating.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7086 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-08 11:24:47 +00:00
Jan Christoph Terasa
3ddd843f04 solo/configtable.py: Exec TCs of upload_index_patch will now also send eeprom_reset=0.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7085 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-08 07:56:17 +00:00
Jan Christoph Terasa
2063d72f25 cdpu/telecom.py: Fix bug in unit detection in TC 128,102.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7084 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-08 07:55:21 +00:00
Jan Christoph Terasa
b6b60030be solo/configurations: Apply fix to disable eeprom_reset to non-delivered STEP v0003.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7083 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-08 07:14:15 +00:00
Jan Christoph Terasa
d3dd369ed8 step/base_config.py: Disable eeprom_reset in startup sequence of HK and Op modes.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7082 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-08 07:07:28 +00:00
Jan Christoph Terasa
9a07597d16 solo/configurations: Add STEP v0003.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7081 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 14:55:42 +00:00
Jan Christoph Terasa
1aaed60064 step/base_config.py: Update magic with compiled L3 trigger SVN revision.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7080 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 14:52:00 +00:00
Jan Christoph Terasa
08e1e3ceb0 python/solo/l3.py: Add function to grab max revision number from compiled files.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7079 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 14:51:22 +00:00
Jan Christoph Terasa
4f326aa618 step_fs_temp_calib.l3: Updated temp calib based on bootstrap data. Only slight alterations.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7077 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 14:07:14 +00:00
Jan Christoph Terasa
a54dc750a8 telecom.py: Made flattening of TC list more robust.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7076 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 14:05:17 +00:00
Jan Christoph Terasa
f3831375a0 step/config/f*.py: Do not make old table.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7075 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 14:02:15 +00:00
Jan Christoph Terasa
eac4d63348 solo/step/data.py: Update low latency data definitions.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7074 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-05 13:47:54 +00:00
Jia Yu
96eff88094 Cross-talk ratio corrected by Jia
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7068 bc5caf13-1734-44f8-af43-603852e9ee25
2018-11-01 08:19:48 +00:00
Sebastian Boden
7469d6a715 hetept/data.py: rounding of bins for het_spectrum
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7053 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-24 11:06:39 +00:00
Sebastian Boden
c91240da7a msgdecode.py: added decode_read_reg
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7052 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-24 10:11:44 +00:00
Sebastian Boden
f24e4d197b msgdecode.py: implemented decode_science, decode_pointer and decode_read_mem
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7051 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-24 09:10:31 +00:00
Stephan I. Böttcher
0723fca4bb msgdecode: svn:keywords
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7050 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-24 07:04:41 +00:00
Stephan I. Böttcher
48c343ee12 msgdecode: improve ppss for diffs
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7049 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-24 06:07:05 +00:00
Stephan I. Böttcher
448f931fec msgdecode: decode_*_ana()
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7048 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 20:37:11 +00:00
Stephan I. Böttcher
2df92f757b msgdecode: ppss
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7047 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 16:14:10 +00:00
Sebastian Boden
5780d6d67c msgdecode.py: added ppss and dps decoding
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7046 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 13:51:39 +00:00
Sebastian Boden
74872f73ec msgdecode.py: added msg0 decoding
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7045 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 11:43:30 +00:00
Stephan I. Böttcher
1e7c3c84ec C'E4 L3: fix cut scale CE and DE
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7044 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 09:56:03 +00:00
Stephan I. Böttcher
d6598dc56d solomsg: fix import in .l3code_dis()
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7043 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 09:51:15 +00:00
Stephan I. Böttcher
8c9a4a94f4 msgdecode.py: new config dump decoder, very unfinished
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7042 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-23 07:51:34 +00:00
Stephan I. Böttcher
27f136b333 icu_message_table: write_eeprom(diff=)
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7041 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-22 22:01:02 +00:00
Stephan I. Böttcher
1d914d6210 C'E4: version 5 (preliminary)
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7040 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-22 19:21:37 +00:00
Stephan I. Böttcher
fb2a8d6a4a C'E4 L3: Fix bug in do_stop_I
Subject: A bug type of typo found in do_stop_I
Date: Sun, 21 Oct 2018 23:35:36 +0200
From: Jia Yu <yu@physik.uni-kiel.de>
Message-ID: <5BCCF128.8040209@physik.uni-kiel.de>

Moin Stephan,

Line 515 of the macro do_stop_I in ce4.l3
Line 513    ABK =        ADD A1N>>1 + B1N>>1
Line 514    CDK =        ADD CK>>1 + DK>>1
Line 515    TK =        ADD ABN>>1 + CDK>>1
ABN is a typo and shall be written as ABK.

I think this typo will result in some real problems, because ABN is 
*not* calculated in the current do_stop_I macro, but outside the case of 
particle stopping in D...

I do not know how our compiler will assign ABN, if the address in R 
registers is fixed, then we will *always* have a wrong value in ABN 
which is calculated by other events, e.g., stopping in D.

In addition, it seems that our compiler can not find this kind of bug, 
maybe we need to update the l3.py a little bit.

Yours,
Jia


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7039 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-22 18:51:25 +00:00
Sebastian Boden
b197aca9b6 het_stopping.l3: fixed rounding errors in ABC cuts
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7037 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-19 12:24:17 +00:00
Sebastian Boden
97c43c6d12 het_stopping.l3: added lower cut for HET ABnC proton histogram
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7035 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-18 11:59:06 +00:00
Robert Elftmann
b69226f3ad het_calib.l3: Bg segment check to 10% of main seg. instead of 100, fixed conversion in cut_c_AB_ratio, added comments
data.py: Added summary boxes for ABnC groups (C N O + Ne Mg Si S + Ar Ca Fe Ni). Adjusted Y-range of boxes for all ions for edge-to-edge definition as Stephan suggested. Enlarged most DP items
het_stopping.l3: Added comment to code


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7034 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-18 11:18:53 +00:00
Sebastian Boden
18a92614bc heteptana.py: renamed to l1l2.py to make more consistent
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7030 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-17 10:24:56 +00:00
Sebastian Boden
987a0ac1ab python/solo: some fixes to revision number tracking
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7029 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-16 15:15:56 +00:00
Sebastian Boden
998299aae3 heteptana,l1l2: reorganized the names and scales
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7028 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-16 15:14:58 +00:00
Sebastian Boden
036a2226b8 hetept/data.py: changed ept foil-side background histogram
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7025 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-15 14:12:00 +00:00
Sebastian Boden
45f80e89d1 het_stopping.l3: rotated het ab stopping ion histogram
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7024 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-15 11:01:23 +00:00
Sebastian Boden
03aa8eaa55 hetept/data.py: fixed the directions of het stopping data products
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7023 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-15 09:15:13 +00:00
Sebastian Boden
08d627e649 hetept/data.py: fixed the direction of het_pen histograms
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7020 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-11 15:02:06 +00:00
Robert Elftmann
c04648bccc hetept/data.py: Added telescope and histogram informations for HET
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7019 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-11 12:24:52 +00:00
Jan Christoph Terasa
d4c01b350c configtable.py: Add option to create pristine update table at an offset.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7018 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-10 23:26:10 +00:00
Jan Christoph Terasa
ce89e3a1a0 telecom.py: Fix parsing of TC(128,101).
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7017 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-10 23:25:28 +00:00
Jan Christoph Terasa
aa5420c8a7 icu.py: Add option to relocate table pointers.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7016 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-10 23:24:42 +00:00
Stephan I. Böttcher
7bfa05bc59 C'E4 L3 thermal neutron trigger: fix calibration for G2 and H2
Subject: Re: Another typo in L3 trigger I guess...
To: Stephan Böttcher <boettcher@physik.uni-kiel.de>
References: <b3667a8d-1fb1-e250-a5a5-3b73d7912a67@physik.uni-kiel.de>
 <s6n5zybe7ij.fsf@blaulicht.dmz.brux>
Cc: Bob Wimmer <wimmer@physik.uni-kiel.de>, Jia Yu <yu@physik.uni-kiel.de>
From: Jia YU <yu@physik.uni-kiel.de>
Message-ID: <46c0cb3d-b109-90fa-a770-720f69ff8953@physik.uni-kiel.de>
Date: Tue, 9 Oct 2018 12:46:43 +0200


Moin Stephan,

here goes calibration values that we used on FM:

G1_calib = mV_A / 0.25010249
G2_calib = mV_A / 0.24408287
H1_calib = mV_A / 0.24393106
H2_calib = mV_A / 0.25123869

they are not that different
@Bob please let us know how to deal with this bug, thanks

Yours,
Jia



On 09/10/18 12:31, Stephan Böttcher wrote:
> Moi  Jia,
>
> Jia YU <yu@physik.uni-kiel.de> writes:
>
>> Moin Stephan,
>>
>> again in ce4.l3, lines 312, 313
>>
>> K2 =        MULI G2 * *G1*_calib/gs
>> K2 =    ifC    MULI H2 * *H1*_calib/gs
>>
>> I think they shall be
>>
>> K2 =        MULI G2 * *G2*_calib/gs
>> K2 =    ifC    MULI H2 * *H2*_calib/gs
>>
>> If these are typo, then our G2 and H2 channels use a wrong calibration
>> values, do you agree?
> That is a bug, yes, you are right.
>
> How different are those calibrations?
>
> Stephan



git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7015 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-09 20:43:44 +00:00
Sebastian Boden
eef65963e8 hetept/data.py: fixed directions of EPT data products (and added comments to explain it)
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7014 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-09 16:32:55 +00:00
Jan Christoph Terasa
e6c3b2715a icu.py: Take into account delays in TC comment fields.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7011 bc5caf13-1734-44f8-af43-603852e9ee25
2018-10-09 08:51:17 +00:00