From 10c3584b4a07c2a7ecd8cd5ccc1154581a6e4596 Mon Sep 17 00:00:00 2001
From: Tamas Gal <tgal@km3net.de>
Date: Tue, 26 May 2020 22:31:35 +0200
Subject: [PATCH] Update dataformat defs. Closes #48 #49 #50 #51
---
km3io/definitions/fitparameters.py | 5 ++---
km3io/definitions/reconstruction.py | 25 ++++++++++++++-----------
km3io/definitions/trigger.py | 5 ++---
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/km3io/definitions/fitparameters.py b/km3io/definitions/fitparameters.py
index 96b287a..5fdd02f 100644
--- a/km3io/definitions/fitparameters.py
+++ b/km3io/definitions/fitparameters.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-KM3NeT Data Definitions v1.1.2
+KM3NeT Data Definitions v1.2.1-7-g30d101f
https://git.km3net.de/common/km3net-dataformat
"""
@@ -24,6 +24,5 @@ data = {
"JENERGY_NDF": 15,
"JENERGY_NUMBER_OF_HITS": 16,
"JCOPY_Z_M": 17,
+ "JSHOWERFIT_ENERGY": 4,
}
-
-data_r = {v: k for k, v in data.items()}
diff --git a/km3io/definitions/reconstruction.py b/km3io/definitions/reconstruction.py
index 526d547..2cead5d 100644
--- a/km3io/definitions/reconstruction.py
+++ b/km3io/definitions/reconstruction.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-KM3NeT Data Definitions v1.1.2
+KM3NeT Data Definitions v1.2.1-7-g30d101f
https://git.km3net.de/common/km3net-dataformat
"""
@@ -22,16 +22,21 @@ data = {
"JSHOWERPOSITIONFIT": 102,
"JSHOWERCOMPLETEFIT": 103,
"JSHOWER_BJORKEN_Y": 104,
+ "JSHOWERENERGYPREFIT": 105,
+ "JSHOWERPOINTSIMPLEX": 106,
+ "JSHOWERDIRECTIONPREFIT": 107,
"JSHOWEREND": 199,
- "DUSJSHOWERFIT": 200,
- "DUSJBEGIN": 200,
- "DUSJPREFIT": 201,
- "DUSJPOSITIONFIT": 202,
- "JDUSJCOMPLETEFIT": 203,
- "DUSJEND": 299,
- "AASHOWERFIT": 300,
+ "DUSJ_RECONSTRUCTION_TYPE": 200,
+ "DUSJSHOWERBEGIN": 200,
+ "DUSJSHOWERPREFIT": 201,
+ "DUSJSHOWERPOSITIONFIT": 202,
+ "DUSJSHOWERCOMPLETEFIT": 203,
+ "DUSJSHOWERBEND": 299,
+ "AANET_RECONSTRUCTION_TYPE": 101,
"AASHOWERBEGIN": 300,
- "AASHOWERCOMPLETEFIT": 301,
+ "AASHOWERFITPREFIT": 302,
+ "AASHOWERFITPOSITIONFIT": 303,
+ "AASHOWERFITDIRECTIONENERGYFIT": 304,
"AASHOWEREND": 399,
"JUSERBEGIN": 1000,
"JMUONVETO": 1001,
@@ -41,5 +46,3 @@ data = {
"RECTYPE_UNKNOWN": -1,
"RECSTAGE_UNKNOWN": -1,
}
-
-data_r = {v: k for k, v in data.items()}
diff --git a/km3io/definitions/trigger.py b/km3io/definitions/trigger.py
index 922c4cb..b59284e 100644
--- a/km3io/definitions/trigger.py
+++ b/km3io/definitions/trigger.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""
-KM3NeT Data Definitions v1.1.2
+KM3NeT Data Definitions v1.2.1-7-g30d101f
https://git.km3net.de/common/km3net-dataformat
"""
@@ -10,6 +10,5 @@ data = {
"JTRIGGERMXSHOWER": 2,
"JTRIGGER3DMUON": 4,
"JTRIGGERNB": 5,
+ "FACTORY_LIMIT": 31,
}
-
-data_r = {v: k for k, v in data.items()}
--
GitLab