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

1,935 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephan I. Böttcher
97b05b2d3f hetept_config: 
refactor config modules into subclasses
	implement hetept_config_em2
	TODO: refactor hetept_dps


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5065 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-30 11:53:13 +00:00
Stephan I. Böttcher
a264ed2896 packets: misc fixes and updates 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5064 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-30 11:42:26 +00:00
Stephan I. Böttcher
03e1e0a6aa telecom: hexdump() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5063 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-30 11:40:12 +00:00
Stephan I. Böttcher
b02a74bc33 configtable: patch_map() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5062 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-30 11:39:41 +00:00
Stephan I. Böttcher
437a8d7c26 configtable: fix index table CRC, add tc128_102() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5061 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-29 11:48:07 +00:00
Stephan I. Böttcher
bbdffe1892 hetept_config: more work towards subclasses 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5060 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-28 19:45:51 +00:00
Stephan I. Böttcher
71d2cc025c configtable: make compile() more robust 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5059 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-28 19:44:34 +00:00
Stephan I. Böttcher
3ff9372608 hetept: refactor all configs towards subclasses, ongoing 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5057 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-27 16:42:01 +00:00
Jan Christoph Terasa
05d9c0a738 step_config: Added calib mode with test pulser for thermal tests. Removed insertion slots for now. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5056 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-27 14:11:31 +00:00
Stephan I. Böttcher
f7b5b21827 configtable: add .eeprom_id to prefix the boottable with 64 zeros 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5055 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-27 10:10:05 +00:00
Stephan I. Böttcher
a4e9668a00 configtable: strip id pad bytes in dump() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5054 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 22:38:03 +00:00
Stephan I. Böttcher
ad9e325a10 boottable: fix hexdump table CRC 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5053 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 22:16:46 +00:00
Stephan I. Böttcher
889eca9cf1 solomsg: data_product ignores extra **args from dps_table 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5052 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 18:44:30 +00:00
Jan Christoph Terasa
36c2b60ffc step_sft.py: Updated test() method to compare correct values. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5051 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 15:27:57 +00:00
Jan Christoph Terasa
16e8620337 step_base_config.py: Adapted to new msg0 syntax. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5050 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 15:25:59 +00:00
Jan Christoph Terasa
3af53938f1 solomsgclass.py: Renamed clr_step_cntrs to clear_step_l2, and added it to 'reset_all' and 'all'. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5049 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 15:25:22 +00:00
Jan Christoph Terasa
d0875d0de7 step_sft.py: Removed cruft. Added measurement with test pulser. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5048 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-26 14:54:16 +00:00
Stephan I. Böttcher
7541819191 boottable version 1 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5047 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 20:46:35 +00:00
Stephan I. Böttcher
eed19b0d45 hetept SFT: read 0x50 counters 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5046 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 19:36:21 +00:00
Stephan I. Böttcher
ad0c364d49 packets: make datatype code agree with ICD 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5045 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 19:35:32 +00:00
Jan Christoph Terasa
85948f85e5 step_config: Added calib mode with streaming and all pixels active. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5040 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 14:02:34 +00:00
Stephan I. Böttcher
66944dfd1f packets: fix PHA code 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5039 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 10:24:51 +00:00
Stephan I. Böttcher
4c3db893c1 packets: new PacketId scheme with 36 values 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5038 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 10:11:04 +00:00
Jan Christoph Terasa
d1b6fbaed6 step_base_config.py: Added SFT as index table entry 6. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5037 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-25 08:37:47 +00:00
Jan Christoph Terasa
f8167c4c6e step_base_config.py: Explicitly disable streaming in hk and nominal modes. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5034 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-21 09:38:24 +00:00
Jan Christoph Terasa
d2ef313c01 step_config.py: Add basic config. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5033 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-21 08:52:33 +00:00
Jan Christoph Terasa
cf8d2546ad step_config: Updated to use simpler config creation mechanism. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5032 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-20 09:49:10 +00:00
Jan Christoph Terasa
ed81ec1f06 dps_table.py: Fixed bugs in dps_table.copy() and dps_product.copy(). 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5031 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-20 09:47:55 +00:00
Stephan I. Böttcher
b074b84c5d dps_table: add .deallocate(), .copy() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5027 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-12 14:16:46 +00:00
Stephan I. Böttcher
534545c61f hetept_l1l2: make l1trigger.thresholds a dictionary 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5026 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-12 09:10:35 +00:00
Stephan I. Böttcher
26441f5d33 hetept_config: hetept_base_config 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5025 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 19:08:02 +00:00
Stephan I. Böttcher
58ae80a90b hetept_l1l2: add high rate thresholds 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5024 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 19:07:32 +00:00
Stephan I. Böttcher
aa89a42f29 svn:keywords Id Revision 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5023 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 19:05:26 +00:00
Stephan I. Böttcher
f486c93506 svn:keywords Id Revision 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5022 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 19:02:52 +00:00
Stephan I. Böttcher
dfc1f6dab2 hetept_ppss: get_HK(), l3disable for clear, set_dps_flags() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5021 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 18:56:06 +00:00
Stephan I. Böttcher
7b4ad4ec5a heteptana: threshold variants management 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5020 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 18:53:21 +00:00
Stephan I. Böttcher
cd4304f80c ppss_table: add .copy() methods, selective .science() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5019 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 18:52:20 +00:00
Stephan I. Böttcher
a4f4b96eda solomsg: default msg0 version set to 9 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5018 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-11 18:42:04 +00:00
Stephan I. Böttcher
a21acc3a61 hetept_l1l2: add mV 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5001 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-04-01 11:43:24 +00:00
Stephan I. Böttcher
167738cbb6 STREAMTEST: fix ppss for high count rates, 90% dutycycle, bogus peek 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4993 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-21 14:51:36 +00:00
Stephan I. Böttcher
71a0840c29 hetept_l1l2_stream: do not read HET channels for EPT triggers 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4992 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-21 14:08:00 +00:00
Stephan I. Böttcher
6443418ff3 het L3: start of a major rewrite 
L3[1] can assume that L2 rejected all hits in B2 and A2
	L3[2] dito in the other direction
	L3[3] will test for X-talk and call L3[1] or L3[2] when apropriate

	L1 trigger bits:
	
	L1[6] = A1  = (A11H, A11L, A12H, A12L)
	L1[4] = B1c = (B11H, B11L, B12H, B12L)
	L1[7] = B1  =  B1c + (B13G)
	L1[8] = A2  = (A21H, A21L, A22H, A22L)
	L1[5] = B2c = (B21H, B21L, B22H, B22L)
	L1[9] = B2  =  B2c + (B23G)

	L2 trigger:
	 
	L3[1] <= A1 & B1c & ~B2 & ~A2
	L3[2] <= A2 & B2c & ~B1 & ~A1
	L3[3] <= A1 & B1c * B2 | A2 & B2c & B1

	In calibration configurations, B1c := B1 and B2c := B2,
	because two L1 trigger bits L1[4:5] are used for catch all triggers.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4984 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-09 11:36:51 +00:00
Stephan I. Böttcher
280f724af9 solol3-mode: disable newline-and-indent, do solol3-colon for "=" 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4983 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-09 11:21:18 +00:00
Stephan I. Böttcher
e5e2ba0d02 hetept_l1l2: add B.3 in L1 trigger bits 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4982 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-09 11:18:19 +00:00
Sebastian Boden
5337c4ebee hetept_dps.py: minor fix 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4981 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-09 11:10:59 +00:00
Sebastian Boden
99cfc1d861 solorc-hetept.py, hetept_dps.py: It's now possible to set the DPS configuration with the commands PQM() and FM(); this works by creating a temporary settings file which hetept_dps will try to read 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4980 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-09 11:08:44 +00:00
Sebastian Boden
beb54a90d2 hetept_dps.py: implemented function select_dps_config, which allows us to choose among FM, PQM, etc configurations; Todo: find a good way to select this from solorc-hetept.py 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4978 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-08 15:26:56 +00:00
Sebastian Boden
be7bc2e884 l3 Makefile, ept.l3: improved support for making PQM and FM versions without interfering with each other 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4974 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-07 17:11:01 +00:00
Sebastian Boden
27176fd49b l3 Makefile: added support to make *_pqm files using the -DPQM assembler option 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4973 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-07 16:23:15 +00:00
Sebastian Boden
9ebfec9103 ept.l3: integrated PQM L3 trigger into ept.l3 using .ifdef PQM 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@4972 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-03-07 15:52:07 +00:00