Commit graph

754 commits

Author SHA1 Message Date
terasa
cd98143bc4 pipe.py: Added optional numpy output mode. Default output is binary stream of 32bit uints, for piping into dps simulator.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3426 bc5caf13-1734-44f8-af43-603852e9ee25
2014-11-03 16:13:51 +00:00
boden
feb8199693 simplified ept l3 trigger
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3421 bc5caf13-1734-44f8-af43-603852e9ee25
2014-11-03 11:06:49 +00:00
boden
4daea3e69d rearranged memory to 1024x256
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3420 bc5caf13-1734-44f8-af43-603852e9ee25
2014-11-03 11:04:31 +00:00
boden
11d5b98611 minor fixes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3419 bc5caf13-1734-44f8-af43-603852e9ee25
2014-11-03 10:05:44 +00:00
terasa
9efc18dc3b Makefile: Added forward declare files for STEP.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3417 bc5caf13-1734-44f8-af43-603852e9ee25
2014-11-01 00:51:27 +00:00
terasa
c516ca6191 i128event.py: Updated STEP L3 code.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3416 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-31 14:57:31 +00:00
terasa
b1151708ef i128event.py: Refactored pha into a generic base class and added pha_step subclass. Adapted depending code.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3415 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-31 13:36:47 +00:00
terasa
52fc2960e5 pipe.py: When using file output pipe.py will now output using numpy.savetxt.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3414 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-31 13:04:55 +00:00
terasa
85a712e9ad pipe.py: __str__ will print whole data as huge array (consider adding numpy.savetxt, numpy.memmap or cpickle output?). Deduplicated parser code. Added stepevent.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3413 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-31 12:29:02 +00:00
terasa
284a89d937 stepevent.py: Initial commit.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3411 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-31 10:23:57 +00:00
terasa
9fa9f00f0d i128event.py: Cosmetic change to parser.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3408 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-30 13:30:11 +00:00
terasa
c7ebb78fef i128event.py: Moved parser code to extra function, so that it can be used by other python modules.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3406 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-30 13:25:03 +00:00
stephan
dfa21db131 heteptdig: merge -c 3367 from dig/em/v05
Add a 8-bit port to feed status bits to the status register
	all the way from the toplevel, 
	and used one bit for EEPROM_BUSY.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3387 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-26 13:51:18 +00:00
stephan
996c3d9ca9 heteptdig:
simulate DPS config that actually finds some EPT hits.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3378 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-24 18:54:08 +00:00
stephan
8fd5cdfc56 hamming: remove unused wires
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3375 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-24 14:39:49 +00:00
stephan
81364c2451 memport mem16ee: fix data mux/demux
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3374 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-24 14:30:04 +00:00
stephan
ba7c5c6726 memport mem16ee: fix swapped data bits
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3364 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-23 16:09:17 +00:00
stephan
a355a14e97 memport: fully pad-registered IO in memasync16ee24
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3355 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-22 23:15:28 +00:00
stephan
76cdbe2169 memport: remove unmaintained non-ee versions of sran drivers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3353 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-22 20:59:40 +00:00
stephan
02a7bb488a memport: remove old parameter
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3352 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-22 20:49:11 +00:00
stephan
a3040ddcf3 heteptdig em/v05: merge more IO timing adjustments back into the trunc.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3351 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-22 19:45:53 +00:00
terasa
40ab29a565 step.l3: Fixed energy bin calculation.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3347 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-22 14:51:17 +00:00
stephan
3ec69551f7 heteptdif em/v05:
merged IO timing patches from v05 into trunc


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3336 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-21 22:38:22 +00:00
stephan
9a10def9fd memport: fix buf in memwindow: heed the _add_ input
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3335 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-21 21:49:08 +00:00
terasa
b4034866b6 step*.l3: Histogram code for single hit triggers.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3282 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-16 12:22:29 +00:00
terasa
271fd18200 step*.l3: Initial commit of STEP L3 trigger code.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3263 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 15:50:13 +00:00
stephan
32b31790ee pipe: fix indentation
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3257 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 14:38:38 +00:00
wetzel
35205e22db tfifo: changed order of declaration (actel compiler)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3252 bc5caf13-1734-44f8-af43-603852e9ee25
2014-10-14 13:11:25 +00:00
stephan
2eb8b88400 message: readbackport: harden a bit against t_busy deadlock at t_den w/o t_init
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3187 bc5caf13-1734-44f8-af43-603852e9ee25
2014-09-21 22:58:36 +00:00
stephan
1ee2978677 pipe: reimplement display()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3184 bc5caf13-1734-44f8-af43-603852e9ee25
2014-09-21 19:25:10 +00:00
stephan
4373c430af pipe: naim's work
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3161 bc5caf13-1734-44f8-af43-603852e9ee25
2014-09-09 13:17:07 +00:00
stephan
be25ccadda backend: add port utick
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3136 bc5caf13-1734-44f8-af43-603852e9ee25
2014-08-31 19:14:21 +00:00
wetzel
c464064bd7 icu-message.txt: added enables for STEIN high speed streaming
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3096 bc5caf13-1734-44f8-af43-603852e9ee25
2014-08-27 08:39:36 +00:00
stephan
86360adc83 sirena: fix moved files
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3073 bc5caf13-1734-44f8-af43-603852e9ee25
2014-07-14 18:26:06 +00:00
stephan
53411e61ca pipe: template to start ..
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3053 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-24 10:14:50 +00:00
stephan
b98119943f pipe: fix symlinks
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3049 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-19 13:48:54 +00:00
stephan
af219bff42 pipe: new directory and Makefile
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3040 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-16 10:51:18 +00:00
stephan
18fbe6daec sirena: new frontend ports
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3033 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-11 15:29:55 +00:00
stephan
a99bf2fbcf cdpu: boot table
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3027 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-09 01:34:40 +00:00
stephan
94ef58660f config: messages, boot table
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3016 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-05 23:01:26 +00:00
stephan
98a9209385 tfifo:
add one more condition for push1 to make submission more robust
	in the presents of a full input accumulator


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3003 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-05 10:49:21 +00:00
stephan
565e6fe4df icu: configtable.py
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3002 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-04 22:10:27 +00:00
stephan
16549bb821 uart PPS:
Fix the pps multiplexer to only get tooseldom when valid pps
	are received on the other line.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3001 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-04 21:16:33 +00:00
stephan
d4a9658f61 i128 event streaming:
Sparse events streaming was broken, the non-readout channels
   submit 32 bogus bits into the tfifo, which overflow the input
   accumulator.  Fixed.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3000 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-04 16:05:59 +00:00
stephan
10fc3e1349 uart:
When two PPS sources are present, and the active one stops,
	it was not marked bad, because there were no bad pulses coming,
	just waiting for the next pulse.

	This patch marks a PPS source bad when two good PPS come in on 
	the other line.  The higher frequency source will win.

	The pps status mux was changed to show the bits from the inactive
	source. 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@2980 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-02 21:04:12 +00:00
stephan
6e2deb2d1d ept L3: fix PHA priorities
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@2977 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-02 11:46:05 +00:00
stephan
f948f6a03c l3: test ept.l3 with real data
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@2974 bc5caf13-1734-44f8-af43-603852e9ee25
2014-06-01 22:42:45 +00:00
stephan
acc8e4d869 backend:
add .reset() to readback
	add register to abort
	do not reset enable at abort, but at atbrk


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@2931 bc5caf13-1734-44f8-af43-603852e9ee25
2014-05-23 11:39:28 +00:00
stephan
e153d3ea19 icucore pps_gen: add precale parameter
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@2894 bc5caf13-1734-44f8-af43-603852e9ee25
2014-05-16 15:06:11 +00:00
stephan
c7ae9454f3 uart: fix multisecond PPSrx
The PPS receiver module is supposed to test if the period of the 
	PPS signal is a multiple of a second.  When the counter reaches a 
	good part into the 2nd second, the count shall be reduced by the
	amount worth one second.  It was counting well into the 3rd second
	instead, so that a frequency error of plus one second was detected
	when the next PPS eventually arrived.

	This patch moves the reduction to a counter value of 0.7s 
	(from 1.04s).  The counter starts at -1s.  When the next PPS 
	arrives, the value should be close to zero.  At +0.7s the counter
	is set back to -0.3s, to accept a PPS at the end of the next
	full second.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@2870 bc5caf13-1734-44f8-af43-603852e9ee25
2014-05-15 21:09:59 +00:00