Commit graph

9,307 commits

Author SHA1 Message Date
stephan
ff33589ce5 solopath: make executable for module tests
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5279 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-15 09:18:17 +00:00
stephan
669eb76c06 ccdstream: fix -p
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5278 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-14 20:58:37 +00:00
stephan
6553e2d292 uccd: ipython prompt
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5277 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-14 20:55:08 +00:00
boden
5661a2ce0f 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5276 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-14 15:56:15 +00:00
boden
8a9a937a41 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5275 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-14 12:51:50 +00:00
terasa
3ffd4ecb89 gse/step/Makefile: Remake %.itf targets even if target exists already.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5274 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 21:50:25 +00:00
terasa
4a4944a1da gse/step: 'Borrowed' some useful functions from solorc-hetept.py and adapted Makefile.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5273 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 21:28:59 +00:00
terasa
2e1570db83 gse/step: Moved make_step_files.sh routines into Makefile.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5272 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 21:00:39 +00:00
boden
3264af7096 Moved itf_parser and other parsers from gse/hetept to gse/itf_parser and
copied/adapted the Makefile in both folders.


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5271 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 15:07:39 +00:00
stephan
c331abc691 configurations: add CRC to config summary lines
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5270 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 11:35:43 +00:00
boden
91983fd476 step_config.py: fixed a small bug I noticed in the main function
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5269 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 09:48:47 +00:00
terasa
6333bffde1 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5268 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 07:39:58 +00:00
terasa
ccd44214e9 step_ppss.py: Moved deadtime reset to an earlier point in time, after sending of HK.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5267 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-13 07:38:33 +00:00
boden
508cb8168c hetept_config.py: updated the generic config (not sure if we still need this)
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5266 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 12:11:12 +00:00
boden
6d2da830df removed hetept_dps.defs since it is long out of date
and .defs files should now be generated by hetept_dps.py


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5265 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 11:55:27 +00:00
boden
f4d6e5fa36 solorc-hetept.py: changed StartNominal()
make_hetept_files.sh: updated


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5264 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 11:00:09 +00:00
terasa
f415448e8f configurations.txt: STEP -> STEP-FM
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5263 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-12 08:24:45 +00:00
boden
2b21a59b85 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5262 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-11 16:23:32 +00:00
terasa
0f90ae0217 step_dps.py: Added section printout.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5261 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-11 12:17:04 +00:00
terasa
8ccca7f14e step_dps.py: Fixed a bug in xyhist2, and added printing of resulting data product binnings.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5260 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-11 09:16:31 +00:00
terasa
9ad80f4a7c step_dps.py: Added new 2d hist function with option for non-uniform xbins.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5259 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-10 22:29:40 +00:00
rshgse
661b33731f 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5258 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-08 16:16:28 +00:00
rshgse
fe325319ac hetept_config_em2: fixed keV import to occur defore it's used
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5257 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-08 16:11:59 +00:00
rshgse
467632bd60 himac_quicklook.py: further development during Himac campaign
solorc-hetept.py:	allow loading of hetept_config_stopping for testing


git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5256 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-08 15:23:59 +00:00
terasa
dac1d30146 configurations: Added STEP-FM v0001 config.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5255 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 15:36:04 +00:00
terasa
dfb46530f3 step_config: Added version number to magic.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5254 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 13:47:41 +00:00
terasa
9c6e065ef8 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5253 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 12:15:02 +00:00
stephan
f9e5c075c8 solorc hetept: STREAMTEST() with L2 test triggers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5252 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-07 07:28:46 +00:00
stephan
f65a25c309 new script itf2eeprom.py: extract eeprom image from itf
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5251 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-06 17:51:23 +00:00
panitzsch
224f906a12 solorc-step.py: added temperature readout to threshold documentation
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5250 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-06 05:06:39 +00:00
stephan
d3608a1e36 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5249 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-05 20:26:54 +00:00
stephan
909f6c0623 het_calib: more EM1 from run 2016-07-01-em1v10-lss-2
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5248 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-05 20:16:10 +00:00
stephan
3fb25207ef solomsg: add ModulusValue.__cmp__(), fixes randomnes bug in dps_product.data_size()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5247 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-05 20:13:31 +00:00
stephan
1f2696cb2b configurations database: add master index file
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5246 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 19:09:33 +00:00
stephan
7589697ebf configurations database: create the directory tree
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5245 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 18:41:00 +00:00
stephan
41ffd9087e het_calib.l3: some measured EM1 points, to be continued.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5244 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 16:19:16 +00:00
stephan
7edf546025 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5243 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 16:18:18 +00:00
stephan
dd1183cd89 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5242 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 16:15:13 +00:00
stephan
609d3bcff0 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.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5241 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 16:08:05 +00:00
panitzsch
4532b4dc08 solorc-step.py: modified print out of acquired threshold values
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5240 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 13:50:21 +00:00
terasa
dc97fc99e2 step_config: Added insertion slots.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5239 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 13:19:09 +00:00
panitzsch
6f18b643d8 make_step_files.sh: Updated to new L3 Makefile.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5238 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-04 11:26:42 +00:00
stephan
283393a370 hetept_l1l2: fix misguided attempt to properly reset the L1 triggers
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5237 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-01 18:23:48 +00:00
stephan
022a44b949 hetept_config: new API for passing L3 modules
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5236 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-01 12:31:13 +00:00
stephan
2a46e64b82 hetept_l1l2: properly reset all triggers before set_default_trigger()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5235 bc5caf13-1734-44f8-af43-603852e9ee25
2016-07-01 12:30:27 +00:00
terasa
f8d22cd8a6 step_base_config.py: Refactored to provide a class, which allows easier access to table entries.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5234 bc5caf13-1734-44f8-af43-603852e9ee25
2016-06-30 17:14:59 +00:00
terasa
6bf78f0649 step.l3: Properly define V_SMALL.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5233 bc5caf13-1734-44f8-af43-603852e9ee25
2016-06-30 14:20:49 +00:00
stephan
b93f51b0d1 l3.py: fix bug with nested .ifs
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5232 bc5caf13-1734-44f8-af43-603852e9ee25
2016-06-30 13:32:35 +00:00
terasa
17a7a93130 step.l3: Adopted to new Makefile semantics.
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5231 bc5caf13-1734-44f8-af43-603852e9ee25
2016-06-30 13:12:34 +00:00
stephan
31339ab113 het_calib: use $LOG()
git-svn-id: svn+ssh://asterix.ieap.uni-kiel.de/home/subversion/stephan/solo/eda@5230 bc5caf13-1734-44f8-af43-603852e9ee25
2016-06-30 09:25:57 +00:00