Skip to content
Snippets Groups Projects

fully qualify enums

Merged Gerhard Raven requested to merge fully-qualify-enums into master
5 files
+ 89
89
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -20,17 +20,17 @@ void UTTruthTool::associateToTruth(const UTDigit* aDigit,
double& foundCharge)
{
// make link to truth to MCHit from Digit
const MCUTDigit* mcDigit = mcTruth<MCUTDigit>(aDigit);
const MCUTDigit* mcDigit = mcTruth<MCUTDigit>(aDigit);
if (0 != mcDigit){
// link to deposits
std::map<const MCHit*,double> tempMap;
SmartRefVector<MCUTDeposit> depCont = mcDigit->mcDeposit();
SmartRefVector<MCUTDeposit>::iterator iterDep = depCont.begin();
while (iterDep != depCont.end()){
const MCHit* aHit = (*iterDep)->mcHit();
foundCharge += (*iterDep)->depositedCharge();
tempMap[aHit] += (*iterDep)->depositedCharge();
const MCHit* aHit = (*iterDep)->mcHit();
foundCharge += (*iterDep)->depositedCharge();
tempMap[aHit] += (*iterDep)->depositedCharge();
++iterDep;
}
@@ -39,8 +39,8 @@ void UTTruthTool::associateToTruth(const UTDigit* aDigit,
double foundCharge2 = 0.0;
std::map<const MCHit*, double>::const_iterator iter = tempMap.begin();
for (; iter != tempMap.end(); ++iter){
foundCharge2 += iter->second;
} // iter
foundCharge2 += iter->second;
} // iter
}
}
@@ -57,20 +57,20 @@ void UTTruthTool::removeDeltaRays(const std::map<const MCHit*, double>& inputMap
const MCHit* hit = iter->first;
if (hit != 0){
const MCParticle* aParticle = hit->mcParticle();
if (aParticle && aParticle->originVertex() !=0 &&
aParticle->originVertex()->type() == LHCb::MCVertex::DeltaRay){
deltaRays.insert(*iter);
}
if (aParticle && aParticle->originVertex() !=0 &&
aParticle->originVertex()->type() == LHCb::MCVertex::MCVertexType::DeltaRay){
deltaRays.insert(*iter);
}
else {
hitMap.insert(*iter);
}
}
}
else {
hitMap.insert(*iter);
}
} // iter
} // iter
// for the delta rays add directly if they are far away from and not related to an existing
// for the delta rays add directly if they are far away from and not related to an existing
// MCHit, else merge with existing hit
std::map<const MCHit*, double>::const_iterator drays = deltaRays.begin();
for (; drays != deltaRays.end(); ++drays){
@@ -83,7 +83,7 @@ void UTTruthTool::removeDeltaRays(const std::map<const MCHit*, double>& inputMap
} // iter2
if (iter2 == hitMap.end() ){
// no reasonable candidate --> insert
hitMap.insert(*drays);
}
@@ -99,7 +99,7 @@ void UTTruthTool::removeDeltaRays(const std::map<const MCHit*, double>& inputMap
else {
hitMap.insert(*drays);
}
}
}
} // delta rays
Loading