Commit graph

2,014 commits

Author SHA1 Message Date
Stephan I. Böttcher
6338148c89 hetept ppss: do not disable sample readout in calib mode
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6040 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-24 20:54:51 +00:00
Stephan I. Böttcher
75dbef18fe solo_printer: do abort at ImportError pylab
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6039 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-24 20:45:32 +00:00
Lauri Panitzsch
f4a7a4cdde STEP_FM_calibration_for_IX_-xx.x_degC.dat: editor-readable version of calibration parameters for certain temperatures for STEP FM as determined during the final thermal calibration.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6035 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-19 12:38:57 +00:00
Lauri Panitzsch
b223139695 STEP_FM_T-correlated_calibration.dat: editor-readable version of the temperature-correlated calibration parameters for STEP FM as determined during the final thermal calibration.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6034 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-19 12:36:34 +00:00
Lauri Panitzsch
27034aaecf STEP_FM_testpulser_Ba133_calibration_JUPYTER.py: converted the original *.ipynb file to a python file - due to the different character of ipynb some re-arranging was done. Results are identical. Code was cleaned and documented as well.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6033 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-19 12:34:21 +00:00
Sebastian Boden
055a2f97d7 het_pen.l3, het_calib.l3: no more segment addition,
instead reject event if segment energy too similar


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6031 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-12 14:42:18 +00:00
Sebastian Boden
c98317a83d het_pen.l3, het_calib.l3: implemented addition of segments if the
lesser segment is >30keV and has a valid pulse age
	also fixed some whitespace inconsistencies


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6030 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-11 12:33:43 +00:00
Stephan I. Böttcher
ee11fc3cf2 solomsg: C'E4 temp sensor bias R1=12k
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6027 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 20:13:08 +00:00
Stephan I. Böttcher
6ccc3aca09 ppss_table: insertion with larger moduli
C'E4 LND needs insertions at larger moduli.
	class insertion_slot() constructor gains a mod=None parameter.
	class ppss_msg() gets attribute insertion_modulus=modulus_always.
	The insertion_slot_reset modulus will be initialized by .fix_insertion_slots().
	.arm_insertion_slot() copies the reset modulus to the slot modulus.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6026 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 20:10:46 +00:00
Sebastian Boden
9ab5b776fc solo_data.py: added bytag and byunit methods to science_data
solo_printer.py: restructured and added support for displaying data_rates


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6023 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 13:21:56 +00:00
Jia Yu
b4624c9bc3 C'E4 config: noo reset_modulus for temp changes
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6022 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 11:36:53 +00:00
Lauri Panitzsch
86c735b6e1 STEP FM thermal calibration: removed former and bad calibration data to avoid confusion: STEP_FM_T-correlated_calibration_IX*
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6021 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 11:36:05 +00:00
Jia Yu
3850f9806a solomsg: fix ce4_exec()
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6020 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 11:36:05 +00:00
Lauri Panitzsch
d5c5662fb5 STEP FM thermal calibration: New results based on the thermal calibration performed in the scope of NCR-0040
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6019 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 11:25:29 +00:00
Stephan I. Böttcher
c2832543a5 solomsg.ce4_exec(): add icu mode
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6018 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 10:47:53 +00:00
Stephan I. Böttcher
8f420bebd0 C'E4 config: revert the table reoderings, that were only present in the documentation to please a clueless reviewer
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6017 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-07 09:18:16 +00:00
Stephan I. Böttcher
c3463ad116 C'E4 icu table: arrempt to reproduce Jia's hexdump mangling :-(
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6016 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-06 20:19:18 +00:00
Jia Yu
f87cedcf00 C'E4 config: fix table[3] is temp 0 mode
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6015 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-06 09:42:22 +00:00
Sebastian Boden
a17c6cfe8b solo_data.py: some improvements for step_bins
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6014 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-05 15:03:46 +00:00
Jan Christoph Terasa
51eb914245 solo_data.py: Properly indent code.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6013 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-05 08:45:48 +00:00
Jan Christoph Terasa
6916e525cb solo_data.py: Some early work on STEP data products. Implemented energy 2D energy bins for pixel histograms.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6012 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 15:54:01 +00:00
Jan Christoph Terasa
cc5e171995 configurations/data_products: Check in data product definitions discussed at Feb. meeting. These should be replaced as soon as the solo_data pipeline is able to create proper output.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6011 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 14:01:51 +00:00
Jan Christoph Terasa
9c276b23ab solo_data.py: Mostly non-functional stub of step_data.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6009 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 10:29:52 +00:00
Jan Christoph Terasa
b70bff8471 step_config.l3: Add e0=16eV.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6008 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 10:29:03 +00:00
Jan Christoph Terasa
388e65522b step_l3_trigger.py: properly init self.model
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6007 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 10:28:35 +00:00
Stephan I. Böttcher
d3800d5759 C'E4 L3: neutral hists start at 30 keV
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6006 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 07:39:55 +00:00
Stephan I. Böttcher
09c1d5bfee solomsg: fix HK temperature conversions
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6005 bc5caf13-1734-44f8-af43-603852e9ee25
2017-04-04 07:39:04 +00:00
Stephan I. Böttcher
23b13979ab C'E4 L1l2: fix
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6001 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-30 19:33:06 +00:00
Sebastian Boden
53fb0f42dd dps_table.py: fixed a bug in enc_schedule(), now works as in verilog
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5999 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-30 15:09:26 +00:00
Sebastian Boden
2e3b428c34 l3sim.py: added a subclass l3pipe which implements HIST memory and PHA buffers
hetept_sim, step_sim: now inherit from this class; replacement for l3pipe.py
	hetept_sim reads trigger_class from REG STATUS lines


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5997 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-30 12:27:50 +00:00
Stephan I. Böttcher
97b0296c69 C'E4 L1L2: more LET geometry factor, Heavy Ions
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5995 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-28 22:11:25 +00:00
Stephan I. Böttcher
af6f10bb59 C'E4 ppss: science is issued in sec 9, not sec 0
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5993 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-28 20:23:32 +00:00
Sebastian Boden
a6d41dedfc hetept_dps.py: added function simulate_unit(), which takes PHA data,
e.g. EHETEPT or 0x57ea, pipes it through the l3 trigger,
	then simulates the DPS and returns the data rate
dps_table.py, hetept_sim.py: some changes to accomplish this


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5990 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-28 13:25:14 +00:00
Sebastian Boden
d83b4bf735 l3pipe.py: fixed whitespace inconsistency
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5989 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-28 13:19:56 +00:00
Stephan I. Böttcher
070cdd3e23 C'E4 L2 trigger: proposal for flight
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5988 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-27 15:59:21 +00:00
Stephan I. Böttcher
577902376f C'E4 config fixes. SCIMEM delivers spectra
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5987 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-24 16:40:49 +00:00
Stephan I. Böttcher
89f08c6dbe ce4_config for em1 w/ l3
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5986 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-24 13:06:02 +00:00
Stephan I. Böttcher
f8ae4855d2 l1.del_bits()
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5985 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-24 13:04:19 +00:00
Stephan I. Böttcher
242d2537fd C'E4 ppss: (re)assign PPS slots to telemetry
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5982 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-23 20:18:34 +00:00
Sebastian Boden
3ab1679140 l3.py: added new function $LOGR(x), which returns int(floor(16*log2(x)))
ept_calib.l3, het_calib.l3: use $LOGR for all ratio calculations
			==> compiled code remains unchanged


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5981 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-23 15:40:22 +00:00
Stephan I. Böttcher
e83c83673c l3 $LOG:
revert -c 5976
	$LOG was supposed to yield exactly the same as the LOG opcode.
	The LOG opcode adds 0.499 to the argument.
	For L3 calib calculations, the old $LOG works better.
		LOG opcode:   16×log₂(2x+0.99)
		$LOG:         16×log₂(2x)


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5977 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-23 12:50:47 +00:00
Sebastian Boden
505f4339d1 l3.py: changed LOG function to int(16*log2(n+.5)+16) as in verilog implementation
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5976 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-23 11:06:29 +00:00
Sebastian Boden
e0fc923ee4 dps_table.py: further fixes for ccsds packets
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5966 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-21 13:24:15 +00:00
Sebastian Boden
4668cc5f20 dps_table: now outputs correctly formatted CCSDS packet during simulation
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5963 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-20 16:10:53 +00:00
Sebastian Boden
a4bb3282b3 solo_data.py: added packetid according to gnumeric table
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5962 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-20 09:39:08 +00:00
Sebastian Boden
43aa68da7a dps_table.py: fixed a bug and changed set_tmod() to work
step_dps.py: minor fix in do_lowlatency()


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5961 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-18 12:46:20 +00:00
Sebastian Boden
686a795573 dps_table.py: fixed the crc issue and implemented ccsds packet generation
and data_rate calculation and verbosity settings
compression.py: fix for log2(0)


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5960 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-18 11:57:49 +00:00
Sebastian Boden
c56fd83c4f dps_table, solo_data, compression: dps_table.simulate() now simulates the dps scheduler
and returns (mostly) functional itf binary packets. crc still needs to be fixed


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5954 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-17 17:00:22 +00:00
Sebastian Boden
c202d09f39 dps_table.py, solo_data.py: allow simulating of an entire dps_table
generated from science_data for a given modulus and 
        L3 histogram memory image


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5947 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-15 18:38:16 +00:00
Stephan I. Böttcher
d90a6f01b6 ce4_config: link streamtest to entry [15]
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@5939 bc5caf13-1734-44f8-af43-603852e9ee25
2017-03-13 20:34:12 +00:00