Commit df02b453 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Fixed bad merge.

- I have also turned on the FF only merges
	modified:   JugReco/src/components/ClusterRecoCoG.cpp
parent f811ff42
......@@ -58,15 +58,10 @@ public:
<< "Make sure you have GeoSvc and SimSvc in the right order in the configuration." << endmsg;
return StatusCode::FAILURE;
}
<<<<<<< HEAD
// depth: z length of the crystal block
m_depthCorr = m_geoSvc->detector()->constantAsDouble(m_moduleDimZName);
=======
// update depth correction if a name is provided
if (!m_moduleDimZName.value().empty()) {
m_depthCorrection = m_geoSvc->detector()->constantAsDouble(m_moduleDimZName);
}
>>>>>>> 21068a610f35f083a214e3a81badd0ced4aad3da
//info() << "z_length " << depth << endmsg;
return StatusCode::SUCCESS;
}
......@@ -120,11 +115,7 @@ private:
// convert local position to global position, use the cell with max edep as a reference
auto volman = m_geoSvc->detector()->volumeManager();
auto alignment = volman.lookupDetector(centerID).nominal();
<<<<<<< HEAD
auto gpos = alignment.localToWorld(dd4hep::Position(x/tw, y/tw, z/tw + m_depthCorr));
=======
auto gpos = alignment.localToWorld(dd4hep::Position(x/tw, y/tw, z/tw + m_depthCorrection));
>>>>>>> 21068a610f35f083a214e3a81badd0ced4aad3da
cl.position({gpos.x(), gpos.y(), gpos.z()});
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment