SolO/solo_config
3
1
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity
1,894 commits 19 branches 9 tags 8 MiB
Commit graph

1,894 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephan I. Böttcher
4d0b2a5928 hetept_config FM1 and FM2: shift hist activities 
Histogram window checkout raises the primary power consumption by a few mA.
	This patch shifts the scheduling of these activities to different times for the
	two flight models, and also the clear activity away from the STEP schedule.

	This avoids that all units raise their power at the same time.  A detailed
	analysis how well separated the data products are is pending, until the
	config becomes more complete.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5242 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-07-04 16:15:13 +00:00
Stephan I. Böttcher
a871bd76d1 hetept_ppss: move insertion slot i800 to 860ms 
HET/EPT shall minimise use the SRAM bus simultaneously by multiple ports.
	i800 is meant for things like EEPROM writes or diagnostic reads.
	This moves the slot beyond hist clear.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5241 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-07-04 16:08:05 +00:00
Jan Christoph Terasa
44917d1e74 step_config: Added insertion slots. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5239 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-07-04 13:19:09 +00:00
Stephan I. Böttcher
2ff5a40465 hetept_l1l2: fix misguided attempt to properly reset the L1 triggers 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5237 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-07-01 18:23:48 +00:00
Stephan I. Böttcher
186eb317e0 hetept_config: new API for passing L3 modules 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5236 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-07-01 12:31:13 +00:00
Stephan I. Böttcher
c4059c1558 hetept_l1l2: properly reset all triggers before set_default_trigger() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5235 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-07-01 12:30:27 +00:00
Jan Christoph Terasa
166b7edffa step_base_config.py: Refactored to provide a class, which allows easier access to table entries. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5234 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 17:14:59 +00:00
Jan Christoph Terasa
3ca2efa70c step.l3: Properly define V_SMALL. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5233 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 14:20:49 +00:00
Stephan I. Böttcher
2ef60b082d l3.py: fix bug with nested .ifs 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5232 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 13:32:35 +00:00
Jan Christoph Terasa
bc284a70c4 step.l3: Adopted to new Makefile semantics. 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5231 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 13:12:34 +00:00
Stephan I. Böttcher
a47b9cd830 het_calib: use $LOG() 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5230 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 09:25:57 +00:00
Stephan I. Böttcher
fc9c9c1447 implement $LOG() and other functions 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5229 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 09:25:38 +00:00
Stephan I. Böttcher
6ee0693a28 L3 makefile: all new and shiny, build all models and variants 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5228 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 08:43:27 +00:00
Stephan I. Böttcher
b08b1c59a7 l3.py: implement -M 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5227 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 08:42:52 +00:00
Stephan I. Böttcher
d4ef60f534 hetept_config.l3: comment fixes 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5226 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 08:41:51 +00:00
Stephan I. Böttcher
62e5a3e440 hetept_pha het_calib: need not be python compatible 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5225 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 08:41:08 +00:00
Stephan I. Böttcher
d8c1114297 hetept_l1l2: raise EPT AC threshold to 60keV 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5224 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-30 08:38:58 +00:00
Stephan I. Böttcher
dd7f90d278 L3: revisions and names of included L3 source files, python compatibility 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5223 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-29 13:25:26 +00:00
Stephan I. Böttcher
b6b4a2a2da het_calib.l3: fix A22H_calib 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5222 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-29 12:57:59 +00:00
Stephan I. Böttcher
a43bb3e9f8 het_pen.l3: add whitespace 
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5221 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-29 12:18:17 +00:00
rshgse
ec2e668e9e hetept_dps.py: added configuration for Himac data products 
hetept_config_himac.py:	load the correct configuration


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5220 bc5caf13-1734-44f8-af43-603852e9ee25
 2016-06-29 11:14:35 +00:00