diff --git a/RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc b/RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc index 190a53565c051..29372c318dae5 100644 --- a/RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc +++ b/RecoMTD/TrackExtender/plugins/TrackExtenderWithMTD.cc @@ -122,16 +122,18 @@ namespace { float beta = std::sqrt(1.f - 1.f / gammasq); tof += segmentPathOvc_[iSeg] / beta; + LogTrace("TrackExtenderWithMTD") << " TOF Segment # " << iSeg + 1 << " p = " << std::sqrt(segmentMom2_[iSeg]) + << " tof = " << tof; + #ifdef EDM_ML_DEBUG float sigma_tof = segmentPathOvc_[iSeg] * segmentSigmaMom_[iSeg] / (segmentMom2_[iSeg] * sqrt(segmentMom2_[iSeg] + 1 / mass_inv2) * mass_inv2); LogTrace("TrackExtenderWithMTD") << "TOF Segment # " << iSeg + 1 << std::fixed << std::setw(6) - << " p = " << std::sqrt(segmentMom2_[iSeg]) - << "\tdelta(tof) = " << segmentPathOvc_[iSeg] / beta << std::scientific - << "\tsigma_delta(tof) = " << sigma_tof << std::fixed - << "\tsigma_tof/delta(tof) = " - << sigma_tof / (segmentPathOvc_[iSeg] / beta) * 100 << "%\ttof = " << tof; + << " tof segment = " << segmentPathOvc_[iSeg] / beta << std::scientific + << "+/- " << sigma_tof << std::fixed + << "(rel. err. = " + << sigma_tof / (segmentPathOvc_[iSeg] / beta) * 100 << " %)"; #endif } @@ -393,23 +395,7 @@ namespace { } pathlength1 += layerpathlength; - // // sigma(p) using cartesian error - // float sigma_p_cartesian = 0; - // float p[3] = {(it + 1)->updatedState().globalMomentum().x(), (it + 1)->updatedState().globalMomentum().y(), - // (it + 1)->updatedState().globalMomentum().z()}; - // // calculate sigma_p on p = sqrt(p_x^2 + p_y^2 + p_z^2) as: - // // sigma_p = sqrt(sigma_px^2 * p_x^2 + [same for y, z] + cov(px, py) * px * py + [same for x-z, y-z]) / p - // for(int i = 3; i < 6; i++){ - // for(int j = 3; j < 6; j++){ - // // summing 2 * sigma_pij * p_i * p_j / p^2 - // // std::cout << "sigma_p_" << i << j << " = " << (it + 1)->updatedState().cartesianError().matrix()(i, j) << " " << "p_" << i << " = " << p[i-3] << " " << "p_" << j << " = " << p[j-3] << " "; - // sigma_p_cartesian += (it + 1)->updatedState().cartesianError().matrix()(i, j) * p[i-3] * p[j-3] / (it + 1)->updatedState().globalMomentum().mag2(); - // } - // } - - // sigma_p_cartesian = sqrt(sigma_p_cartesian); - - // sigma(p) using curvilinear error (on q/p) + // sigma(p) from curvilinear error (on q/p) float sigma_p = sqrt((it + 1)->updatedState().curvilinearError().matrix()(0, 0)) * (it + 1)->updatedState().globalMomentum().mag2(); diff --git a/Validation/MtdValidation/runall-report-step123-.log b/Validation/MtdValidation/runall-report-step123-.log deleted file mode 100644 index bce78b3d066ba..0000000000000 --- a/Validation/MtdValidation/runall-report-step123-.log +++ /dev/null @@ -1,2 +0,0 @@ -24903.0_SingleMuFlatPt0p7To10+2026D98 Step0-PASSED Step1-PASSED Step2-PASSED Step3-PASSED Step4-PASSED - time date Wed Dec 6 12:49:45 2023-date Wed Dec 6 12:49:45 2023; exit: 0 0 0 0 0 -1 1 1 1 1 tests passed, 0 0 0 0 0 failed diff --git a/Validation/MtdValidation/test/mtdValidation_cfg.py b/Validation/MtdValidation/test/mtdValidation_cfg.py index bbb98d89fbb31..f94a08d61f9b1 100644 --- a/Validation/MtdValidation/test/mtdValidation_cfg.py +++ b/Validation/MtdValidation/test/mtdValidation_cfg.py @@ -32,7 +32,7 @@ process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( - 'file:/afs/cern.ch/user/n/npalmeri/cmssw_versions/CMSSW_14_0_0_pre1/src/24834.0_TTbar_14TeV+2026D98/step3.root' + 'file:step3.root' ) )