Commit graph

2,015 commits

Author SHA1 Message Date
Stephan I. Böttcher
f626c39927 update_fm1_v1_v2: execute the update index
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5314 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-23 08:06:44 +00:00
Stephan I. Böttcher
b91222a8cb 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/home/subversion/stephan/solo/eda/python@5312 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-21 14:24:41 +00:00
Stephan I. Böttcher
68586e5167 hetept1/v0002 files
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5311 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 23:33:45 +00:00
Stephan I. Böttcher
419b3893fa hetept1/v0002
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5310 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 23:32:02 +00:00
Stephan I. Böttcher
ac26505ba7 hetept_config: version 2
export patch upload tcs for v0001 table


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5309 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 23:23:37 +00:00
Stephan I. Böttcher
35002d334c 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/home/subversion/stephan/solo/eda/python@5308 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 22:37:42 +00:00
Jan Christoph Terasa
536d8e1cca 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/home/subversion/stephan/solo/eda/python@5307 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 19:20:09 +00:00
Jan Christoph Terasa
dd7fde17e8 step.l3: Changed semantics of ix?_px??_ped, to be the pedestal in ADC counts, not in eV.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5306 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 16:42:36 +00:00
Jan Christoph Terasa
60dc8798a0 step_base_config.py: Added .txt output to main()
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5305 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 15:37:24 +00:00
Jan Christoph Terasa
a2d7917411 configtable.py: Made message_index maxsize an ctor argument (currently defaults to 256).
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5304 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 15:10:46 +00:00
Jan Christoph Terasa
651c2a27be 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/home/subversion/stephan/solo/eda/python@5303 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 12:57:42 +00:00
Jan Christoph Terasa
5b829008c6 configtable.py: Allow slice indexing on configtable objects.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5301 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-20 11:23:38 +00:00
Sebastian Boden
b6d4a06269 l3/Makefile: added targets hetept_l3[cv], step_l3[cv], l3[cv]_all
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5300 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-19 12:19:18 +00:00
Jan Christoph Terasa
0d0296411e step.l3: Removed workaround due to r5298.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5299 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-19 12:06:42 +00:00
Sebastian Boden
aa0f99226a l3/Makefile: allow to make variants without model, i.e. step_small_l3.py
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5298 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-19 10:09:03 +00:00
Stephan I. Böttcher
631f9345b0 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/home/subversion/stephan/solo/eda/python@5297 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 21:50:33 +00:00
Stephan I. Böttcher
1a10d0acc5 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/home/subversion/stephan/solo/eda/python@5296 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 20:19:48 +00:00
Sebastian Boden
28abfb046d l3/Makefile: added *_*.l3c and *_*.l3v to the MODVAR section
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5294 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 18:00:32 +00:00
Stephan I. Böttcher
e9a0231192 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/home/subversion/stephan/solo/eda/python@5292 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 14:44:17 +00:00
Stephan I. Böttcher
62dc6062e4 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/home/subversion/stephan/solo/eda/python@5291 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-18 11:19:09 +00:00
Stephan I. Böttcher
ce74a93b7f txt2eeprom: parse config table dump info a configtable object
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5289 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-17 16:00:53 +00:00
Sebastian Boden
796afb8db0 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/home/subversion/stephan/solo/eda/python@5288 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 16:21:53 +00:00
Stephan I. Böttcher
45bf35c581 het_calib: update EM1 calib, use xrays where available
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5280 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:21:38 +00:00
Stephan I. Böttcher
cf57a63dd4 solopath: make executable for module tests
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5279 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:18:17 +00:00
Sebastian Boden
480469cab7 l3.py: fixed a bug in MULI / parse_SEXPR(), where instructions like:
MULI R[.-1] * 5 >> 5
	i.e. where the factor is below 1, would result in a multipier
	of 0, if shift value was explicitly given.
l3dis.py: changed output for GOTO to GOTO R[x]


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5276 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-14 15:56:15 +00:00
Sebastian Boden
3d9eab3537 l3.py: implemented a Register class, which holds Register addresses.
This allows the parser to distinguish between Registers and 
        values and thus detect errors.
        Register objects are constructed by:
                R[x], where x can be an ID, expression or Register
                ID = [COND] INSTR
                .
                Register +- i, where i is an integer
	In effect everything should work as before, only the PHA
	and GOTO addresses need to be defined like: 
		HIT_0 = R[0xe0] or GOTO R[0x002]
step.l3, step_pha.l3, het_pen.l3, hetept_pha.l3:
	made the (few) necessary changes as above;
	The *_l3.py files are identical to before.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5275 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-14 12:51:50 +00:00
Stephan I. Böttcher
b5d56ee938 configurations: add CRC to config summary lines
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5270 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 11:35:43 +00:00
Sebastian Boden
55f5efa891 step_config.py: fixed a small bug I noticed in the main function
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5269 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 09:48:47 +00:00
Jan Christoph Terasa
713103c184 step_config: Restructured to use one file per config. step_config.py imports all files and can be used as before.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5268 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 07:39:58 +00:00
Jan Christoph Terasa
f5ca050881 step_ppss.py: Moved deadtime reset to an earlier point in time, after sending of HK.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5267 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 07:38:33 +00:00
Sebastian Boden
dfa18b207d hetept_config.py: updated the generic config (not sure if we still need this)
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5266 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 12:11:12 +00:00
Sebastian Boden
9f5a47f99b solorc-hetept.py: changed StartNominal()
make_hetept_files.sh: updated


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5264 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 11:00:09 +00:00
Jan Christoph Terasa
dd2998db28 configurations.txt: STEP -> STEP-FM
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5263 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 08:24:45 +00:00
Sebastian Boden
d519fde2e3 ept.l3: fixed a bug, where a CMP was comparing a register with a constant;
also adapted PQM ifdef and moved calibration scaling to here 
	from ept_calib.l3
ept_calib.l3: 	calibration should now be in keV/A, 
		used new $LOG function to clean up the file
hetept_config.l3: added ept_pha tags


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5262 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-11 16:23:32 +00:00
Jan Christoph Terasa
b8587d04b6 step_dps.py: Added section printout.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5261 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-11 12:17:04 +00:00
Jan Christoph Terasa
b5edf147fe step_dps.py: Fixed a bug in xyhist2, and added printing of resulting data product binnings.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5260 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-11 09:16:31 +00:00
Jan Christoph Terasa
d8c21bbf2e step_dps.py: Added new 2d hist function with option for non-uniform xbins.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5259 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-10 22:29:40 +00:00
rshgse
5b2f892af9 het_stopping_fwd.l3, het_calib.l3, hetept_config.l3: checking in the het stopping trigger from Jan Tammen that we tested at Himac
hetept_config_stopping.py, hetept_config_himac.py:   configuration files used at Himac (now updated to work with new hetept_config API)
hetept_dps.py:	added dataproducts for reading science data at Himac


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5258 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-08 16:16:28 +00:00
rshgse
71777990e0 hetept_config_em2: fixed keV import to occur defore it's used
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5257 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-08 16:11:59 +00:00
Jan Christoph Terasa
1aaa246961 configurations: Added STEP-FM v0001 config.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5255 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 15:36:04 +00:00
Jan Christoph Terasa
19667b905d step_config: Added version number to magic.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5254 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 13:47:41 +00:00
Jan Christoph Terasa
0594bd7d69 step_base_config.py: Added workaround for not having a single ppss_instance in the config, when dealing with insertion slots.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5253 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 12:15:02 +00:00
Stephan I. Böttcher
7d545ad731 new script itf2eeprom.py: extract eeprom image from itf
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5251 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-06 17:51:23 +00:00
Stephan I. Böttcher
5cc0ea91e0 configurations database: hetept version 1 bugfix.
A bug in dps_product.data_size() resulted in random results.
	Comparissons between ModulsValue instances were random.
	This fix happend before the config was uploaded to the unit EEPROM.
	No version bump required.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5249 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-05 20:26:54 +00:00
Stephan I. Böttcher
29100a6a63 het_calib: more EM1 from run 2016-07-01-em1v10-lss-2
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5248 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-05 20:16:10 +00:00
Stephan I. Böttcher
ccd8e37990 solomsg: add ModulusValue.__cmp__(), fixes randomnes bug in dps_product.data_size()
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5247 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-05 20:13:31 +00:00
Stephan I. Böttcher
fe76297c9f configurations database: add master index file
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5246 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 19:09:33 +00:00
Stephan I. Böttcher
f520f65e96 configurations database: create the directory tree
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5245 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 18:41:00 +00:00
Stephan I. Böttcher
eb312e1eb7 het_calib.l3: some measured EM1 points, to be continued.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5244 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 16:19:16 +00:00
Stephan I. Böttcher
30f94e8985 hetept_config: bump config magic version to 1
This marks the snapshot intended for EPD FM integration testing.

	This is all it is: a snapshot of the ongoing config development.
	It will be the first entry in the config database.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5243 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 16:18:18 +00:00