Commit graph

9,307 commits

Author SHA1 Message Date
stephan
111181a371 stein_core: revert -c -3905, most of it
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3907 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-06 16:32:11 +00:00
stephan
f9f41808e0 heteptdig em/v08-rc0: RTAX bitfile
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3906 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-06 15:25:08 +00:00
terasa
8611809628 stein_core.v: Changed event classes 2,3 to multi_hit in ix0,ix1.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3905 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-06 15:04:36 +00:00
stephan
371a785bd2 EEPROM, TxE:
wire TxE to ~confs[5:4], invert EEPROM_nRES
	Both LDVS drivers and the EEPROM are enabled when confs==0.
	Now we can disable the unused LVDS driver. 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3904 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-06 14:58:37 +00:00
boden
8b4e973d07 dps_table.py: fixed some problems with the itf-parser definitions
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3903 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-06 12:59:06 +00:00
stephan
bad25223a1 msg_regs: improve sim startup, issue wait at ack through R=1 ports
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3902 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 15:11:51 +00:00
grunau
11a4798ed6 dps_table.py: added write_defs() to create science definition files from dps table
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3901 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 15:06:42 +00:00
stephan
3dab44c402 msg_regs: revert -c 3869
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3900 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 13:45:27 +00:00
stephan
d1cd2798f7 message: add comment about t_count0
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3899 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 13:42:46 +00:00
wetzel
e1f5298eed step slow control: fixed a minor bug
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3898 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 13:25:44 +00:00
wetzel
6d2f130e20 stein ix controller: removed some comments
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3897 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 11:51:27 +00:00
wetzel
fef02a5f61 stein middleend: removed some comments
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3896 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 11:50:52 +00:00
wetzel
c4ee061efb step test jig: fixed addresses of new readback
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3895 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 11:49:56 +00:00
wetzel
45d138a347 stein_core: some bugs fixed
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3894 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 11:49:09 +00:00
wetzel
98db0e8e7c icu-message.txt: added ADDR for new STEP readback and clarified ADDRs of housekeeping
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3893 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 11:45:33 +00:00
terasa
4db6ea9c39 step.l3: Added CMP to first comparison.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3892 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 10:09:55 +00:00
terasa
a889472c9a itf_parser.c: Reverted changes to ADC calculations. Read stein_ix_controller.v properly next time!
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3891 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-05 06:25:51 +00:00
stephan
9be6aad522 heteptdig em/v08:
Aldec bitfile for flight EEPOM and memasync32ee driver

git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3890 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-04 08:07:43 +00:00
stephan
2b20dc1882 l3/adder: rewrite, to see if the Aldec worst path can be optimized
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3889 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 22:28:52 +00:00
stephan
a0e2942090 hetept: merge -c 3885 from em/v08: synthesis warnings
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3888 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 20:39:30 +00:00
stephan
8993694554 heteptcore: merge -c 3881: fix bug in readback port chain
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3887 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 20:30:50 +00:00
stephan
e8b175b9d3 dps_table: some fixes ...
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3886 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 15:58:13 +00:00
stephan
1dcd3b1754 heteptdig em/v08: fixes for synthesis warnings
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3885 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 15:57:00 +00:00
stephan
85dcaa10c2 heteptdig em/v08: gold for reg reorg
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3884 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 14:28:12 +00:00
terasa
85794307c1 i128event.py: Added read_phas_from_file.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3883 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 14:28:10 +00:00
grunau
f6ebf14272 Test setup in hetept_dps.py
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3882 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 13:54:07 +00:00
stephan
238bd0a156 heteptdig em/v08: synthesis and netlist conversion. Fix bug in core readback chain.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3881 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 12:06:40 +00:00
stephan
eaf423844b heteptdig em/v08: merge -c 3817,3869
* remove rb_wait from backend register readout.
	* wire up both pps_rx status words
	* add scratch register to provide config status in HK.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3880 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-03 09:40:16 +00:00
wetzel
ffc3c0bb44 stein_core: fixed definition of wire
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3879 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-02 15:06:35 +00:00
wetzel
922024c365 Added Parameter to the instance of ix_reset
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3878 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-02 15:06:00 +00:00
stephan
ff0997a31d icu-message: add some STEP resets
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3877 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-02 13:50:57 +00:00
stephan
ace25fa252 stein:
fix package_maker
	remove unused resets
	add deadtime counters


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3876 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-02 13:49:29 +00:00
stephan
c9b1ff4bcd heteptdig: sim new registers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3875 bc5caf13-1734-44f8-af43-603852e9ee25
2015-03-02 07:13:32 +00:00
terasa
df0d42ed5a step.l3: Moved small pixel code into L3 instruction memory of class 1.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3874 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-28 13:41:45 +00:00
terasa
1e6f85a4b5 step.l3: Implemented binary tree search and other trigger classes.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3873 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-28 13:41:45 +00:00
stephan
10f13cd152 heteptdig: gold update, pre reg readout reorg
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3872 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-28 11:38:31 +00:00
stephan
23e9dcb60a pirena pidata: fix gpt scripts
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3871 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-28 11:36:20 +00:00
stephan
440b88a7d4 pirena: adjust Vdac gains
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3870 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-28 11:35:12 +00:00
stephan
364d572809 static register readout:
make the backend register readout engine static, i.e., no waiting.
	add scratch register in the backend [reg 3]
	add pps status for both ports
	move OH status.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3869 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 19:09:29 +00:00
stephan
70dbf81123 stein_core: register readout reorganization
add a teleport
	add a readback engine 'rbx'
	move ix sc and temp readout to the 'rbx' engine
	static register readout reorganization


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3868 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 19:05:54 +00:00
stephan
269cfb96bf heteptdig em/v08: new gold with EEPROM fix
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3867 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 12:57:03 +00:00
terasa
20f04c0666 l3/step.l3: Added calibration of EM2.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3866 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 11:47:42 +00:00
terasa
2027d5e092 itf_parser.c/step_itf_parser.py: Fixed sign extension of STEP ADC diffs.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3865 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 11:40:25 +00:00
stephan
61ca1bbaea heteptdig em/v08: merge -c 3805: fix flight EEPROM timing
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3864 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 08:57:36 +00:00
stephan
5c610d74a0 heteptdig em/v08: version number 0xF7 -> 0xE8
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3863 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-27 08:56:53 +00:00
wetzel
c80b71e49f step core: fixed some bugs, but still one remaining
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3862 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-26 10:54:11 +00:00
terasa
5df9061e93 step*.l3: Implemented STEP L3 trigger for single hit cases (code works for both idefixen):
E_min = 2 keV
	E_max = 128 keV
	96 log2 energy bins (16 bins per factor of 2)

git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3861 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-25 15:27:11 +00:00
terasa
5f7f153868 i128event.py: Added class #3 to STEP L3 trigger classes.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3860 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-25 14:35:41 +00:00
terasa
e8b9294947 i128event.py: Implemented new L3 trigger classes.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3859 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-24 18:34:22 +00:00
wetzel
1533dfa3c0 step: changed test jig
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@3858 bc5caf13-1734-44f8-af43-603852e9ee25
2015-02-24 17:30:30 +00:00