From 85b78c3170d4ee6e6bcaaa0788a48b44c466477d Mon Sep 17 00:00:00 2001
From: Tamas Gal <himself@tamasgal.com>
Date: Fri, 13 Oct 2023 12:13:15 +0200
Subject: [PATCH] Remove Multiplicity and rename du to string in XCalibratedHit
---
src/calibration.jl | 5 ++---
src/types.jl | 8 +-------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/calibration.jl b/src/calibration.jl
index 831f9b2d..6fc3fe79 100644
--- a/src/calibration.jl
+++ b/src/calibration.jl
@@ -12,14 +12,13 @@ function calibrate(det::Detector, hits)
dir = det[dom_id][channel_id].dir
t0 = det[dom_id][channel_id].tâ‚€
t = hit.t + t0
- du = det[dom_id].location.string
+ string = det[dom_id].location.string
floor = det[dom_id].location.floor
trigger_mask = has_trigger_mask ? hit.trigger_mask : 0
c_hit = XCalibratedHit(
dom_id, channel_id, t, tot, trigger_mask,
pos, dir, t0,
- du, floor,
- Multiplicity(0, 0)
+ string, floor
)
push!(calibrated_hits, c_hit)
end
diff --git a/src/types.jl b/src/types.jl
index c88c2fbf..55ab0ee6 100644
--- a/src/types.jl
+++ b/src/types.jl
@@ -71,11 +71,6 @@ struct TriggeredHit <: AbstractDAQHit
trigger_mask::UInt64
end
-mutable struct Multiplicity
- count::Int32
- id::Int64
-end
-
struct XCalibratedHit <: AbstractCalibratedHit
dom_id::UInt32
@@ -86,9 +81,8 @@ struct XCalibratedHit <: AbstractCalibratedHit
pos::Position{Float64}
dir::Direction{Float64}
t0::Float64
- du::UInt8
+ string::UInt8
floor::UInt8
- multiplicity::Multiplicity
end
"""
--
GitLab