← Back to branch summary

~christopher-hunt08/maus/maus_integrated_kalman

« back to all changes in this revision

Viewing changes to src/common_cpp/DataStructure/SciFiTrackPoint.cc

  • Committer: Durga Rajaram
  • Date: 2014-10-06 20:45:37 UTC
  • mfrom: (697.24.7 trunk)
  • mto: (697.30.10 maus)
  • mto: This revision was merged to the branch mainline in revision 703.
  • Revision ID: durga@fnal.gov-20141006204537-1aokre71ss0b2vcv
merge from trunk; set part_event_number for extra emr events

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common_cpp/DataStructure/SciFiTrackPoint.cc
25
25
                                     _station(-1),
26
26
                                     _plane(-1),
27
27
                                     _channel(666),
28
 
                                     _f_chi2(-1),
29
 
                                     _s_chi2(-1),
 
28
                                     _chi2(-1),
30
29
                                     _pos(ThreeVector(0, 0, 0)),
31
30
                                     _mom(ThreeVector(0, 0, 0)),
32
31
                                     _pull(-1),
54
53
  _plane   = (id-1)%3;
55
54
  _channel = kalman_site->measurement()(0, 0);
56
55
 
57
 
  _f_chi2 = kalman_site->chi2(KalmanState::Filtered);
58
 
  _s_chi2 = kalman_site->chi2(KalmanState::Smoothed);
 
56
  _chi2 = kalman_site->chi2();
59
57
 
60
58
  TMatrixD state_vector = kalman_site->a(KalmanState::Smoothed);
61
59
  int dimension = state_vector.GetNrows();
69
67
    _mom.setY(state_vector(3, 0));
70
68
  } else if ( dimension == 5 ) {
71
69
    _pos.setX(state_vector(0, 0));
72
 
    _mom.setX(state_vector(1, 0)/fabs(state_vector(4, 0)));
 
70
    _mom.setX(state_vector(1, 0));
73
71
    _pos.setY(state_vector(2, 0));
74
 
    _mom.setY(state_vector(3, 0)/fabs(state_vector(4, 0)));
 
72
    _mom.setY(state_vector(3, 0));
75
73
    _pos.setZ(kalman_site->z());
76
74
    _mom.setZ(1./fabs(state_vector(4, 0)));
77
75
  }
87
85
  std::vector<double> covariance(matrix_elements, matrix_elements+num_elements);
88
86
  _covariance = covariance;
89
87
 
90
 
  // std::cerr << "Adding cluster with address " << kalman_site->cluster() << " to track point\n";
91
88
  _cluster = new TRef(kalman_site->cluster());
92
89
}
93
90
 
100
97
  _plane   = point.plane();
101
98
  _channel = point.channel();
102
99
 
103
 
  _f_chi2 = point.f_chi2();
104
 
  _s_chi2 = point.s_chi2();
 
100
  _chi2 = point.chi2();
105
101
 
106
102
  _pos = point.pos();
107
103
  _mom = point.mom();
125
121
  _plane   = rhs.plane();
126
122
  _channel = rhs.channel();
127
123
 
128
 
  _f_chi2 = rhs.f_chi2();
129
 
  _s_chi2 = rhs.s_chi2();
 
124
  _chi2 = rhs.chi2();
130
125
 
131
126
  _pos = rhs.pos();
132
127
  _mom = rhs.mom();