From f36a54122c908d602c2fa4b3541def7b64945de2 Mon Sep 17 00:00:00 2001 From: Tamas Gal <himself@tamasgal.com> Date: Mon, 28 Mar 2022 10:12:50 +0200 Subject: [PATCH] Update to km3net-dataformat 2.2.0 --- src/km3io/_definitions/applications.py | 2 +- src/km3io/_definitions/daqdatatypes.py | 2 +- src/km3io/_definitions/fitparameters.py | 2 +- src/km3io/_definitions/module_status.py | 14 ++++++++++++ src/km3io/_definitions/pmt_status.py | 2 +- src/km3io/_definitions/reconstruction.py | 2 +- src/km3io/_definitions/root.py | 12 +++++------ src/km3io/_definitions/trigger.py | 2 +- src/km3io/_definitions/trkmembers.py | 4 +++- src/km3io/_definitions/w2list_genhen.py | 2 +- src/km3io/_definitions/w2list_gseagen.py | 2 +- src/km3io/_definitions/w2list_km3buu.py | 27 ++++++++++++++++++++++++ src/km3io/_definitions/weightlist.py | 16 ++++++++++++++ 13 files changed, 74 insertions(+), 15 deletions(-) create mode 100644 src/km3io/_definitions/module_status.py create mode 100644 src/km3io/_definitions/w2list_km3buu.py create mode 100644 src/km3io/_definitions/weightlist.py diff --git a/src/km3io/_definitions/applications.py b/src/km3io/_definitions/applications.py index 3feccd5..6baeac0 100644 --- a/src/km3io/_definitions/applications.py +++ b/src/km3io/_definitions/applications.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/daqdatatypes.py b/src/km3io/_definitions/daqdatatypes.py index c7cba3c..581a7d2 100644 --- a/src/km3io/_definitions/daqdatatypes.py +++ b/src/km3io/_definitions/daqdatatypes.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/fitparameters.py b/src/km3io/_definitions/fitparameters.py index 920850b..14c799c 100644 --- a/src/km3io/_definitions/fitparameters.py +++ b/src/km3io/_definitions/fitparameters.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/module_status.py b/src/km3io/_definitions/module_status.py new file mode 100644 index 0000000..e415e2b --- /dev/null +++ b/src/km3io/_definitions/module_status.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +""" +KM3NeT Data Definitions v2.2.0 +https://git.km3net.de/common/km3net-dataformat +""" + +# module_status +data = dict( + MODULE_DISABLE= 0, + COMPASS_DISABLE= 1, + HYDROPHONE_DISABLE= 2, + PIEZO_DISABLE= 3, + MODULE_OUT_OF_SYNC= 4, +) diff --git a/src/km3io/_definitions/pmt_status.py b/src/km3io/_definitions/pmt_status.py index 17afea9..7b73571 100644 --- a/src/km3io/_definitions/pmt_status.py +++ b/src/km3io/_definitions/pmt_status.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/reconstruction.py b/src/km3io/_definitions/reconstruction.py index 8c6556a..2448df7 100644 --- a/src/km3io/_definitions/reconstruction.py +++ b/src/km3io/_definitions/reconstruction.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/root.py b/src/km3io/_definitions/root.py index ca3c2f8..f9a9b45 100644 --- a/src/km3io/_definitions/root.py +++ b/src/km3io/_definitions/root.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ @@ -22,11 +22,11 @@ data = dict( TBRANCH_ONLINE_SUMMARYSLICE= "KM3NET_SUMMARYSLICE", TBRANCH_ONLINE_EVENT= "KM3NET_EVENT" , TBRANCH_OFFLINE_EVENT= "Evt" , - COMPRESSION_LEVEL_ONLINE_TIMESLICE= 2, - COMPRESSION_LEVEL_ONLINE_TIMESLICEL0= 2, - COMPRESSION_LEVEL_ONLINE_TIMESLICEL1= 2, - COMPRESSION_LEVEL_ONLINE_TIMESLICEL2= 2, - COMPRESSION_LEVEL_ONLINE_TIMESLICESN= 2, + COMPRESSION_LEVEL_ONLINE_TIMESLICE= 0, + COMPRESSION_LEVEL_ONLINE_TIMESLICEL0= 0, + COMPRESSION_LEVEL_ONLINE_TIMESLICEL1= 0, + COMPRESSION_LEVEL_ONLINE_TIMESLICEL2= 0, + COMPRESSION_LEVEL_ONLINE_TIMESLICESN= 0, COMPRESSION_LEVEL_ONLINE_SUMMARYSLICE= 1, COMPRESSION_LEVEL_ONLINE_EVENT= 0, COMPRESSION_LEVEL_OFFLINE_EVENT= 1, diff --git a/src/km3io/_definitions/trigger.py b/src/km3io/_definitions/trigger.py index 862ddc4..0e0d87a 100644 --- a/src/km3io/_definitions/trigger.py +++ b/src/km3io/_definitions/trigger.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/trkmembers.py b/src/km3io/_definitions/trkmembers.py index 4355138..0278980 100644 --- a/src/km3io/_definitions/trkmembers.py +++ b/src/km3io/_definitions/trkmembers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ @@ -12,6 +12,7 @@ data = dict( TRK_ST_FINALSTATE=1, TRK_ST_PRIMARYNEUTRINO=100, TRK_ST_PRIMARYCOSMIC=200, + TRK_ST_MUONBUNDLE=300, TRK_ST_ININUCLEI=5, TRK_ST_INTERSTATE=2, TRK_ST_DECSTATE=3, @@ -31,4 +32,5 @@ data = dict( TRK_ST_FAKECORSIKA_CHERENKOV_GAMMA=28, TRK_ST_PROPLEPTON=1001, TRK_ST_PROPDECLEPTON=2001, + PDG_MUONBUNDLE=81, ) diff --git a/src/km3io/_definitions/w2list_genhen.py b/src/km3io/_definitions/w2list_genhen.py index 8d3ceb9..5733799 100644 --- a/src/km3io/_definitions/w2list_genhen.py +++ b/src/km3io/_definitions/w2list_genhen.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/w2list_gseagen.py b/src/km3io/_definitions/w2list_gseagen.py index 024db94..424bb76 100644 --- a/src/km3io/_definitions/w2list_gseagen.py +++ b/src/km3io/_definitions/w2list_gseagen.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """ -KM3NeT Data Definitions v2.1.0-1-ga85a9c1 +KM3NeT Data Definitions v2.2.0 https://git.km3net.de/common/km3net-dataformat """ diff --git a/src/km3io/_definitions/w2list_km3buu.py b/src/km3io/_definitions/w2list_km3buu.py new file mode 100644 index 0000000..0347afe --- /dev/null +++ b/src/km3io/_definitions/w2list_km3buu.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +""" +KM3NeT Data Definitions v2.2.0 +https://git.km3net.de/common/km3net-dataformat +""" + +# w2list_km3buu +data = dict( + W2LIST_KM3BUU_PS=0, + W2LIST_KM3BUU_EG=1, + W2LIST_KM3BUU_XSEC_MEAN=2, + W2LIST_KM3BUU_COLUMN_DEPTH=3, + W2LIST_KM3BUU_P_EARTH=4, + W2LIST_KM3BUU_WATER_INT_LEN=5, + W2LIST_KM3BUU_BX=7, + W2LIST_KM3BUU_BY=8, + W2LIST_KM3BUU_ICHAN=9, + W2LIST_KM3BUU_CC=10, + W2LIST_KM3BUU_XSEC=13, + W2LIST_KM3BUU_DXSEC=14, + W2LIST_KM3BUU_TARGETA=15, + W2LIST_KM3BUU_TARGETZ=16, + W2LIST_KM3BUU_VERINCAN=17, + W2LIST_KM3BUU_LEPINCAN=18, + W2LIST_KM3BUU_GIBUU_WEIGHT=23, + W2LIST_KM3BUU_GIBUU_SCAT_TYPE=24, +) diff --git a/src/km3io/_definitions/weightlist.py b/src/km3io/_definitions/weightlist.py new file mode 100644 index 0000000..e275c11 --- /dev/null +++ b/src/km3io/_definitions/weightlist.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +""" +KM3NeT Data Definitions v2.2.0 +https://git.km3net.de/common/km3net-dataformat +""" + +# weightlist +data = dict( + WEIGHTLIST_GENERATION_AREA=0, + WEIGHTLIST_GENERATION_VOLUME=0, + WEIGHTLIST_DIFFERENTIAL_EVENT_RATE=1, + WEIGHTLIST_EVENT_RATE=2, + WEIGHTLIST_RESCALED_EVENT_RATE1=3, + WEIGHTLIST_RESCALED_EVENT_RATE2=4, + WEIGHTLIST_RUN_BY_RUN_WEIGHT=5, +) -- GitLab