Skip to content
Snippets Groups Projects
Verified Commit 85b78c31 authored by Tamas Gal's avatar Tamas Gal :speech_balloon:
Browse files

Remove Multiplicity and rename du to string in XCalibratedHit

parent bd367db8
No related branches found
No related tags found
No related merge requests found
...@@ -12,14 +12,13 @@ function calibrate(det::Detector, hits) ...@@ -12,14 +12,13 @@ function calibrate(det::Detector, hits)
dir = det[dom_id][channel_id].dir dir = det[dom_id][channel_id].dir
t0 = det[dom_id][channel_id].t₀ t0 = det[dom_id][channel_id].t₀
t = hit.t + t0 t = hit.t + t0
du = det[dom_id].location.string string = det[dom_id].location.string
floor = det[dom_id].location.floor floor = det[dom_id].location.floor
trigger_mask = has_trigger_mask ? hit.trigger_mask : 0 trigger_mask = has_trigger_mask ? hit.trigger_mask : 0
c_hit = XCalibratedHit( c_hit = XCalibratedHit(
dom_id, channel_id, t, tot, trigger_mask, dom_id, channel_id, t, tot, trigger_mask,
pos, dir, t0, pos, dir, t0,
du, floor, string, floor
Multiplicity(0, 0)
) )
push!(calibrated_hits, c_hit) push!(calibrated_hits, c_hit)
end end
......
...@@ -71,11 +71,6 @@ struct TriggeredHit <: AbstractDAQHit ...@@ -71,11 +71,6 @@ struct TriggeredHit <: AbstractDAQHit
trigger_mask::UInt64 trigger_mask::UInt64
end end
mutable struct Multiplicity
count::Int32
id::Int64
end
struct XCalibratedHit <: AbstractCalibratedHit struct XCalibratedHit <: AbstractCalibratedHit
dom_id::UInt32 dom_id::UInt32
...@@ -86,9 +81,8 @@ struct XCalibratedHit <: AbstractCalibratedHit ...@@ -86,9 +81,8 @@ struct XCalibratedHit <: AbstractCalibratedHit
pos::Position{Float64} pos::Position{Float64}
dir::Direction{Float64} dir::Direction{Float64}
t0::Float64 t0::Float64
du::UInt8 string::UInt8
floor::UInt8 floor::UInt8
multiplicity::Multiplicity
end end
""" """
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment