Skip to content

Commit c3c73cb

Browse files
committed
More fixes
1 parent 4259185 commit c3c73cb

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Common/Tasks/qaMuon.cxx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ struct muonQa {
250250
double Bz; // Bz for MFT
251251

252252
geo::TransformationCreator transformation;
253-
map<int, math_utils::Transform3D> transformRef; // reference geometry w.r.t track data
254-
map<int, math_utils::Transform3D> transformNew; // new geometry
253+
std::map<int, math_utils::Transform3D> transformRef; // reference geometry w.r.t track data
254+
std::map<int, math_utils::Transform3D> transformNew; // new geometry
255255
TGeoManager* geoNew = nullptr;
256256
TGeoManager* geoRef = nullptr;
257257

@@ -288,7 +288,7 @@ struct muonQa {
288288
VarTrack fgValuesMCHpv;
289289
VarTrack fgValuesMFT;
290290
VarTrack fgValuesGlobal;
291-
vector<VarTrack> fgValuesCandidates;
291+
std::vector<VarTrack> fgValuesCandidates;
292292

293293
void CreateBasicHistograms()
294294
{
@@ -966,7 +966,7 @@ struct muonQa {
966966
bool removeTrack = false;
967967
try {
968968
trackFitter.fit(track, false);
969-
} catch (exception const& e) {
969+
} catch (std::exception const& e) {
970970
removeTrack = true;
971971
return removeTrack;
972972
}
@@ -977,7 +977,7 @@ struct muonQa {
977977

978978
try {
979979
trackFitter.fit(track, true, false, (itStartingParam == track.rbegin()) ? nullptr : &itStartingParam);
980-
} catch (exception const&) {
980+
} catch (std::exception const&) {
981981
removeTrack = true;
982982
break;
983983
}
@@ -1427,8 +1427,8 @@ struct muonQa {
14271427
clusterMCH->ey = cluster.isGoodY() ? 0.2 : 10.0;
14281428

14291429
// Fill temporary values
1430-
vector<float> posCls = {clusterMCH->x, clusterMCH->y, clusterMCH->z};
1431-
vector<float> eCls = {clusterMCH->ex, clusterMCH->ey};
1430+
std::vector<float> posCls = {clusterMCH->x, clusterMCH->y, clusterMCH->z};
1431+
std::vector<float> eCls = {clusterMCH->ex, clusterMCH->ey};
14321432
posClusters.emplace_back(posCls);
14331433
fgValues.errorClusters.emplace_back(eCls);
14341434
fgValues.DEIDs.emplace_back(cluster.deId());
@@ -1446,7 +1446,7 @@ struct muonQa {
14461446
}
14471447

14481448
for (auto it = convertedTrack.begin(); it != convertedTrack.end(); it++) {
1449-
vector<float> pos = {static_cast<float>(it->getNonBendingCoor()), static_cast<float>(it->getBendingCoor()), static_cast<float>(it->getZ())};
1449+
std::vector<float> pos = {static_cast<float>(it->getNonBendingCoor()), static_cast<float>(it->getBendingCoor()), static_cast<float>(it->getZ())};
14501450
fgValues.posClusters.emplace_back(pos);
14511451
}
14521452

@@ -2187,7 +2187,7 @@ struct muonQa {
21872187
auto& fgValuesCollMatched = collisions.at(mfttrack.collisionId());
21882188

21892189
// Do extrapolation for muons to all reference planes
2190-
vector<VarTrack> mchTrackExtrap;
2190+
std::vector<VarTrack> mchTrackExtrap;
21912191
for (double z : zRefPlane) {
21922192
VarTrack fgValues;
21932193
if (configRealign.fDoRealign) {
@@ -2223,7 +2223,7 @@ struct muonQa {
22232223
}
22242224

22252225
// Do extrapolation for MFTs to all reference planes
2226-
vector<VarTrack> mftTrackExtrap;
2226+
std::vector<VarTrack> mftTrackExtrap;
22272227
for (double z : zRefPlane) {
22282228
VarTrack fgValues;
22292229
FillPropagation<0, 1>(mft, fgValuesCollMFT, mchTrackExtrap[1], fgValues, kToZ, z);

0 commit comments

Comments
 (0)