SolO/solo_config
3
1
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity
1,662 commits 19 branches 9 tags 8 MiB
Commit graph

40 commits

Author SHA1 Message Date
Jan Christoph Terasa
a3dd6bbfd2 python/solo: Padding string literals are bytes, not str. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7810 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-11-03 18:53:54 +00:00
Jan Christoph Terasa
68ecc73f8f solo/ce4/ppss.py: Python3 compat for integer divisions and map(). 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7809 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-11-03 18:52:17 +00:00
Jan Christoph Terasa
8c9da49f56 solo/ce4/dps.py: Use explicit integer division (python3 compat). 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7806 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-11-03 18:28:07 +00:00
Jan Christoph Terasa
8b326e0121 solo/ce4: print() python3 compat. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7804 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-11-03 17:59:12 +00:00
Stephan I. Böttcher
4118f5fded solo/python: revert misguided rename of class heteptana 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7756 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-10-16 12:32:57 +00:00
Stephan I. Böttcher
79edffefd7 C'E4 L3: fix PHA select for LET BI 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7754 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-10-16 12:31:38 +00:00
Zigong Xu
354be473f3 C'E4 LND: raise threshold of H2 to 300 keV 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7706 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-09-23 13:02:18 +00:00
Jia Yu
268514a2b2 A missing A1N>A2K is corrected 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7545 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-05-27 15:33:23 +00:00
Jia Yu
d409a2f671 Disable A2 channel in stopping particle logics at Line 381, 525, 577 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7531 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-05-24 14:09:02 +00:00
Jia Yu
2cdddbd496 Revert the line for disabling I in L3 trigger to 400keV threshold 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7530 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-05-24 13:23:36 +00:00
Jia Yu
641e94c70c Revert the line for disabling I in L3 trigger 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7529 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-05-24 13:17:31 +00:00
Henning Lohf
b09c2c758c amended two ion dps box widths, bug introduced at r7407 and found by Jia. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7527 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-05-23 10:36:38 +00:00
Jia Yu
18c3c7d240 Disable A2 and I in Level 3 trigger 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7506 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-05-09 14:19:57 +00:00
Stephan I. Böttcher
ba9132d7e0 C'E4 L3: raise det-I threshold from 50keV to 400keV 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7489 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-04-26 08:12:05 +00:00
Henning Lohf
986575861e amended dps box positions in consideration of the low gain fix except for stopping in I, which is already fixed in r7406 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7407 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-03-27 17:41:27 +00:00
Henning Lohf
b8e1747fbc amended dps box positions for l3 fix (stopping in I) in consideration of the low gain fix 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7406 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-03-27 16:42:26 +00:00
Stephan I. Böttcher
6e10480513 ce4 fm_config(): fix thresholds for conditions during the 3rd month 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7364 bc5caf13-1734-44f8-af43-603852e9ee25
 2019-03-15 11:16:51 +00:00
Sebastian Boden
e25ab9c28a solo/l3: updated *.gold files 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@7144 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-12-03 11:56:20 +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
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
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
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
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
Stephan I. Böttcher
207991f857 ce4/l3: remove misspelled, unnecessary name 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6988 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-09-28 08:30:17 +00:00
Charlotte Büschel
31ddd3af9f C'E4 calib header comment 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6958 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-08-29 11:38:38 +00:00
Charlotte Büschel
1719f0f4df FS calibration 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6957 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-08-29 11:32:10 +00:00
Charlotte Büschel
6c0262c202 C'E4 FM calib dump script 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6952 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-08-23 09:16:16 +00:00
Jia Yu
117caf9158 ce4 config: fix read_xmas, raise D2H threshold 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6942 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-08-10 15:40:14 +00:00
Stephan I. Böttcher
82b3225924 ce4.config: add .read_xmas() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6941 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-08-10 14:56:58 +00:00
Charlotte Büschel
d761a223cb C'E4 FS calib: channel C1H 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6940 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-08-10 13:26:58 +00:00
Stephan I. Böttcher
720bd4e28e C'E4 l3sim.py: fixes and Makefile rule 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6910 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-06-29 14:09:26 +00:00
Jia Yu
4d513aef3d Add -o option to generate numpy array file, Sebastian,Jia 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6908 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-06-29 12:41:17 +00:00
Sebastian Boden
35b394d0e9 solomsgclass.py: new HK_SOLO and HK_CE4 classes, which define HK conversions 
and a print_hk function, which can be used from solomsg     
sologse, solorc-*, µsolo: import these functions as HK()


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6873 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-06-06 12:44:47 +00:00
Stephan I. Böttcher
bfcf21966b C'E4: template for how to override L1 thresholds in the EM model 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6716 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-03-28 09:38:14 +00:00
Stephan I. Böttcher
d460722ad8 C'E4: em_config(), with FM calibration 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6714 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-03-27 14:31:55 +00:00
Sebastian Boden
8e81b26395 ... done 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6675 bc5caf13-1734-44f8-af43-603852e9ee25
 2018-03-08 10:05:06 +00:00