@@ -85,6 +85,7 @@ void Tracking::checkTrack(const TrackTRD& trkTrd, bool isTPCTRD)
8585
8686 // Find most probable BCs and RMS for pile-up correction and error. Same BC is assumed for all tracklets
8787 float tCorrPileUp = 0 .;
88+ float tCorrPileUp_weightedMean = 0 .;
8889 float tErrPileUp2 = 0 ;
8990 float maxProb = 0 .f ;
9091 // The uncertainty is the RMS wrt the default correction of all possible corrections weighted by their probability
@@ -117,13 +118,15 @@ void Tracking::checkTrack(const TrackTRD& trkTrd, bool isTPCTRD)
117118 sumCorr += probBC * deltaBC;
118119 sumCorr2 += probBC * deltaBC * deltaBC;
119120 sumProb += probBC;
121+ tCorrPileUp_weightedMean -= probBC*deltaBC;
120122 if (probBC > maxProb) {
121123 maxProb = probBC;
122124 tCorrPileUp = -deltaBC;
123125 }
124126 }
125127 if (sumProb > 1e-6 ) {
126128 tErrPileUp2 = sumCorr2 / sumProb - 2 * tCorrPileUp * sumCorr / sumProb + tCorrPileUp * tCorrPileUp;
129+ tCorrPileUp_weightedMean /= sumProb;
127130 }
128131
129132 for (int iLayer = 0 ; iLayer < NLAYER ; ++iLayer) {
@@ -158,7 +161,8 @@ void Tracking::checkTrack(const TrackTRD& trkTrd, bool isTPCTRD)
158161
159162 // conversion from slope in pad per time bin to slope in cm per BC = tracklets[trkltIdx].getSlopeFloat() * padWidth / BCperTimeBin
160163 float slopeFactor = mTrackletsRaw [trkltId].getSlopeFloat () * pad->getWidthIPad () / 4 .f ;
161- float yCorrPileUp = tCorrPileUp * slopeFactor;
164+ // float yCorrPileUp = tCorrPileUp * slopeFactor;
165+ float yCorrPileUp = tCorrPileUp_weightedMean * slopeFactor;
162166 float yAddErrPileUp2 = tErrPileUp2 * slopeFactor * slopeFactor;
163167 float yPosCorrUp = mTrackletsCalib [trkltId].getY () - tiltCorrUp + yCorrPileUp;
164168
@@ -184,7 +188,7 @@ void Tracking::checkTrack(const TrackTRD& trkTrd, bool isTPCTRD)
184188 // \sqrt{ (dx/dx)^2 + (dy/dx)^2 + (dz/dx)^2}
185189 auto tphi = trk.getSnp () / std::sqrt ((1 .f - trk.getSnp ()) * (1 .f + trk.getSnp ()));
186190 auto trackletLength = std::sqrt (1 .f + tphi * tphi + trk.getTgl () * trk.getTgl ());
187- auto cor = mLocalGain .getValue (tracklet.getHCID () / 2 , tracklet.getPadCol (mApplyShift ), tracklet.getPadRow ()) * trackletLength;
191+ auto cor = mLocalGain .getValue (tracklet.getHCID () / 2 , tracklet.getPadCol (false ), tracklet.getPadRow ()) * trackletLength;
188192 float q0{tracklet.getQ0 () / cor}, q1{tracklet.getQ1 () / cor}, q2{tracklet.getQ2 () / cor};
189193
190194 // z-row merging
@@ -193,9 +197,9 @@ void Tracking::checkTrack(const TrackTRD& trkTrd, bool isTPCTRD)
193197 if (tracklet.getTrackletWord () == trklt.getTrackletWord ()) { // skip original tracklet
194198 continue ;
195199 }
196- if (std::abs (tracklet.getPadCol (mApplyShift ) - trklt.getPadCol (mApplyShift )) <= 1 && std::abs (tracklet.getPadRow () - trklt.getPadRow ()) == 1 ) {
200+ if (std::abs (tracklet.getPadCol (false ) - trklt.getPadCol (false )) <= 1 && std::abs (tracklet.getPadRow () - trklt.getPadRow ()) == 1 ) {
197201 // Add charge information
198- auto cor = mLocalGain .getValue (trklt.getHCID () / 2 , trklt.getPadCol (mApplyShift ), trklt.getPadRow ()) * trackletLength;
202+ auto cor = mLocalGain .getValue (trklt.getHCID () / 2 , trklt.getPadCol (false ), trklt.getPadRow ()) * trackletLength;
199203 q0 += trklt.getQ0 () / cor;
200204 q1 += trklt.getQ1 () / cor;
201205 q2 += trklt.getQ2 () / cor;
0 commit comments