Skip to content

Commit 5648b64

Browse files
bloodyyugobloodyyugo
committed
Merge branch 'iss1847' of github.com:LDMX-Software/ldmx-sw into iss1847
2 parents 56ad1f9 + 3bced5c commit 5648b64

File tree

5 files changed

+31
-27
lines changed

5 files changed

+31
-27
lines changed

‎Tracking/include/Tracking/Sim/TrackingUtils.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ inline Acts::Vector3 ldmx2Acts(Acts::Vector3 ldmx_v) {
184184
//(0 1 0) x_ = y_
185185
//(0 0 1) y_ = z_
186186
//(1 0 0) z_ = x_
187-
187+
188188
inline Acts::Vector3 acts2Ldmx(Acts::Vector3 acts_v) {
189189
// TODO::Move it to a static member
190190
Acts::SquareMatrix3 ldmx_rot;
@@ -194,12 +194,12 @@ inline Acts::Vector3 acts2Ldmx(Acts::Vector3 acts_v) {
194194
}
195195

196196
inline std::vector<double> acts2LdmxMomentum(Acts::Vector3 acts_mom) {
197-
Acts::Vector3 ldmx_mom=acts2Ldmx(acts_mom);
198-
return std::vector<double>{ldmx_mom[0]/Acts::UnitConstants::MeV,
199-
ldmx_mom[1]/Acts::UnitConstants::MeV,
200-
ldmx_mom[2]/Acts::UnitConstants::MeV};
197+
Acts::Vector3 ldmx_mom = acts2Ldmx(acts_mom);
198+
return std::vector<double>{ldmx_mom[0] / Acts::UnitConstants::MeV,
199+
ldmx_mom[1] / Acts::UnitConstants::MeV,
200+
ldmx_mom[2] / Acts::UnitConstants::MeV};
201201
}
202-
202+
203203
// Transform position, momentum and charge to free parameters
204204

205205
inline Acts::FreeVector toFreeParameters(Acts::Vector3 pos_, Acts::Vector3 mom,

‎Tracking/src/Tracking/Reco/CKFProcessor.cxx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -502,17 +502,18 @@ void CKFProcessor::produce(framework::Event& event) {
502502
trk.setNdf(track.nMeasurements() - 5);
503503
trk.setNsharedHits(track.nSharedHits());
504504

505-
Acts::Vector3 trk_mom_trking(track.momentum()[0],track.momentum()[1],track.momentum()[2]);
506-
//save the momentum in the global coords and and GeV-->MeV
507-
auto trk_mom_gbl=tracking::sim::utils::acts2LdmxMomentum(trk_mom_trking);
505+
Acts::Vector3 trk_mom_trking(track.momentum()[0], track.momentum()[1],
506+
track.momentum()[2]);
507+
// save the momentum in the global coords and and GeV-->MeV
508+
auto trk_mom_gbl =
509+
tracking::sim::utils::acts2LdmxMomentum(trk_mom_trking);
508510

509511
ldmx_log(debug) << " Global Track momentum: px = " << trk_mom_gbl[0]
510512
<< " py = " << trk_mom_gbl[1]
511513
<< " pz = " << trk_mom_gbl[2];
512514

513-
trk.setMomentum(trk_mom_gbl[0], trk_mom_gbl[1], trk_mom_gbl[2]);
515+
trk.setMomentum(trk_mom_gbl[0], trk_mom_gbl[1], trk_mom_gbl[2]);
514516

515-
516517
// At least min_hits hits and p > 50 MeV
517518
if ((trk.getNhits() <= min_hits_) || (abs(1. / trk.getQoP()) <= 0.05)) {
518519
ldmx_log(debug)

‎Tracking/src/Tracking/Reco/GSFProcessor.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ void GSFProcessor::produce(framework::Event& event) {
439439
tracking::sim::utils::flatCov(trk_cov, v_trk_cov);
440440
trk.setPerigeeCov(v_trk_cov);
441441
Acts::Vector3 trk_momentum = gsftrk.momentum();
442-
auto trk_mom_gbl=tracking::sim::utils::acts2LdmxMomentum(trk_momentum);
443-
trk.setMomentum(trk_mom_gbl[0], trk_mom_gbl[1], trk_mom_gbl[2]);
442+
auto trk_mom_gbl = tracking::sim::utils::acts2LdmxMomentum(trk_momentum);
443+
trk.setMomentum(trk_mom_gbl[0], trk_mom_gbl[1], trk_mom_gbl[2]);
444444

445445
// truth information
446446
trk.setTrackID(track.getTrackID());

‎Tracking/src/Tracking/Reco/TruthSeedProcessor.cxx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ void TruthSeedProcessor::createTruthTrack(
126126

127127
// Transform the position, momentum and charge to free parameters.
128128
// use position & momentum in ACTS frame
129-
auto free_params{tracking::sim::utils::toFreeParameters(pos_acts, mom_acts, q)};
129+
auto free_params{
130+
tracking::sim::utils::toFreeParameters(pos_acts, mom_acts, q)};
130131

131132
// Create a line surface at the perigee. The perigee position is extracted
132133
// from a particle's vertex or the particle's position at a specific
@@ -179,10 +180,12 @@ void TruthSeedProcessor::createTruthTrack(
179180
trk.setPerigeeParameters(
180181
tracking::sim::utils::convertActsToLdmxPars(prop_bound_vec));
181182

182-
//save the global position & momentum in the ldmx::track object
183-
//save momentum in MeV
183+
// save the global position & momentum in the ldmx::track object
184+
// save momentum in MeV
184185
trk.setPosition(pos(0), pos(1), pos(2));
185-
trk.setMomentum(mom(0)/Acts::UnitConstants::MeV, mom(1)/Acts::UnitConstants::MeV, mom(2)/Acts::UnitConstants::MeV);
186+
trk.setMomentum(mom(0) / Acts::UnitConstants::MeV,
187+
mom(1) / Acts::UnitConstants::MeV,
188+
mom(2) / Acts::UnitConstants::MeV);
186189
}
187190

188191
// origin_surface is the perigee

‎Tracking/src/Tracking/dqm/TrackingRecoDQM.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void TrackingRecoDQM::efficiencyPlots(
154154
auto truth_z0 = truth_trk.getZ0();
155155
auto truth_theta = truth_trk.getTheta();
156156
auto truth_qop = truth_trk.getQoP();
157-
auto truth_p = 1. / abs(truth_trk.getQoP())*1000.0;
157+
auto truth_p = 1. / abs(truth_trk.getQoP()) * 1000.0;
158158
auto truth_n_hits = truth_trk.getNhits();
159159

160160
std::vector<double> truth_mom = truth_trk.getMomentum();
@@ -235,7 +235,7 @@ void TrackingRecoDQM::efficiencyPlots(
235235
auto truth_z0 = truth_trk->getZ0();
236236
auto truth_theta = truth_trk->getTheta();
237237
auto truth_qop = truth_trk->getQoP();
238-
auto truth_p = 1. / abs(truth_trk->getQoP())*1000.0;
238+
auto truth_p = 1. / abs(truth_trk->getQoP()) * 1000.0;
239239
std::vector<double> truth_mom = truth_trk->getMomentum();
240240

241241
// Polar angle
@@ -310,7 +310,7 @@ void TrackingRecoDQM::trackMonitoring(
310310
auto trk_qop = track.getQoP();
311311
auto trk_theta = track.getTheta();
312312
auto trk_phi = track.getPhi();
313-
auto trk_p = 1. / abs(trk_qop)*1000.0;
313+
auto trk_p = 1. / abs(trk_qop) * 1000.0;
314314
for (auto track_hit : track.getMeasurementsIdxs()) {
315315
histograms_.fill(title + "LayersHit",
316316
measurements.at(track_hit).getLayer());
@@ -340,14 +340,15 @@ void TrackingRecoDQM::trackMonitoring(
340340
cov(Acts::BoundIndices::eBoundTheta, Acts::BoundIndices::eBoundTheta));
341341
double sigmaqop = sqrt(cov(Acts::BoundIndices::eBoundQOverP,
342342
Acts::BoundIndices::eBoundQOverP));
343-
double sigmap = (1. / trk_qop) * (1. / trk_qop) * sigmaqop*1000;//convert to MeV
343+
double sigmap =
344+
(1. / trk_qop) * (1. / trk_qop) * sigmaqop * 1000; // convert to MeV
344345

345346
histograms_.fill(title + "d0", trk_d0);
346347
histograms_.fill(title + "z0", trk_z0);
347348
histograms_.fill(title + "qop", trk_qop);
348349
histograms_.fill(title + "phi", trk_phi);
349350
histograms_.fill(title + "theta", trk_theta);
350-
histograms_.fill(title + "p", std::abs(1. / trk_qop)*1000);
351+
histograms_.fill(title + "p", std::abs(1. / trk_qop) * 1000);
351352

352353
if (doDetail) {
353354
histograms_.fill(title + "px", trk_mom[0]);
@@ -372,7 +373,7 @@ void TrackingRecoDQM::trackMonitoring(
372373
histograms_.fill(title + "p_err", sigmap);
373374

374375
// 2D Error plots
375-
double p = std::abs(1. / trk_qop)*1000.0;
376+
double p = std::abs(1. / trk_qop) * 1000.0;
376377
histograms_.fill(title + "d0_err_vs_p", p, sigmad0);
377378
histograms_.fill(title + "z0_err_vs_p", p, sigmaz0);
378379
histograms_.fill(title + "p_err_vs_p", p, sigmap);
@@ -408,7 +409,7 @@ void TrackingRecoDQM::trackMonitoring(
408409
auto truth_phi = truth_trk->getPhi();
409410
auto truth_theta = truth_trk->getTheta();
410411
auto truth_qop = truth_trk->getQoP();
411-
auto truth_p = 1. / abs(truth_trk->getQoP())*1000.0;
412+
auto truth_p = 1. / abs(truth_trk->getQoP()) * 1000.0;
412413
std::vector<double> truth_mom = truth_trk->getMomentum();
413414
// Polar angle
414415
// The momentum in the plane transverse wrt the beam axis
@@ -475,8 +476,7 @@ void TrackingRecoDQM::trackMonitoring(
475476
else if (track.getNhits() == 10)
476477
histograms_.fill(title + "res_p_vs_p_10hits", truth_p, res_p);
477478

478-
histograms_.fill(title + "res_pt_beam_vs_p", truth_p,
479-
res_pt_beam);
479+
histograms_.fill(title + "res_pt_beam_vs_p", truth_p, res_pt_beam);
480480

481481
} // found matched track
482482
} // do TruthComparison
@@ -534,7 +534,7 @@ void TrackingRecoDQM::trackStateMonitoring(const ldmx::Tracks& tracks,
534534
Acts::BoundIndices::eBoundQOverP, Acts::BoundIndices::eBoundQOverP));
535535

536536
double trk_qop = track.getQoP();
537-
double trk_p = 1. / abs(trk_qop)*1000.0;
537+
double trk_p = 1. / abs(trk_qop) * 1000.0;
538538

539539
double track_state_loc0 = target_state.params_[0];
540540
double track_state_loc1 = target_state.params_[1];

0 commit comments

Comments
 (0)