← Back to branch summary

~mwinter4/maus/ckov-update

« back to all changes in this revision

Viewing changes to src/common_cpp/Optics/TransferMapOpticsModel.cc

  • Committer: Chris Rogers
  • Date: 2013-03-19 14:21:55 UTC
  • mfrom: (659.1.63 release-candidate)
  • Revision ID: chris.rogers@stfc.ac.uk-20130319142155-65vwtifralro5ukv
Tags: MAUS-v0.5.1
MAUS-v0.5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common_cpp/Optics/TransferMapOpticsModel.cc
57
57
    reference_pgparticle_.time, reference_pgparticle_.energy,
58
58
    reference_pgparticle_.x, reference_pgparticle_.px,
59
59
    reference_pgparticle_.y, reference_pgparticle_.py,
60
 
    Particle::ID(reference_pgparticle_.pid), reference_pgparticle_.z);
 
60
    MAUS::DataStructure::Global::PID(reference_pgparticle_.pid),
 
61
    reference_pgparticle_.z);
61
62
 
62
63
  // Calculate time offset from t=0 at z=0
63
64
  const double first_plane_time = reference_pgparticle_.time;
221
222
    const Json::Value hits = events[event_index]["virtual_hits"];
222
223
    for (size_t hit_index = 0; hit_index < hits.size(); ++hit_index) {
223
224
      const Json::Value hit = hits[hit_index];
224
 
      const Particle::ID particle_id
225
 
        = Particle::ID(hit["particle_id"].asInt());
 
225
      const MAUS::DataStructure::Global::PID particle_id
 
226
        = MAUS::DataStructure::Global::PID(hit["particle_id"].asInt());
226
227
      const double mass = Particle::GetInstance()->GetMass(particle_id);
227
228
      const double px = hit["momentum"]["x"].asDouble();
228
229
      const double py = hit["momentum"]["y"].asDouble();