Commit graph

9,307 commits

Author SHA1 Message Date
stephan
5487604a99 hetept_calib: add path to l3 as set by solopath
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5329 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 19:52:26 +00:00
stephan
38c6b849ed l3.py: add l3().path
both filenames on teh commandline and .include files are searched in .path.
	option -Ipath
	-q resets verbosity to 0
	.compile() returns self


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5328 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 19:50:54 +00:00
stephan
6577ab6c1d hetept_calib: load l3 calib values files into a python object
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5327 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 17:43:19 +00:00
stephan
9dac64c85e l3.py: do not accumulate repeated -v option parsing
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5326 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 17:42:15 +00:00
stephan
90a31acc2c solopath: workaround for ipython bug when starting .../solopath.py
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5325 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 17:41:11 +00:00
stephan
77c3b5fef3 l3.py: is now a 2-pass assembler
Currently, the old one-pass mode is still default.
	Use option -2 for 2-pass mode.
	Use option -1 for 1-pass mode, when the default changed.
	New option -F for the name of the forwardfile
		if given, the name in the code is ignored with a warning.
	In 2-pass mode, no forwardfile is read, nor written.
	The compiler issues the second pass only when there are forwardconflicts.
	In 1-pass mode, the forwardfile is written only when there are forwardconflicts.
	All file output, except for the log, is now written at the end of the last pass.
	Default output format is "none", i.e., no output will be generated.
	Optiuon -g accepts an optional format string
		-g 'hex,printf-format-string'
		-g 'dis,l3dis-format-string'
	-g hex requires a printf format for (addr,instr)
		"@%03x %08x\n"
	-g dis requires an l3dis format string.
		"@%(addr)-3d %(cond)-3s %(mnem)-5s %(args)s\n"
	-g verilog is the same as -g hex, with a different default format
		" l3_code(10'h %03x, 32'h %08x);\n"
	-g python is again the same as hex, but with an additinal file header.
		"	l3_code(0x%03x, 0x%08x)\n"


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5324 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 16:08:02 +00:00
stephan
17577502af l3.py: class lexer(str)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5323 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-27 13:49:53 +00:00
stephan
cd62e6725f l3.py: l3 is now loadable as a module
class l3
	class include_stack
	TODO: output into self.l3code[]
	TODO: class expression_parser_context
             self.EC = expression_parser_context(self.names)
	     s,v = self.EC.parse_EXPR(s)
	TODO? class lexer
             those s become lexer instances


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5322 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-26 10:52:47 +00:00
stephan
43ea1423d6 flyrena: fix IO_STANDARD assinment
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5321 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-25 12:06:38 +00:00
stephan
c7c9a06187 calibration: fixes, reduce em1_muonsruns_bb.hist to two runs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5320 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 09:33:34 +00:00
stephan
478b71ed14 em1_muonsruns_bb: list of EM1 HET muon runs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5319 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:23:54 +00:00
stephan
bce8e6d2dd calibration.gpt:
add landau+tail model, to be used for HET BB muon spectra
	Jan T's HET BB simulations, with cosine exponent scan
	EM1 BB muons
	FM1 Bi207 xrays 2016-03-11-fm1-bi207-ept-1_xrays
	FM1 TCT 2016-04-13-fm1-2B-Bi207-xray-nom, EPT, incomplete
	mean EM[12] BGO/Si ratio


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5318 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:22:13 +00:00
stephan
c30de05ffc gse/hetept/Makefile: add targets
%.bb_itf   HET B-B coincidences
	%.bb_hist
	%.pha_ift  all isPHA() (needed is for counting, ...)
	%_cold_xrays.hist  EPT temperature below -33°C
	%_hot_xrays.hist   EPT temperature above +35°C


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5317 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:16:41 +00:00
stephan
5dd0ef6e24 hetept{hist,xrays}.awk: reimplemenmt on top of HETEPT.awk
heteptxrays.awk becomes a lot more efficient with the new isXrays() function


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5316 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:13:27 +00:00
stephan
b44eda1dc4 HETEPT.awk:
add isSTEP_PHA(ix, ch)
	add isXrays()
	make isXray(i) more efficient via isXrays()
	add flag PRESCALED=0|1 for PHA packet data
	add array NAME[] going from ch number to name and back
	add string NAMES


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5315 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:10:43 +00:00
stephan
37981f21a9 update_fm1_v1_v2: execute the update index
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5314 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:06:44 +00:00
stephan
6f859794da message: use the msg_receiver module in message
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5313 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:05:38 +00:00
stephan
0ab880b690 icu.py: a new icu simulator
It has a congiguration memory.
	It can connect to units.
	It can execute service (128,10?) telecommands.
	It successfully runs the FM1 v0001->v0002 patch procedure.
	It has not been tested with real units, yet.
	See update_fm1_v1_v2.py for how it works!


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5312 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-21 14:24:41 +00:00
stephan
2ce28948c3 hetept1/v0002 files
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5311 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 23:33:45 +00:00
stephan
69476c2c08 hetept1/v0002
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5310 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 23:32:02 +00:00
stephan
33d15d1c7b hetept_config: version 2
export patch upload tcs for v0001 table


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5309 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 23:23:37 +00:00
stephan
d8207f172c configtable: implement .upload_index_patch()
add .copy() to configtable; and itemplacement
	add configtable.split()
	allow configtable.patch_map() to split a message_index
	add configtable.upload_index() to return a list of message_index 
           which write the table into EEPROM
	all this makes no sense, because a table never needs to be patched to write itself :-)
	TODO: read a .txt into a table and go from there.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5308 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 22:37:42 +00:00
terasa
89ba90606c configtable.py: Only apply delay and flags to the first message block, when truncating message_blocks into multiple ones due to size limit.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5307 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 19:20:09 +00:00
terasa
b06ebb9a44 step.l3: Changed semantics of ix?_px??_ped, to be the pedestal in ADC counts, not in eV.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5306 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 16:42:36 +00:00
terasa
d11a096944 step_base_config.py: Added .txt output to main()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5305 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 15:37:24 +00:00
terasa
2fe74b1abd configtable.py: Made message_index maxsize an ctor argument (currently defaults to 256).
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5304 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 15:10:46 +00:00
terasa
7a8d481310 configtable.py: Added limit on message_block size (maxsize=256) when adding blocks to message_indices, as per request from ICU/Alberto.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5303 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 12:57:42 +00:00
stephan
23b93adfd3 message: copy msg_receiver out of module message
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5302 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 11:36:44 +00:00
terasa
a4ab25840f configtable.py: Allow slice indexing on configtable objects.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5301 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 11:23:38 +00:00
boden
906b77c80a l3/Makefile: added targets hetept_l3[cv], step_l3[cv], l3[cv]_all
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5300 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-19 12:19:18 +00:00
terasa
01ec2bb777 step.l3: Removed workaround due to r5298.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5299 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-19 12:06:42 +00:00
boden
b8204009db l3/Makefile: allow to make variants without model, i.e. step_small_l3.py
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5298 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-19 10:09:03 +00:00
stephan
714c8520e5 l3.py: implement class token()
lex() returns a token() object now.
	That makes for a lot more readable code.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5297 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 21:50:33 +00:00
stephan
2c13906082 l3.py l3.tex:
disallow ',' as separator for ADDI, ADD, SUB, HIST.
	allow only matching operator with ADD and SUB
	fix unary operators, allow unary +
	documentation fixes 


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5296 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 20:19:48 +00:00
stephan
c5c178f93b l3.tex:
fix garbled CMP parser syntax
	add caveat to ADD/SUB/HIST
	order '<<'| '>>'


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5295 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 19:21:19 +00:00
boden
d6ff180321 l3/Makefile: added *_*.l3c and *_*.l3v to the MODVAR section
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5294 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 18:00:32 +00:00
stephan
4ad3aceec2 l3.tex:
add formal syntax rules to all intructions
	add syntax rules for expressions
	explain register type expressions
	$functions
	explain """ python comments
	.name, .version
	.if etc.
	.print substitutions


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5293 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 17:18:35 +00:00
stephan
2b4c190a61 l3.py: message formatting enhancements
catch all exceptions
	filename and linennumber added in except clause
	also print input line
	-h usage()


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5292 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 14:44:17 +00:00
stephan
c3cef62d42 l3.py: Register() rework
addr is a Register
	Register is explicitly immutable
	Register throws fewer explicit exceptions
	str(R) = 'R[a]'
	repr(R) =  'Register(a)'
	VEXPR only accepts (int,long)
	MULI R[] * MEXPR >> AEXPR
	fix BUG in RRNG{n} (single bits)


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5291 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 11:19:09 +00:00
stephan
3b4fa9b1b3 cecederena:
fix bitrot 
		location of module countbits
		ports of module frontend
	consistently use fifo_halffull[2]


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5290 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-17 19:41:49 +00:00
stephan
0a62481dff txt2eeprom: parse config table dump info a configtable object
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5289 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-17 16:00:53 +00:00
boden
e78a8cf703 l3.py: Changed the order of operations to the C standard for the
expression parsers:
          EEXPR: [!] [-] [ (EXPR) | R[EXPR] | ID | $FUNC(EXPR) | int | float ]
          MEXPR: EEXPR [ { * | / } EEXPR ]
          AEXPR: MEXPR [ { + | - } MEXPR ]
          EXPR:  AEXPR [ { << | >> } AEXPR ]
        Also fixed MULI so it accepts:
          MULI R[x] * AEXPR
          MULI R[x] * AEXPR >> AEXPR
        In the second case both values have to be integers in the 
        correct ranges.
ep.l3:  Changed the one instance in all our l3 files, where the above
        change caused a problem


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5288 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 16:21:53 +00:00
stephan
0c0a359407 hetept calibration: new muon MC spectra, fit range [e-3*s:e+3*s]
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5287 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 15:28:46 +00:00
stephan
7a38068d92 hetept calib: add MC muon spectra
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5286 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 14:51:40 +00:00
stephan
dd58d50688 HETEPT.awk: executable
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5285 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 14:51:10 +00:00
stephan
7be65091da hetept/Makefile: omit itf_parser from dependency lists
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5284 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 14:49:43 +00:00
stephan
8b57fe1ff2 hetept: remove _sch.pdf
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5283 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:33:46 +00:00
stephan
55d7cbeddb shaper2u2: minor additions
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5282 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:30:50 +00:00
stephan
11a1a7654f calibration: snapshot commit of a lot of work
EM1, EM2, some FM2 updates
	TODO next: FM1.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5281 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:24:33 +00:00
stephan
ddce3c52bb het_calib: update EM1 calib, use xrays where available
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5280 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:21:38 +00:00