Commit graph

9,307 commits

Author SHA1 Message Date
stephan
eb11c39679 ce4.l3: reorg code, so that all required vars are found
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6340 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 16:40:18 +00:00
stephan
b2ba4b570e l3.py: remove misguided flush()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6339 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 16:39:17 +00:00
stephan
bb4b137a6e l3.py:
add .undef
	redfining defined -D or := names will not fail, but warn in pass 1
	.undef and .forward accept list of names 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6338 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 16:37:17 +00:00
boden
fbc2b93fec log2msg.py: changed to produce an executable output (including appropriate usleeps)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6337 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 11:54:36 +00:00
stephan
c41fd062f7 sologse: start without GSE hardware
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6336 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 10:58:41 +00:00
terasa
db29a9000f steinmsg.py: Added caveat about temperature readout.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6335 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 09:51:13 +00:00
terasa
bafd8de269 step_ppss.py: Fixed printing of ppss_table to stdout.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6334 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-12 09:31:30 +00:00
boden
ed940704b9 het_stopping.l3: changed PLC code
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6333 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-11 15:21:57 +00:00
terasa
a15b8bdc02 icu.py: Fix parse_message.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6332 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-10 16:09:20 +00:00
boden
e243fa2111 het_stopping.l3: added path length correction for ABC; also added optional variant V_NO_PLC which disables PLC, since it has minimal effect
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6331 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-10 15:45:42 +00:00
stephan
1d43382e43 script to parse opheater test logs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6330 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-10 15:30:06 +00:00
elftmann
33f1d94a60 het_stopping.l3: Changed histogram sizes
het_calib.l3: Changed cut values for ABnC and ABC. 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6329 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-10 14:30:38 +00:00
boden
614a8f34fd l3.py: fixed bug in ELSEIF
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6328 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-10 11:16:45 +00:00
boden
fe60f0a995 step.l3 and related files: large and small calib are now both included; a switch only needs to change two l3 instructions (please review)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6327 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-09 15:49:19 +00:00
boden
7eb66fda02 het_pen.l3, het_stopping.l3: make compatible for PQM;
might be useful at some point
l3.py: added $def(name), to check if name is defined


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6326 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-09 12:02:06 +00:00
boden
92d5093399 l3.py: integrated conditional expressions into the expressions hierarchy; this allows for .if (a>b)|(b>c)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6325 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-09 11:20:55 +00:00
stephan
7032e199df ce4_ppss: calculate .bps()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6324 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-07 22:19:04 +00:00
stephan
aba0097056 solomsg: fix .read_reg() syntax error
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6323 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-07 22:14:15 +00:00
stephan
48927d8914 nm64: flash
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6322 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:09:32 +00:00
stephan
c47101292c arm: nm64.read_adc()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6321 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:09:10 +00:00
stephan
be1a6d7856 arm nm64: fix nm/adc/man and nm/uart/prescale
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6320 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:08:27 +00:00
stephan
de26c941b6 nm64file new binaray parser
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6319 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:06:10 +00:00
stephan
2b80bd03dc arm: var hk_messages
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6318 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:05:21 +00:00
stephan
384b4b25ca nmrena: fix counter readout
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6317 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:04:31 +00:00
boden
0d5ace45c4 solomsgclass.py: read_reg: added support for old firmware
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6316 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 16:01:26 +00:00
terasa
1da096f726 solomsgclass.py: Added kwargs parameters to read_reg.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6315 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-06 14:18:12 +00:00
boden
50584ceffa het_stopping.l3: use TOT instead of TOT*LET for 1D proton and electron histograms
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6314 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-05 15:30:51 +00:00
boden
131cd74858 dps_table.py: made diff function more general, previously it only worked
if data products didn't change in number or length;
	now they are first aligned in idx and then diffed
hetept_base_config: made changes to support alignment


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6313 bc5caf13-1734-44f8-af43-603852e9ee25
2017-10-05 08:23:31 +00:00
boden
95adfc0189 High-rate mode and temperature changes can now each separately set one flg bit in
the dps_product header. This is done by the ppss table modifying itself, which unfortunately means
we need an additional two (one each for low/high) ppss entries per dps_product.
We still have some reserve though.
hetept_config_*.py: adapted to new syntax


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6312 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-30 19:21:37 +00:00
boden
c8b47cc73d hetept_base_config: small bugfix
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6311 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-29 15:28:11 +00:00
boden
f2ed8245bc Changes to make high/low-rate mode swiches fully othogonal to temperature changes
solomsgclass: allow partial updating of ppss entries (mod or msg)
heteptana: optionally create additional config msgs for high-rate mode (or another idx)
hetept_ppss: mark the duplicate ana entries and switch them on/off with enable_mode()
hetept_base_config: update the configurations for low/high-rate mode


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6310 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-28 13:33:24 +00:00
terasa
bfcef4f710 solorc-step.py: Adapted to new base_config semantics.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6309 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-27 09:42:45 +00:00
terasa
9e9ba4dee3 step_ppss.py: Use disabled pixel thresholds if thresholds are None.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6308 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-27 09:41:25 +00:00
boden
1fa06d4a88 hetept_base_config.py: verbosity changes
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6307 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-26 08:43:35 +00:00
boden
b04ac1ba04 l3.py, dps_table.py, ppss_table.py: allow diffing with an arbitrary number of other instances at once;
a change in any of them will cause the relevant item to be added to the diff
hetept_base_config.py: now fully supports differential temperature and env profiles


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6306 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-25 15:47:40 +00:00
boden
fbe9ab0a73 hetept_base_config.py: now complains if diff configs are not compatible,
i.e. you cannot switch between all of them and return to the original state


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6305 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-25 13:20:46 +00:00
boden
a30750da24 hetept_base_config.py: reorganized; creates one nominal base_config entry and
differential entries for other selected environments and/or temperatures


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6304 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-25 10:32:49 +00:00
boden
80688f5112 l3.py: diffs now consider two consecutive instructions, since solomsg always writes two instructions at once
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6303 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-25 09:24:07 +00:00
stephan
9e55b1d17d ce4.l3: fix thermal neutrons
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6302 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-22 12:15:33 +00:00
boden
6d90d0348a l3.py: fixed a bug in the generation of l3 diffs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6301 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-22 10:55:40 +00:00
stephan
b95b2e778c ce4.l3: fix nthr, its in eV, not A
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6300 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-22 10:27:19 +00:00
stephan
c23c21c2ea ce4_sim.py: load ce4_l3_trigger() and ce4_l1l2().triggermask()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6299 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-21 23:36:52 +00:00
stephan
06de35bc78 ce4.l3: new charged particle trigger
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6298 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-21 20:54:52 +00:00
stephan
fc61b5a196 ce4.l3: work in progress
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6297 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-21 18:44:21 +00:00
stephan
18a95e7974 ce4.l3: charged particles only in A1. TODO: rewrite LET
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6296 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-21 13:42:21 +00:00
stephan
f8f4d2bc53 ce4ana: verfiy builds on blaulicht and falbala
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6295 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-20 20:03:24 +00:00
stephan
e3e47dcf3c C'E4 LND ce4ana Altera bitfile with swapped SCLK pins
Due to a bad symbol for the LVDS transceiver chip, the SCLK pins
	on the shadc board are swapped.  For FM/FS this was easiest to fix 
	by swapping the leads of the MDM51 pigtail on the ana board.
	On the EM model, this fix shall be implemented inside the ce4ana FPGA.
	This commit attempts to do just that.

	The old ce4ana bitfile was compiled before some clockbuffer and 
	experimental DDR code was committed, but that should not have any 
	impact.  Let's see.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6294 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-20 19:27:40 +00:00
stephan
8cc2bd42df hertz_hvps_demo: add HV output terminals
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6293 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-20 13:47:30 +00:00
boden
04505a5b4f l3.py: .macro, .for and .loop now also support the ${} syntax for variable replacement
This also allows for macros with more than 9 arguments, i.e. ${10}


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6292 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-20 10:27:49 +00:00
stephan
92f0176ff1 ce4.l3: use .loop, fix some log output
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@6291 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-19 19:46:48 +00:00