diff --git a/src/calibration.jl b/src/calibration.jl index 831f9b2df26159724da1d7955ba01a4a03c7ebcb..6fc3fe791d12bbb63fbaeadfe9755d3bb399c62b 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 c88c2fbfa1f5defc4675d6cd92f25832dac77066..55ab0ee62392cd655b655a0b63086fa80fa0c0e5 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 """