Commit graph

2,013 commits

Author SHA1 Message Date
Stephan I. Böttcher
59c83e3a86 ce4.l3: work in progress
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6297 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-21 18:44:21 +00:00
Stephan I. Böttcher
bf9c0419db ce4.l3: charged particles only in A1. TODO: rewrite LET
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6296 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-21 13:42:21 +00:00
Sebastian Boden
b29c08526b l3.py: .macro, .for and .loop now also support the ${} syntax for variable replacement
This also allows for macros with more than 9 arguments, i.e. ${10}


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6292 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-20 10:27:49 +00:00
Stephan I. Böttcher
28c3bc31c8 ce4.l3: use .loop, fix some log output
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6291 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-19 19:46:48 +00:00
Stephan I. Böttcher
dee42e30f1 l3: gold file target, -g dis add %(instr)
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6290 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-19 19:20:56 +00:00
Sebastian Boden
1cda7a95bf l3.py: added support for macro-loops directives which repeat a
code fragment while replacing one argument with arbitrary strings
Syntax:
.loop varname a bb c 2
.print $varname
.endloop
Result:
a
bb
c
2


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6289 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-19 15:34:47 +00:00
Sebastian Boden
21be848949 het_stopping.l3: fixed hist_base bug, which prevented proper usage of directional histograms;
separated min and max cuts for ABC histograms


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6288 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-19 10:04:08 +00:00
Sebastian Boden
f8a221551e het_stopping.l3: split the ABC histogram into four for electrons(1D), protons(1D), helium (2D) and ions(2D)
het_calib.l3: new cut values for ABC stopping are only placeholders


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6287 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-19 08:55:43 +00:00
Sebastian Boden
0aff8d7e32 l3.py: fixed so that shift operators work again
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6284 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-18 12:18:50 +00:00
Stephan I. Böttcher
c4a0ee6ab0 C'E4 LND L3: minor fix
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6253 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-09 10:09:05 +00:00
Stephan I. Böttcher
df1de687ca C'E4 LND L3: complete and documented
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6249 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-05 15:54:59 +00:00
Stephan I. Böttcher
3822f07f77 C'E4 l3: fix up the existing code
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6247 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-01 15:53:17 +00:00
Stephan I. Böttcher
af8f02f2d9 l3.py:
operators ~ & |
    define variables .PASS and .PASS2
    avoid duplicate entries in .forwards 


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6246 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-01 15:52:26 +00:00
Stephan I. Böttcher
217b31deee l3: add call_trace() to error messages
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6244 bc5caf13-1734-44f8-af43-603852e9ee25
2017-09-01 12:49:11 +00:00
Sebastian Boden
bd5fc5a1c5 solo_printer.py: changed the code structure to make it more readable and maintainable
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6230 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-30 10:17:52 +00:00
Sebastian Boden
3bf1fbd67b dps_table.py: simulating the dps now uses poisson sampling from a given memory image
solo_data.py: added functions to generate these memory images for hetept (work in progress)
solo_printer.py: can now show the data rates (from the simulation) for each product and section


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6226 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-29 15:50:55 +00:00
Jan Christoph Terasa
806f7d15de solo_data.py: Allow setting env=None.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6223 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-28 14:24:57 +00:00
Jan Christoph Terasa
9f958b8b54 solo_data.py: Corrected STEP_basic data product.
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6222 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-28 14:22:16 +00:00
Sebastian Boden
65f60050ba hetept_ppss.py: moved reserved dps entries to just before the clear
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6219 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-28 13:56:27 +00:00
Sebastian Boden
b7b0b957ba hetept_ppss.py: reserve ppss slots for additional data_products
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6214 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-25 15:36:33 +00:00
Sebastian Boden
8d465c16e1 hetept_config, hetept_config_himac, hetept_config_stopping: removed outdated and unused configs
hetept_config_em1: updated to work with current dps


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6213 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-25 12:26:54 +00:00
Sebastian Boden
6ba8071fba step_dps.py: now uses science data from solo_data.py; step_config files still need to be adapted
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6206 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-23 12:13:57 +00:00
Stephan I. Böttcher
367d9aad47 C'E4 LND L3: uncommitted work towards a new L3 trigger
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6205 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-23 09:48:43 +00:00
Sebastian Boden
017e11aa82 solo_data.py: bugfix
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6203 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-23 09:42:46 +00:00
Sebastian Boden
57533d2cf7 solo_data.py: Implemented remaining data products from step_dps.py
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6202 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-23 09:11:46 +00:00
Stephan I. Böttcher
42da22c334 HET/EPT FS config copied and adaptetd from FM1
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6199 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-21 11:00:32 +00:00
Sebastian Boden
3b2ebbab80 solo_data.py: added most STEP data products from step_dps.py
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6196 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-18 09:12:28 +00:00
Sebastian Boden
058aa76e81 solo_data.py: small bugfix for ept and het boxes
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6195 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-17 13:25:50 +00:00
Sebastian Boden
0b46406a75 solo_data.py: - added EPT penetrating data products
- added solo_data classes for HET stopping histograms
	- allows to simulate unit with PHA data


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6193 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-10 15:06:12 +00:00
Sebastian Boden
9d1e7c12d8 dps_table.py: added function simulate_unit to determine precise data rates
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6192 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-10 15:03:01 +00:00
Sebastian Boden
bc3e353550 solo_data.py: - simplified naming of dps_products and sections;
- started to introduce 6 different environments for EPT 
		for more data_rate flexibility
hetept_dps.py:	- solo_data.py now handles naming of dps_products


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6191 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-08 13:17:42 +00:00
Sebastian Boden
92bc3f9f37 solo_printer.py: added a data rate summary section
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6189 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-03 14:16:39 +00:00
Sebastian Boden
2abc63e0a3 hetept_dps.py: adapted the HET dps clears to the current l3 histograms
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6188 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-03 14:15:29 +00:00
Sebastian Boden
c71815c8aa solo_data.py: improved EPT data products for nominal and burst modes
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6187 bc5caf13-1734-44f8-af43-603852e9ee25
2017-08-01 15:11:55 +00:00
Sebastian Boden
5296369797 solo_printer.py: added plots for ept stopping particle bins
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6186 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-31 14:50:24 +00:00
Sebastian Boden
c46a483f99 solo_data.py: small fix to ept boxes--This line, and those below, will be ignored--
M    python/solo_data.py


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6184 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-28 12:36:14 +00:00
Sebastian Boden
87544d373c solo_data.py: added ept pen boxes for he3 and he4
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6183 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-28 11:35:50 +00:00
Sebastian Boden
db629ec560 solo_data.py: implemented all ept pen boxes for protons and electrons
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6180 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-27 14:50:45 +00:00
Sebastian Boden
210ebc9893 l3/hetept_calib.py: plots the calibration factors over a temperature range
het_calib.l3:	fixed calibration bug for C1L and C2L


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6171 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-24 12:46:26 +00:00
Sebastian Boden
dfc2996e62 solo_data, solo_printer: solo_data no longer imports solo_printer,
some work on ept penetrating boxes and skewed ept windows


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6160 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-21 12:39:16 +00:00
Stephan I. Böttcher
9cfe440a1b nm64: frontend board start
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6158 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-20 19:48:39 +00:00
Sebastian Boden
7408bbb10e solo_printer.py: improved the tabular function to allow longer penetrating box descriptions
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6152 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-18 18:15:04 +00:00
Sebastian Boden
1815c733a0 STEP_F*_T_correlated_calibration.l3: moved back to main l3 directory,
also updated Makefile to generate these from the cubic pickle files


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6151 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-18 16:36:00 +00:00
Robert Elftmann
108196664c het_pen_2d.dat: Contains data for e-,H,He,C,N,O,Fe.
solo_data.py: Changed descriptions of het_pen boxes.
solo_printer.py: Adds descriptions(if given) in a new row in the pretty_printer table.


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6148 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-14 11:41:57 +00:00
Lauri Panitzsch
6572c43233 moved STEP FM and FS temperature calibration skripts and results to subfolder "step_T-calib"
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6147 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-13 11:58:05 +00:00
Lauri Panitzsch
70327a8abe STEP_FS_testpulser_Ba133_calibration_JUPYTER.ipynb: Corrected STEP FS thermal calibration calculations (9keV ref line changed to 8.048keV) and updated to be uniform with STEP FM output, accordingly added the new generated calibration files as given below (all files also added in .pickle format):
STEP_FS_T-correlated_calibration_cubic.dat
    STEP_FS_T-correlated_calibration_square.dat
    STEP_FS_calibration_for_IX_21.9_degC.dat
    STEP_FS_calibration_for_IX_8.5_degC.dat
    STEP_FS_calibration_for_IX_-4.8_degC.dat
    STEP_FS_calibration_for_IX_-17.1_degC.dat
    STEP_FS_calibration_for_IX_-29.6_degC.dat
    STEP_FS_calibration_for_IX_-42.2_degC.dat
    STEP_FS_calibration_for_IX_-52.1_degC.dat


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6146 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-13 11:46:31 +00:00
Lauri Panitzsch
9d39636435 STEP_FM_testpulser_Ba133_calibration_JUPYTER.ipynb: unified graphical and textual output with STEP FS thermal calibration, returns two separate files for square and cubic correlation. New generated files are:
STEP_FM_T-correlated_calibration_cubic.dat
    STEP_FM_T-correlated_calibration_cubic.pickle
    STEP_FM_T-correlated_calibration_square.dat
    STEP_FM_T-correlated_calibration_square.pickle
The other files generated with this .ipynb file did not change. 


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6145 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-13 11:30:10 +00:00
Sebastian Boden
c2f98e5c7f solo_data.py: Fixed some problems for het_box
solo_printer.py: Now properly plotting histogram boxes


git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6144 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-11 10:16:58 +00:00
Robert Elftmann
bfefe71712 solo_data.py: Implemented HET boxes and data products;
fixed skew calculation for HET dps
solo_printer.py: Added HET pretty printer



git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6143 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-10 15:13:30 +00:00
Sebastian Boden
5390dab0ff STEP_FM_T-correlated_calibration.l3: regenerated to account for Lauri's changes
git-svn-id: svn+ssh://asterix/home/subversion/stephan/solo/eda/python@6142 bc5caf13-1734-44f8-af43-603852e9ee25
2017-07-10 11:42:41 +00:00