Commit graph

9,307 commits

Author SHA1 Message Date
stephan
5da6b7007a itf_parser: add -H, use versions[] for PHA dumping format
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4977 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-08 13:49:49 +00:00
stephan
b2f4891419 heteptxrays.awk: histograms in anticoincidence to everything
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4976 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-08 09:50:23 +00:00
stephan
0ad4ed67a1 HETEPT.awk: add is2d(), do2D()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4975 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-08 09:49:30 +00:00
boden
83a0941d65 l3 Makefile, ept.l3: improved support for making PQM and FM versions without interfering with each other
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4974 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 17:11:01 +00:00
boden
f265a27516 l3 Makefile: added support to make *_pqm files using the -DPQM assembler option
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4973 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 16:23:15 +00:00
boden
2a9d454cc2 ept.l3: integrated PQM L3 trigger into ept.l3 using .ifdef PQM
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4972 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 15:52:07 +00:00
terasa
bfddcdfca0 solorc-step.py: Better instrumentation of pulser test suite.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4971 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 14:32:29 +00:00
terasa
b161f2d33f step_stream_config.py: Sync to step_config.py.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4970 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 14:04:48 +00:00
terasa
1621dd3573 step_config: Pulse once on all pixels to clear memory to avoid SEUs.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4969 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 14:04:19 +00:00
terasa
abc7574dbf step_dps.py: Ignore zero multiplicity hits.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4968 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 13:51:19 +00:00
terasa
7905fd7842 step.l3: Write multiplicities for single pixel hits.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4967 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 13:50:41 +00:00
terasa
d3a8affc8b step_ppss.py: Apply r4965 to small pixels, too.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4966 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 10:31:34 +00:00
terasa
ce65962a1d step_ppss.py: Reduced min_dt to zero.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4965 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 10:30:42 +00:00
terasa
fd3b73a038 step_ppss.py: Don't send deadtimes to ICU every second, use ICU_cadence.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4964 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 09:11:20 +00:00
terasa
e95451020b step_dps.py
Fixed wrong usage of csum=5 (hint: it's not 5 seconds...)
    Added tmod argument to data products to avoid sending additional telemetry


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4963 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 07:26:35 +00:00
terasa
11f318e77a solomsgclass.py: data_product() argument tmod accepts MOUDLI-type strings.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4962 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 07:25:17 +00:00
terasa
bbb30f8702 step_stream_config: Updated step_stream_config.py to use updated step_small_l3.py
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4961 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 07:08:19 +00:00
terasa
cf4b8781f7 step_dps.py: Create only one .defs file containing both large and small pixel SCI defs.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4960 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 07:01:25 +00:00
terasa
23e2049156 step_ppss.py: Remove L3 guards around DPS calls.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4959 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 06:48:24 +00:00
terasa
b88f3f847e step_config: Updated step_config.py to use updated step_small_l3.py
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4958 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 06:47:36 +00:00
terasa
dbeccbc1e3 step.l3: Fixed bug in handling of wrong pixel sizes for hits on IX1.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4957 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 06:38:00 +00:00
terasa
af1ae687f6 Makefile: Added explicit rules for step which also build small pixel config in one go.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4956 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 06:36:30 +00:00
terasa
8866e5aff6 step.l3: Use L3 conditional assembly instructions for generating small pixel L3 trigger.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4955 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 05:48:48 +00:00
terasa
4114705f00 l3.py: Fixed some bugs in conditional assembler directives.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4954 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-07 05:47:24 +00:00
stephan
0624d8796a L3 assembler:
implement conditional assembly
	  .if EXPR
	  .ifdef NAME
	  .ifndef NAME
	  .elseif EXPR
	  .else
	  .endif
	Add operator ! logical not.
	Rename commandline option -I to -D
	Warn if a -DNAME=VALUE is redefined, unless -DNAME:=VALUE
	-DNAME defaults to VALUE=1


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4953 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-06 21:08:08 +00:00
terasa
5f7066d906 step_dps.py: Adapt clear command to clear all used memory again.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4952 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-06 13:20:46 +00:00
stephan
f3f3b56e92 step v03: RTAX and Aldec bitfiles
Aldec CS: 0xBADC
   RTAX r12s16  xclk=70.1MHz mclk=33.0MHz mclk gen=3.3ns
   (2nd choice RTAX: r12_s24, 74.4MHz/31.8MHz/3.3ns)


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4951 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-05 17:52:17 +00:00
stephan
29c5414d7a memport: merge -c 4948: fix memarb pend3 bug
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4950 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 20:11:08 +00:00
stephan
5e9c58558b step v03: branched from v02
purpose: fix memarb bug


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4949 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 20:06:18 +00:00
stephan
e72f51034b memport memarbitration: fix BUG in pend3[]
Swap if() with else if() clauses for pend3.

	When the memory driver signals ~busy and valid at the same time, 
 	accept the valid instead of extending pending.

	When two ports issue read requests such that the ~busy of the 
	second request coincides with the valid of the first, then the data
	of both requests were delivered to the first port.  The second port 
	received no data.

	If the first request was the histogram incrementer, it would take 
	the second requests data and write the increment of that into 
	the histogram memory.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4948 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 18:38:58 +00:00
wetzel
1f88ce4c81 step.gold: before memarb fix
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4947 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 18:23:37 +00:00
wetzel
86895eab0e Makefile: added target for l3win_test
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4946 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 18:21:41 +00:00
stephan
c2488ff228 l3win_test: 50ms @ 24MHz
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4945 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 18:04:27 +00:00
terasa
526b936b54 step_dps.py: Removed debug data products.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4944 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 13:41:22 +00:00
terasa
c03b42afa4 step_dps.py: IX0: electron channel, IX1: proton channel.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4943 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 13:40:25 +00:00
terasa
bf34678f54 step_dps.py: Clear only actually used histogram memory to reduce deadtime due to L3 guard.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4942 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 12:50:34 +00:00
grunau
71fed36fd7 Added y-projection to HET dps table for AB coincidence test
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4941 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 12:14:33 +00:00
grunau
9324661c78 HET DPS table for AB tests
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4940 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 12:01:49 +00:00
grunau
afcba1ed9d Parameter chages in HET L3 trigger, added Exception handling in l3pipe
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4939 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 12:00:37 +00:00
grunau
fb101517cd HET L3 trigger with major rewrites
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4938 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-04 08:52:13 +00:00
terasa
721001311e step_config: Clear L3 reg and L3 mem at bootup.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4937 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-03 14:35:55 +00:00
stephan
a6a3a8ed23 sologse: implement gse.Powerlog()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4936 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-03 10:01:58 +00:00
stephan
af948c9f9e sologse firmware: add DEFAULT target
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4935 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-03 09:48:04 +00:00
stephan
816d215922 sologse firmware: fix bug in set_time
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4934 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 22:33:57 +00:00
terasa
eaefc7af0a step_stream_ppss.py: Normalize ppss_tables at the end.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4933 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 14:30:11 +00:00
terasa
479cc8fd57 step_stream_config.py: Added config file for streaming mode without DPS.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4932 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 14:14:06 +00:00
terasa
da3f72704c step_stream_ppss.py: Derive stream_ppss directly from main ppss, drop all DPS and enable streaming.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4931 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 14:11:20 +00:00
terasa
e3a1a55588 step_ppss.py: Added labels to DPS-clear to make it findable. Removed unused insertion slots.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4930 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 14:07:35 +00:00
terasa
427476c529 ppss_table.py: Added remove() and isub() methods to ppss_table to remove entries.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4929 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 14:06:34 +00:00
terasa
3b6a06fda8 solorc-step.py: Added histtest function to quickly check a configuration for histogram bug.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4928 bc5caf13-1734-44f8-af43-603852e9ee25
2016-03-02 13:18:58 +00:00