Fixes for Mean Vertex calibration

chiarazampolli · sawenzel · commit b1b34e53d211 · 2022-08-26T09:50:36.000+02:00
diff --git a/Detectors/Calibration/include/DetectorsCalibration/MeanVertexData.h b/Detectors/Calibration/include/DetectorsCalibration/MeanVertexData.h
@@ -30,7 +30,7 @@ struct MeanVertexData {
   std::vector<std::array<float, 3>> histoVtx{0};
   bool mVerbose = false;
 
-  MeanVertexData();
+  MeanVertexData() = default;
 
   ~MeanVertexData()
   {
diff --git a/Detectors/Calibration/src/MeanVertexCalibrator.cxx b/Detectors/Calibration/src/MeanVertexCalibrator.cxx
@@ -69,6 +69,9 @@ void MeanVertexCalibrator::binVector(std::vector<float>& vectOut, const std::vec
       continue;
     }
     int bin = (vectIn[i] - min) * binWidthInv;
+    if (bin >= vectOut.size()) {
+      continue;
+    }
     vectOut[bin]++;
   }
 }
@@ -142,8 +145,8 @@ void MeanVertexCalibrator::fitMeanVertex(o2::calibration::MeanVertexData* c, Mea
           printVector(binnedVect, -(mRangeX), mRangeX, mBinWidthX);
         }
         fitres = fitGaus(mNBinsX, &binnedVect[0], -(mRangeX), mRangeX, fitResSlicesX.back(), &covMatrixX.back());
-        if (fitres != 10) {
-          LOG(info) << "X, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii][2] << "[) => " << fitres << ". Mean = " << fitResSlicesX[counter][1] << " Sigma = " << fitResSlicesX[counter][2] << ", covMatrix = " << covMatrixX[counter](2, 2);
+        if (fitres != -10) {
+          LOG(info) << "X, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii - 1][2] << "]) => " << fitres << ". Mean = " << fitResSlicesX[counter][1] << " Sigma = " << fitResSlicesX[counter][2] << ", covMatrix = " << covMatrixX[counter](2, 2);
         } else {
           LOG(error) << "X, counter " << counter << ": Fit failed with result = " << fitres;
         }
@@ -165,8 +168,8 @@ void MeanVertexCalibrator::fitMeanVertex(o2::calibration::MeanVertexData* c, Mea
           printVector(binnedVect, -(mRangeY), mRangeY, mBinWidthY);
         }
         fitres = fitGaus(mNBinsY, &binnedVect[0], -(mRangeY), mRangeY, fitResSlicesY.back(), &covMatrixY.back());
-        if (fitres != 10) {
-          LOG(info) << "Y, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii][2] << "[) => " << fitres << ". Mean = " << fitResSlicesY[counter][1] << " Sigma = " << fitResSlicesY[counter][2] << ", covMatrix = " << covMatrixY[counter](2, 2);
+        if (fitres != -10) {
+          LOG(info) << "Y, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii - 1][2] << "]) => " << fitres << ". Mean = " << fitResSlicesY[counter][1] << " Sigma = " << fitResSlicesY[counter][2] << ", covMatrix = " << covMatrixY[counter](2, 2);
         } else {
           LOG(error) << "Y, counter " << counter << ": Fit failed with result = " << fitres;
         }
@@ -181,7 +184,7 @@ void MeanVertexCalibrator::fitMeanVertex(o2::calibration::MeanVertexData* c, Mea
         break;
       }
     }
-    startZ += mMinEntries * counter;
+    startZ += minEntriesPerPoint * counter;
     if (mVerbose) {
       LOG(info) << "End of while: startZ = " << startZ << " c->histoVtx.size() = " << c->histoVtx.size();
     }
diff --git a/Detectors/Calibration/src/MeanVertexData.cxx b/Detectors/Calibration/src/MeanVertexData.cxx
@@ -26,12 +26,6 @@ using Slot = o2::calibration::TimeSlot<o2::calibration::MeanVertexData>;
 using PVertex = o2::dataformats::PrimaryVertex;
 using clbUtils = o2::calibration::Utils;
 
-//_____________________________________________
-MeanVertexData::MeanVertexData()
-{
-  LOG(info) << "Default c-tor, not to be used";
-}
-
 //_____________________________________________
 void MeanVertexData::print() const
 {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ struct MeanVertexData {`
`30`	`30`	`std::vector<std::array<float, 3>> histoVtx{0};`
`31`	`31`	`bool mVerbose = false;`
`32`	`32`
`33`		`- MeanVertexData();`
	`33`	`+ MeanVertexData() = default;`
`34`	`34`
`35`	`35`	`~MeanVertexData()`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ void MeanVertexCalibrator::binVector(std::vector<float>& vectOut, const std::vec`
`69`	`69`	`continue;`
`70`	`70`	`}`
`71`	`71`	`int bin = (vectIn[i] - min) * binWidthInv;`
	`72`	`+ if (bin >= vectOut.size()) {`
	`73`	`+ continue;`
	`74`	`+ }`
`72`	`75`	`vectOut[bin]++;`
`73`	`76`	`}`
`74`	`77`	`}`
`@@ -142,8 +145,8 @@ void MeanVertexCalibrator::fitMeanVertex(o2::calibration::MeanVertexData* c, Mea`
`142`	`145`	`printVector(binnedVect, -(mRangeX), mRangeX, mBinWidthX);`
`143`	`146`	`}`
`144`	`147`	`fitres = fitGaus(mNBinsX, &binnedVect[0], -(mRangeX), mRangeX, fitResSlicesX.back(), &covMatrixX.back());`
`145`		`- if (fitres != 10) {`
`146`		`- LOG(info) << "X, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii][2] << "[) => " << fitres << ". Mean = " << fitResSlicesX[counter][1] << " Sigma = " << fitResSlicesX[counter][2] << ", covMatrix = " << covMatrixX[counter](2, 2);`
	`148`	`+ if (fitres != -10) {`
	`149`	`+ LOG(info) << "X, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii - 1][2] << "]) => " << fitres << ". Mean = " << fitResSlicesX[counter][1] << " Sigma = " << fitResSlicesX[counter][2] << ", covMatrix = " << covMatrixX[counter](2, 2);`
`147`	`150`	`} else {`
`148`	`151`	`LOG(error) << "X, counter " << counter << ": Fit failed with result = " << fitres;`
`149`	`152`	`}`
`@@ -165,8 +168,8 @@ void MeanVertexCalibrator::fitMeanVertex(o2::calibration::MeanVertexData* c, Mea`
`165`	`168`	`printVector(binnedVect, -(mRangeY), mRangeY, mBinWidthY);`
`166`	`169`	`}`
`167`	`170`	`fitres = fitGaus(mNBinsY, &binnedVect[0], -(mRangeY), mRangeY, fitResSlicesY.back(), &covMatrixY.back());`
`168`		`- if (fitres != 10) {`
`169`		`- LOG(info) << "Y, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii][2] << "[) => " << fitres << ". Mean = " << fitResSlicesY[counter][1] << " Sigma = " << fitResSlicesY[counter][2] << ", covMatrix = " << covMatrixY[counter](2, 2);`
	`171`	`+ if (fitres != -10) {`
	`172`	`+ LOG(info) << "Y, counter " << counter << ": Fit result (z slice [" << c->histoVtx[startZ][2] << ", " << c->histoVtx[ii - 1][2] << "]) => " << fitres << ". Mean = " << fitResSlicesY[counter][1] << " Sigma = " << fitResSlicesY[counter][2] << ", covMatrix = " << covMatrixY[counter](2, 2);`
`170`	`173`	`} else {`
`171`	`174`	`LOG(error) << "Y, counter " << counter << ": Fit failed with result = " << fitres;`
`172`	`175`	`}`
`@@ -181,7 +184,7 @@ void MeanVertexCalibrator::fitMeanVertex(o2::calibration::MeanVertexData* c, Mea`
`181`	`184`	`break;`
`182`	`185`	`}`
`183`	`186`	`}`
`184`		`- startZ += mMinEntries * counter;`
	`187`	`+ startZ += minEntriesPerPoint * counter;`
`185`	`188`	`if (mVerbose) {`
`186`	`189`	`LOG(info) << "End of while: startZ = " << startZ << " c->histoVtx.size() = " << c->histoVtx.size();`
`187`	`190`	`}`