~maus-maintainers/maus/merge

« back to all changes in this revision

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

  • Committer: Peter G Lane
  • Date: 2014-01-02 21:14:30 UTC
  • mto: (663.40.7 merge)
  • mto: This revision was merged to the branch mainline in revision 693.
  • Revision ID: lane@shibuya-20140102211430-9ijm1wztx55j1zs0
Fixed typo in configuration defaults. Fixed particle event and detector associations in raw and reconstructed track points.

Show diffs side-by-side

added added

removed removed

Lines of Context:
193
193
  double sigma_E_E  =  emittance_l * mass * gamma_l * momentum;
194
194
 
195
195
  double sigma_x_t  =  0.;
196
 
  double sigma_x_E  = -dispersion_x * sigma_E_E / energy;
 
196
  double sigma_x_E  =  dispersion_x * sigma_E_E / energy;
197
197
  double sigma_x_x  =  emittance_t * beta_t * mass / momentum;
198
198
 
199
199
  double sigma_Px_t =  0.;
202
202
  double sigma_Px_Px=  mass * momentum * emittance_t * gamma_t;
203
203
 
204
204
  double sigma_y_t  =  0.;
205
 
  double sigma_y_E  = -dispersion_y * sigma_E_E / energy;
 
205
  double sigma_y_E  = dispersion_y * sigma_E_E / energy;
206
206
  double sigma_y_x  =   0.;
207
207
  // this differes from G. Penn's paper
208
208
  double sigma_y_Px =  mass * emittance_t