@@ -163,30 +163,30 @@ bool DelphesO2LutWriter::fwdPara(lutEntry_t& lutEntry, float pt, float eta, floa
163163
164164 // parametrisation at eta = 4
165165 const double beta = 1 . / std::sqrt (1 + mass * mass / pt / pt / std::cosh (eta) / std::cosh (eta));
166- const float dca_pos = 2.5e-4 / std::sqrt (3 ); // 2.5 micron/sqrt(3)
166+ const float dcaPos = 2.5e-4 / std::sqrt (3 ); // 2.5 micron/sqrt(3)
167167 const float r0 = 0.5 ; // layer 0 radius [cm]
168168 const float r1 = 1.3 ;
169169 const float r2 = 2.5 ;
170170 const float x0layer = 0.001 ; // material budget (rad length) per layer
171- const double sigma_alpha = 0.0136 / beta / pt * std::sqrt (x0layer * std::cosh (eta)) * (1 + 0.038 * std::log (x0layer * std::cosh (eta)));
172- const double dcaxy_ms = sigma_alpha * r0 * std::sqrt (1 + r1 * r1 / (r2 - r0) / (r2 - r0));
173- const double dcaxy2 = dca_pos * dca_pos + dcaxy_ms * dcaxy_ms ;
171+ const double sigmaAlpha = 0.0136 / beta / pt * std::sqrt (x0layer * std::cosh (eta)) * (1 + 0.038 * std::log (x0layer * std::cosh (eta)));
172+ const double dcaxyMs = sigmaAlpha * r0 * std::sqrt (1 + r1 * r1 / (r2 - r0) / (r2 - r0));
173+ const double dcaxy2 = dcaPos * dcaPos + dcaxyMs * dcaxyMs ;
174174
175- const double dcaz_ms = sigma_alpha * r0 * std::cosh (eta);
176- const double dcaz2 = dca_pos * dca_pos + dcaz_ms * dcaz_ms ;
175+ const double dcazMs = sigmaAlpha * r0 * std::cosh (eta);
176+ const double dcaz2 = dcaPos * dcaPos + dcazMs * dcazMs ;
177177
178178 const float Leta = 2.8 / std::sinh (eta) - 0.01 * r0; // m
179- const double relmomres_pos = 10e-6 * pt / 0.3 / Bfield / Leta / Leta * std::sqrt (720 . / 15 .);
179+ const double relmomresPos = 10e-6 * pt / 0.3 / Bfield / Leta / Leta * std::sqrt (720 . / 15 .);
180180
181- const float relmomres_barrel = std::sqrt (covmbarrel[14 ]) * pt;
182- const float Router = 1 ; // m
183- const float relmomres_pos_barrel = 10e-6 * pt / 0.3 / Bfield / Router / Router / std::sqrt (720 . / 15 .);
184- const float relmomres_MS_barrel = std::sqrt (relmomres_barrel * relmomres_barrel - relmomres_pos_barrel * relmomres_pos_barrel );
181+ const float relmomresBarrel = std::sqrt (covmbarrel[14 ]) * pt;
182+ const float rOuter = 1 ; // m
183+ const float relmomresPosBarrel = 10e-6 * pt / 0.3 / Bfield / rOuter / rOuter / std::sqrt (720 . / 15 .);
184+ const float relmomresMSBarrel = std::sqrt (relmomresBarrel * relmomresBarrel - relmomresPosBarrel * relmomresPosBarrel );
185185
186186 // interpolate MS contrib (rel resolution 0.4 at eta = 4)
187- const float relmomres_MS_eta4 = 0.4 / beta * 0.5 / Bfield;
188- const float relmomres_MS = relmomres_MS_eta4 * std::pow (relmomres_MS_eta4 / relmomres_MS_barrel , (std::fabs (eta) - 4 .) / (4 . - etaMaxBarrel));
189- const float momres_tot = pt * std::sqrt (relmomres_pos * relmomres_pos + relmomres_MS * relmomres_MS ); // total absolute mom reso
187+ const float relmomresMSEta4 = 0.4 / beta * 0.5 / Bfield;
188+ const float relmomresMS = relmomresMSEta4 * std::pow (relmomresMSEta4 / relmomresMSBarrel , (std::fabs (eta) - 4 .) / (4 . - etaMaxBarrel));
189+ const float momresTot = pt * std::sqrt (relmomresPos * relmomresPos + relmomresMS * relmomresMS ); // total absolute mom reso
190190
191191 // Fill cov matrix diag
192192 for (int i = 0 ; i < 15 ; ++i)
@@ -200,7 +200,7 @@ bool DelphesO2LutWriter::fwdPara(lutEntry_t& lutEntry, float pt, float eta, floa
200200 lutEntry.covm [2 ] = dcaz2;
201201 lutEntry.covm [5 ] = covmbarrel[5 ]; // sigma^2 sin(phi)
202202 lutEntry.covm [9 ] = covmbarrel[9 ]; // sigma^2 tanl
203- lutEntry.covm [14 ] = momres_tot * momres_tot / pt / pt / pt / pt; // sigma^2 1/pt
203+ lutEntry.covm [14 ] = momresTot * momresTot / pt / pt / pt / pt; // sigma^2 1/pt
204204 // Check that all numbers are numbers
205205 for (int i = 0 ; i < 15 ; ++i) {
206206 if (std::isnan (lutEntry.covm [i])) {
0 commit comments