Commit graph

9,307 commits

Author SHA1 Message Date
wetzel
eaf8afb235 step: revertet r4306
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4307 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 15:24:41 +00:00
wetzel
d62477f5b6 step slow control: set ll and shift_* to zero when not busy
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4306 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 15:08:59 +00:00
stephan
477ee60aa5 EPT L3: review with Sebastian, fix 2D histograms
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4305 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 12:59:01 +00:00
stephan
c06d25a5d5 heteptdig em/v09: merge -c 3889: addrer rewrite
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4304 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 12:18:38 +00:00
stephan
fb50811acc heteptdig em/v09: gold
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4303 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 12:16:39 +00:00
stephan
c87c911d5d heteptdig em/v08: merge -c 4297,4298: new encoding stream sequence
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4302 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 08:39:53 +00:00
stephan
dd456406dc heteptdig em/v09: merge -c 4290: testjig encschedule
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4301 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 08:36:25 +00:00
stephan
8e472106bb heteptdig em/v09: branch from v08
purpose: introduce incompatible changes to the 
	countrate encoding sequence


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4300 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-27 08:33:10 +00:00
stephan
28137dad17 l3test: add EPT events
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4299 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 21:29:04 +00:00
stephan
f4e41b0d05 compression: speed up compression when some data is zero
Do not wait for the encoder when a zero is added to the input.



git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4298 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 21:27:45 +00:00
stephan
46d12f374c compression: change how the running difference is suppressed for low count rates
For small count rates it does not make sense to compute
	running differences, and that would lead to oszillations.
	This patch simplifies the concept how this is handled.

	When the number of counts, as reconstructed by the reciever, is less
	or equal 8, then the next number will be sent as is, not as a 
	running difference.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4297 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 21:25:41 +00:00
stephan
9da6823fc0 dps_table: rewrite section tags in (2D) histograms by row number
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4296 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 21:16:49 +00:00
stephan
8407e5be7b hetept_dps: add/fix eptcal2d sy=64 parameter
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4295 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 19:39:55 +00:00
stephan
31a897fd14 itf_parser: fix rounding of nnorm numbers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4294 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 19:38:52 +00:00
stephan
e70794c768 encschedule: gold for old low rate algorithm
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4293 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 19:37:15 +00:00
stephan
9013da97f4 ept L3: more PHA buffer fixes, EB label fix, ...
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4292 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 19:11:36 +00:00
stephan
998eea0827 Makefile for encschedule testjig
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4291 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 12:47:05 +00:00
stephan
bd4a25cbe0 ppsschedule: add verilog testjig for encschedule
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4290 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 12:45:26 +00:00
stephan
c137afdc24 encode: fix python implementation
fix treatment of non-normalized rounding
	fix drop schedule for encode_stream


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4289 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 12:09:21 +00:00
stephan
28364ee5e3 ppss table: mode opencoded science dataproduct scheduling into ppss_table method
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4288 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 12:07:08 +00:00
stephan
037edf595f itf_parser:
add PHA hexdump
	decode log2by8 SCI counters
	reconstruct encoded SCI counters from running differences


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4287 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-26 01:48:21 +00:00
stephan
b001db9a76 hetept_config: fix trigger class mask to match L2 config
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4286 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-25 11:09:16 +00:00
stephan
d83edd0c89 hetept_ppss: drop the random triggers, for now
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4285 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-25 09:09:00 +00:00
stephan
34f45c1a9a hetept config: add and use calibration mode science data products
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4284 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-25 07:02:14 +00:00
stephan
e77ddebc9b ept l3: rewrite of EPT 2D histograms
Sebastian worked on this in parallel.
	This commit replaces his solution.
	We'll need to find out which one to keep.

	Introduce EPT_log_keV label as a reference for absolute cuts.
	Add comment for HET to fix their calibration constants.
	Added labels to use instead of R[.-1].


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4283 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-25 06:42:30 +00:00
boden
c8d002570b ept.l3: minor syntax changes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4282 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-24 18:49:42 +00:00
boden
d25fb9f35d ept.l3, hetept_config.l3: changed the generation of the 2D histogram
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4281 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-24 18:44:14 +00:00
terasa
7e860fbb05 dps_table.py: First try at implementing more advanced simulation code. init calculation in modulus() might be completely wrong.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4280 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-24 14:34:12 +00:00
terasa
b2de74d0d4 step/libero: Add flash project.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4279 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 16:03:01 +00:00
terasa
4b622bcbc1 stein/libero: Latest synth/designer/bitfile for aldec adapter with middleend-debug-counter.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4278 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 15:55:56 +00:00
stephan
17dc161188 hetept EM1: burn digital board Aldec
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4277 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 14:31:25 +00:00
wetzel
25e33c9984 step: added comment
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4276 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 13:53:11 +00:00
wetzel
704228ab4f step: added strobem counter
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4275 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 13:51:34 +00:00
stephan
80227e8f56 l3test: gtkw
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4274 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 13:32:31 +00:00
wetzel
b87fc04060 step slow control: added debug counter
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4273 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-23 12:27:17 +00:00
stephan
d7d28f036a solomsg: fix COMPR
the comp argument for dps() was accepting True for
        the encoded mode, comp=True ==> { True: 3 }, but

		In [23]: {1: "one", True: "true"}
		Out[23]: {1: 'true'}
	
	True is treated like 1 in a dictionary key.  A lookup of 1
	succeeds and finds 3, so the mode will be set to encode.

	Remove True and False from the COMPR dictionary, they now represent
	1 and 0, i.e., log and float.	 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4272 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 20:41:24 +00:00
terasa
46d81f62b9 step_dps.py: Updated to latest step.l3. Fixed xyhist.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4271 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 13:35:55 +00:00
stephan
9ef5e7f629 step v01: FPGA burn log added
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4270 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 10:46:27 +00:00
stephan
79433f0cb9 step v02: merge -c 4252: remove old l3_classifier (dead code)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4269 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 09:51:56 +00:00
stephan
5ffc0dbb7f step v02: version tag 0xd2
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4268 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 09:49:16 +00:00
stephan
d308017ee6 step: branch v02 from v01
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4267 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 09:45:02 +00:00
stephan
9fd22c1123 solomsg: add alias stop_ppss
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4266 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-22 07:52:16 +00:00
terasa
c90a7a8089 dps_table.py: Bugfixed dps_item.simulate()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4265 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 18:36:09 +00:00
terasa
8d1cdce654 solomsgclass.py: dps_fields: Bugfixed ysize extraction, which also affected dps_table.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4264 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 18:33:30 +00:00
terasa
28fc811b8c solomsgclass.py: Fixed byte order of read_l3code(). For real this time.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4263 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 18:30:28 +00:00
terasa
b0e464d4ea Revert last erroneous commit.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4262 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 18:13:41 +00:00
terasa
f58e0c4346 solomsgclass.py: Fixed byte order of read_l3code.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4261 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 18:11:46 +00:00
stephan
6a58c0f1e5 step v01: PQM bitfile
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4260 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 15:29:15 +00:00
stephan
a7f838ee03 heteptdig em/v08: full flow to RTAX and Aldec bitfiles
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4259 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 14:09:39 +00:00
boden
d7ebeb4c80 ept.l3: Added missing GOTO to avoid incrementing 1D and 2D histograms
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@4258 bc5caf13-1734-44f8-af43-603852e9ee25
2015-04-21 13:39:25 +00:00