Merge branch 'update-km3net-dataformat' into 'master'

Update km3net dataformat See merge request !51

Merge branch 'update-km3net-dataformat' into 'master'
1eb9ee36 · Tamas Gal · a7277b71 · 0d10d4cf · 1eb9ee36 · 1eb9ee36
Commit 1eb9ee36 authored 4 years ago by Tamas Gal
--- a/km3io/_definitions/daqdatatypes.py
+++ b/km3io/_definitions/daqdatatypes.py
+# -*- coding: utf-8 -*-
+"""
+KM3NeT Data Definitions v1.3.1-22-gcbad051
+https://git.km3net.de/common/km3net-dataformat
+"""
+
+# daqdatatypes
+data = dict(
+    DAQSUPERFRAME=101,
+    DAQSUMMARYFRAME=201,
+    DAQTIMESLICE=1001,
+    DAQTIMESLICEL0=1002,
+    DAQTIMESLICEL1=1003,
+    DAQTIMESLICEL2=1004,
+    DAQTIMESLICESN=1005,
+    DAQSUMMARYSLICE=2001,
+    DAQEVENT=10001,
+)
--- a/km3io/_definitions/fitparameters.py
+++ b/km3io/_definitions/fitparameters.py
 # -*- coding: utf-8 -*-
 """
-KM3NeT Data Definitions v1.3.1
+KM3NeT Data Definitions v1.3.1-22-gcbad051
 https://git.km3net.de/common/km3net-dataformat
 """

 # fitparameters
-data = {
-    "JGANDALF_BETA0_RAD": 0,
-    "JGANDALF_BETA1_RAD": 1,
-    "JGANDALF_CHI2": 2,
-    "JGANDALF_NUMBER_OF_HITS": 3,
-    "JENERGY_ENERGY": 4,
-    "JENERGY_CHI2": 5,
-    "JGANDALF_LAMBDA": 6,
-    "JGANDALF_NUMBER_OF_ITERATIONS": 7,
-    "JSTART_NPE_MIP": 8,
-    "JSTART_NPE_MIP_TOTAL": 9,
-    "JSTART_LENGTH_METRES": 10,
-    "JVETO_NPE": 11,
-    "JVETO_NUMBER_OF_HITS": 12,
-    "JENERGY_MUON_RANGE_METRES": 13,
-    "JENERGY_NOISE_LIKELIHOOD": 14,
-    "JENERGY_NDF": 15,
-    "JENERGY_NUMBER_OF_HITS": 16,
-    "JCOPY_Z_M": 17,
-    "JSHOWERFIT_ENERGY": 4,
-}
+data = dict(
+    JGANDALF_BETA0_RAD=0,
+    JGANDALF_BETA1_RAD=1,
+    JGANDALF_CHI2=2,
+    JGANDALF_NUMBER_OF_HITS=3,
+    JENERGY_ENERGY=4,
+    JENERGY_CHI2=5,
+    JGANDALF_LAMBDA=6,
+    JGANDALF_NUMBER_OF_ITERATIONS=7,
+    JSTART_NPE_MIP=8,
+    JSTART_NPE_MIP_TOTAL=9,
+    JSTART_LENGTH_METRES=10,
+    JVETO_NPE=11,
+    JVETO_NUMBER_OF_HITS=12,
+    JENERGY_MUON_RANGE_METRES=13,
+    JENERGY_NOISE_LIKELIHOOD=14,
+    JENERGY_NDF=15,
+    JENERGY_NUMBER_OF_HITS=16,
+    JCOPY_Z_M=17,
+    JSHOWERFIT_ENERGY=4,
+)
--- a/km3io/_definitions/reconstruction.py
+++ b/km3io/_definitions/reconstruction.py
 # -*- coding: utf-8 -*-
 """
-KM3NeT Data Definitions v1.3.1
+KM3NeT Data Definitions v1.3.1-22-gcbad051
 https://git.km3net.de/common/km3net-dataformat
 """

 # reconstruction
-data = {
-    "JPP_RECONSTRUCTION_TYPE": 4000,
-    "JMUONBEGIN": 0,
-    "JMUONPREFIT": 1,
-    "JMUONSIMPLEX": 2,
-    "JMUONGANDALF": 3,
-    "JMUONENERGY": 4,
-    "JMUONSTART": 5,
-    "JLINEFIT": 6,
-    "JMUONEND": 99,
-    "JSHOWERBEGIN": 100,
-    "JSHOWERPREFIT": 101,
-    "JSHOWERPOSITIONFIT": 102,
-    "JSHOWERCOMPLETEFIT": 103,
-    "JSHOWER_BJORKEN_Y": 104,
-    "JSHOWERENERGYPREFIT": 105,
-    "JSHOWERPOINTSIMPLEX": 106,
-    "JSHOWERDIRECTIONPREFIT": 107,
-    "JSHOWEREND": 199,
-    "DUSJ_RECONSTRUCTION_TYPE": 200,
-    "DUSJSHOWERBEGIN": 200,
-    "DUSJSHOWERPREFIT": 201,
-    "DUSJSHOWERPOSITIONFIT": 202,
-    "DUSJSHOWERCOMPLETEFIT": 203,
-    "DUSJSHOWEREND": 299,
-    "AANET_RECONSTRUCTION_TYPE": 101,
-    "AASHOWERBEGIN": 300,
-    "AASHOWERFITPREFIT": 302,
-    "AASHOWERFITPOSITIONFIT": 303,
-    "AASHOWERFITDIRECTIONENERGYFIT": 304,
-    "AASHOWEREND": 399,
-    "JUSERBEGIN": 1000,
-    "JMUONVETO": 1001,
-    "JMUONPATH": 1003,
-    "JMCEVT": 1004,
-    "JUSEREND": 1099,
-    "RECTYPE_UNKNOWN": -1,
-    "RECSTAGE_UNKNOWN": -1,
-}
+data = dict(
+    JPP_RECONSTRUCTION_TYPE=4000,
+    JMUONBEGIN=0,
+    JMUONPREFIT=1,
+    JMUONSIMPLEX=2,
+    JMUONGANDALF=3,
+    JMUONENERGY=4,
+    JMUONSTART=5,
+    JLINEFIT=6,
+    JMUONEND=99,
+    JSHOWERBEGIN=100,
+    JSHOWERPREFIT=101,
+    JSHOWERPOSITIONFIT=102,
+    JSHOWERCOMPLETEFIT=103,
+    JSHOWER_BJORKEN_Y=104,
+    JSHOWERENERGYPREFIT=105,
+    JSHOWERPOINTSIMPLEX=106,
+    JSHOWERDIRECTIONPREFIT=107,
+    JSHOWEREND=199,
+    DUSJ_RECONSTRUCTION_TYPE=200,
+    DUSJSHOWERBEGIN=200,
+    DUSJSHOWERPREFIT=201,
+    DUSJSHOWERPOSITIONFIT=202,
+    DUSJSHOWERCOMPLETEFIT=203,
+    DUSJSHOWEREND=299,
+    AANET_RECONSTRUCTION_TYPE=101,
+    AASHOWERBEGIN=300,
+    AASHOWERFITPREFIT=302,
+    AASHOWERFITPOSITIONFIT=303,
+    AASHOWERFITDIRECTIONENERGYFIT=304,
+    AASHOWEREND=399,
+    JUSERBEGIN=1000,
+    JMUONVETO=1001,
+    JMUONPATH=1003,
+    JMCEVT=1004,
+    JUSEREND=1099,
+    RECTYPE_UNKNOWN=-1,
+    RECSTAGE_UNKNOWN=-1,
+)
--- a/km3io/_definitions/root.py
+++ b/km3io/_definitions/root.py
+# -*- coding: utf-8 -*-
+"""
+KM3NeT Data Definitions v1.3.1-22-gcbad051
+https://git.km3net.de/common/km3net-dataformat
+"""
+
+# root
+data = dict(
+    TTREE_ONLINE_TIMESLICE=    "KM3NET_TIMESLICE"   ,
+    TTREE_ONLINE_TIMESLICEL0=  "KM3NET_TIMESLICE_L0",
+    TTREE_ONLINE_TIMESLICEL1=  "KM3NET_TIMESLICE_L1",
+    TTREE_ONLINE_TIMESLICEL2=  "KM3NET_TIMESLICE_L2",
+    TTREE_ONLINE_TIMESLICESN=  "KM3NET_TIMESLICE_SN",
+    TTREE_ONLINE_SUMMARYSLICE= "KM3NET_SUMMARYSLICE",
+    TTREE_ONLINE_EVENT=        "KM3NET_EVENT"       ,
+    TTREE_OFFLINE_EVENT=       "E"                  ,
+    TBRANCH_ONLINE_TIMESLICE=    "KM3NET_TIMESLICE"   ,
+    TBRANCH_ONLINE_TIMESLICEL0=  "km3net_timeslice_L0",
+    TBRANCH_ONLINE_TIMESLICEL1=  "km3net_timeslice_L1",
+    TBRANCH_ONLINE_TIMESLICEL2=  "km3net_timeslice_L2",
+    TBRANCH_ONLINE_TIMESLICESN=  "km3net_timeslice_SN",
+    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_SUMMARYSLICE= 1,
+    COMPRESSION_LEVEL_ONLINE_EVENT=        0,
+    COMPRESSION_LEVEL_OFFLINE_EVENT=       1,
+    BUCKET_SIZE_ONLINE_TIMESLICE=    65536,
+    BUCKET_SIZE_ONLINE_TIMESLICEL0=  65536,
+    BUCKET_SIZE_ONLINE_TIMESLICEL1=  65536,
+    BUCKET_SIZE_ONLINE_TIMESLICEL2=  65536,
+    BUCKET_SIZE_ONLINE_TIMESLICESN=  65536,
+    BUCKET_SIZE_ONLINE_SUMMARYSLICE= 65536,
+    BUCKET_SIZE_ONLINE_EVENT=        65536,
+    BUCKET_SIZE_OFFLINE_EVENT=       65536,
+    SPLIT_LEVEL_ONLINE_TIMESLICE=    1,
+    SPLIT_LEVEL_ONLINE_TIMESLICEL0=  2,
+    SPLIT_LEVEL_ONLINE_TIMESLICEL1=  2,
+    SPLIT_LEVEL_ONLINE_TIMESLICEL2=  2,
+    SPLIT_LEVEL_ONLINE_TIMESLICESN=  2,
+    SPLIT_LEVEL_ONLINE_SUMMARYSLICE= 1,
+    SPLIT_LEVEL_ONLINE_EVENT=        1,
+    SPLIT_LEVEL_OFFLINE_EVENT=       4,
+)
--- a/km3io/_definitions/trigger.py
+++ b/km3io/_definitions/trigger.py
 # -*- coding: utf-8 -*-
 """
-KM3NeT Data Definitions v1.3.1
+KM3NeT Data Definitions v1.3.1-22-gcbad051
 https://git.km3net.de/common/km3net-dataformat
 """

 # trigger
-data = {
-    "JTRIGGER3DSHOWER": 1,
-    "JTRIGGERMXSHOWER": 2,
-    "JTRIGGER3DMUON": 4,
-    "JTRIGGERNB": 5,
-    "FACTORY_LIMIT": 31,
-}
+data = dict(
+    JTRIGGER3DSHOWER=1,
+    JTRIGGERMXSHOWER=2,
+    JTRIGGER3DMUON=4,
+    JTRIGGERNB=5,
+    FACTORY_LIMIT=31,
+)
--- a/km3io/_definitions/w2list_genhen.py
+++ b/km3io/_definitions/w2list_genhen.py
 # -*- coding: utf-8 -*-
 """
-KM3NeT Data Definitions v1.3.1
+KM3NeT Data Definitions v1.3.1-22-gcbad051
 https://git.km3net.de/common/km3net-dataformat
 """

 # w2list_genhen
-data = {
-    "W2LIST_GENHEN_GLOBAL_GEN_WEIGHT": 0,
-    "W2LIST_GENHEN_EG": 1,
-    "W2LIST_GENHEN_SIG": 2,
-    "W2LIST_GENHEN_COLUMN_DEPTH": 3,
-    "W2LIST_GENHEN_P_EARTH": 4,
-    "W2LIST_GENHEN_REFF": 5,
-    "W2LIST_GENHEN_BX": 7,
-    "W2LIST_GENHEN_BY": 8,
-    "W2LIST_GENHEN_ICHAN": 9,
-    "W2LIST_GENHEN_CC": 10,
-}
+data = dict(
+    W2LIST_GENHEN_GLOBAL_GEN_WEIGHT=0,
+    W2LIST_GENHEN_EG=1,
+    W2LIST_GENHEN_SIG=2,
+    W2LIST_GENHEN_COLUMN_DEPTH=3,
+    W2LIST_GENHEN_P_EARTH=4,
+    W2LIST_GENHEN_REFF=5,
+    W2LIST_GENHEN_BX=7,
+    W2LIST_GENHEN_BY=8,
+    W2LIST_GENHEN_ICHAN=9,
+    W2LIST_GENHEN_CC=10,
+)
--- a/km3io/_definitions/w2list_gseagen.py
+++ b/km3io/_definitions/w2list_gseagen.py
 # -*- coding: utf-8 -*-
 """
-KM3NeT Data Definitions v1.3.1
+KM3NeT Data Definitions v1.3.1-22-gcbad051
 https://git.km3net.de/common/km3net-dataformat
 """

 # w2list_gseagen
-data = {
-    "W2LIST_GSEAGEN_PS": 0,
-    "W2LIST_GSEAGEN_EG": 1,
-    "W2LIST_GSEAGEN_XSEC_MEAN": 2,
-    "W2LIST_GSEAGEN_COLUMN_DEPTH": 3,
-    "W2LIST_GSEAGEN_P_EARTH": 4,
-    "W2LIST_GSEAGEN_WATER_INT_LEN": 5,
-    "W2LIST_GSEAGEN_P_SCALE": 6,
-    "W2LIST_GSEAGEN_BX": 7,
-    "W2LIST_GSEAGEN_BY": 8,
-    "W2LIST_GSEAGEN_ICHAN": 9,
-    "W2LIST_GSEAGEN_CC": 10,
-    "W2LIST_GSEAGEN_DISTAMAX": 11,
-    "W2LIST_GSEAGEN_WATERXSEC": 12,
-    "W2LIST_GSEAGEN_XSEC": 13,
-    "W2LIST_GSEAGEN_DXSEC": 14,
-    "W2LIST_GSEAGEN_TARGETA": 15,
-    "W2LIST_GSEAGEN_TARGETZ": 16,
-    "W2LIST_GSEAGEN_VERINCAN": 17,
-    "W2LIST_GSEAGEN_LEPINCAN": 18,
-}
+data = dict(
+    W2LIST_GSEAGEN_PS=0,
+    W2LIST_GSEAGEN_EG=1,
+    W2LIST_GSEAGEN_XSEC_MEAN=2,
+    W2LIST_GSEAGEN_COLUMN_DEPTH=3,
+    W2LIST_GSEAGEN_P_EARTH=4,
+    W2LIST_GSEAGEN_WATER_INT_LEN=5,
+    W2LIST_GSEAGEN_P_SCALE=6,
+    W2LIST_GSEAGEN_BX=7,
+    W2LIST_GSEAGEN_BY=8,
+    W2LIST_GSEAGEN_ICHAN=9,
+    W2LIST_GSEAGEN_CC=10,
+    W2LIST_GSEAGEN_DISTAMAX=11,
+    W2LIST_GSEAGEN_WATERXSEC=12,
+    W2LIST_GSEAGEN_XSEC=13,
+    W2LIST_GSEAGEN_DXSEC=14,
+    W2LIST_GSEAGEN_TARGETA=15,
+    W2LIST_GSEAGEN_TARGETZ=16,
+    W2LIST_GSEAGEN_VERINCAN=17,
+    W2LIST_GSEAGEN_LEPINCAN=18,
+)
--- a/km3io/definitions.py
+++ b/km3io/definitions.py
@@ -2,9 +2,11 @@

 from km3io._definitions.mc_header import data as mc_header

-from km3io._definitions.trigger import data as trigger
+from km3io._definitions.daqdatatypes import data as daqdatatypes
 from km3io._definitions.fitparameters import data as fitparameters
 from km3io._definitions.reconstruction import data as reconstruction
+from km3io._definitions.root import data as root
+from km3io._definitions.trigger import data as trigger
 from km3io._definitions.w2list_genhen import data as w2list_genhen
 from km3io._definitions.w2list_gseagen import data as w2list_gseagen