Skip to content

Refactoring of the caloriemter base code and bug fixes #1908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oksuzian merged 3 commits into from
Jul 31, 2026
Merged

Refactoring of the caloriemter base code and bug fixes #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
521583d
Refactoring of the caloriemter base code and bug fixes
bechenard Jul 28, 2026
3cba7b1
Additional CMake + overlap fix
bechenard Jul 29, 2026
35d9c05
Fixed bug + minor cleanup
bechenard Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Analyses/src/CaloCalibAna_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ namespace mu2e {

const CaloHit& hit = CaloHits.at(ic);
int diskId = cal.crystal(hit.crystalID()).diskID();
CLHEP::Hep3Vector crystalPos = cal.geomUtil().mu2eToDiskFF(diskId,cal.crystal(hit.crystalID()).position()); //in disk FF frame
CLHEP::Hep3Vector crystalPos = cal.mu2eToDiskFF(diskId,cal.crystal(hit.crystalID()).position()); //in disk FF frame

const auto eDepMCs = caloHitTruth[ic].energyDeposits();

Expand Down Expand Up @@ -492,7 +492,7 @@ namespace mu2e {
if ( (hit.volumeId()<VirtualDetectorId::EMC_Disk_0_SurfIn || hit.volumeId()>VirtualDetectorId::EMC_Disk_1_EdgeOut)
&& hit.volumeId() != VirtualDetectorId::TT_Back) continue;

CLHEP::Hep3Vector VDPos = cal.geomUtil().mu2eToTracker(hit.position());
CLHEP::Hep3Vector VDPos = cal.mu2eToTracker(hit.position());

vdId_[nVd_] = hit.volumeId();
vdPdgId_[nVd_] = hit.simParticle()->pdgId();
Expand Down
6 changes: 3 additions & 3 deletions Analyses/src/CaloCalib_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ namespace mu2e {
//CaloHitCollection const& CaloHits(*CaloHitsHandle);

//const double CrDensity = 4.9e-6; // in kg/mm3 to be consistent with volume units!
//const double CrMass = CrDensity*cal.caloInfo().crystalVolume();
//const double CrMass = CrDensity*cal.G4Info().crystalVolume();



Expand Down Expand Up @@ -290,7 +290,7 @@ namespace mu2e {
{
CaloHit const& hit = CaloHits.at(ic);
int diskId = cal.crystal(hit.id()).diskID();
CLHEP::Hep3Vector crystalPos = cal.geomUtil().mu2eToDiskFF(diskId,cal.crystal(hit.id()).position()); //in disk FF frame
CLHEP::Hep3Vector crystalPos = cal.mu2eToDiskFF(diskId,cal.crystal(hit.id()).position()); //in disk FF frame
CaloHit const& caloHit = *(hit.readouts().at(0));


Expand Down Expand Up @@ -319,7 +319,7 @@ namespace mu2e {
while (grandMother->hasParent()) grandMother = grandMother->parent();
GenParticle const* generated = grandMother->genParticle() ? grandMother->genParticle().get() : 0;

CLHEP::Hep3Vector hitSimPos = cal.geomUtil().mu2eToDiskFF(diskId,hitSim.position().at(ip)); //in disk FF frame
CLHEP::Hep3Vector hitSimPos = cal.mu2eToDiskFF(diskId,hitSim.position().at(ip)); //in disk FF frame

_motId[_nSim] = mother->id().asInt();
_motPdgId[_nSim] = mother->pdgId();
Expand Down
15 changes: 7 additions & 8 deletions Analyses/src/DiskCal00_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "art_root_io/TFileService.h"

// Mu2e includes.
#include "Offline/CalorimeterGeom/inc/DiskCalorimeter.hh"
#include "Offline/CalorimeterGeom/inc/Calorimeter.hh"
#include "Offline/DataProducts/inc/CaloConst.hh"
#include "Offline/GeometryService/inc/GeomHandle.hh"
#include "Offline/RecoDataProducts/inc/CaloHit.hh"
Expand Down Expand Up @@ -155,7 +155,7 @@ namespace mu2e {

_hNHits->Fill(cryHits.size());
maxHits = std::max( cryHits.size(), maxHits );
GeomHandle<DiskCalorimeter> calGeom;
GeomHandle<Calorimeter> calGeom;

double totalEdep(0.);
set<int> hit_crystals;
Expand Down Expand Up @@ -265,18 +265,17 @@ namespace mu2e {
}

void DiskCal00::printCalInfo(){
DiskCalorimeter const& cal(*GeomHandle<DiskCalorimeter>());
int nSiPM = cal.nCrystals()*cal.caloInfo().getInt("nSiPMPerCrystal");
Calorimeter const& cal(*GeomHandle<Calorimeter>());
int nSiPM = cal.nCrystals()*cal.G4Info().get<int>("nSiPMPerCrystal");
cout << "Information about the disk Calorimeter: " << endl;
cout << "Number of disks: " << cal.nDisks() << endl;
cout << "Number of Readouts: " << nSiPM << " " << CaloConst::_nSiPMPerCrystal << " " << nSiPM/CaloConst::_nSiPMPerCrystal << endl;
cout << "Hex side size: " << 2.0*cal.caloInfo().getDouble("crystalXYLength") << endl;
cout << "Hex side size: " << 2.0*cal.G4Info().get<double>("crystalXYLength") << endl;

cout << "Depth: " << cal.caloInfo().getDouble("crystalZLength") << endl;
cout << "Origin: " << cal.geomUtil().origin() << endl;
cout << "Depth: " << cal.G4Info().get<double>("crystalZLength") << endl;
for (unsigned i=0; i<cal.nDisks(); ++i){
Disk const& disk = cal.disk(i);
cout << "Disk: " << i << " " << "origin: " << disk.geomInfo().origin() << endl;
cout << "Disk: " << i << " " << "origin: " << disk.diskInfo().origin() << endl;
}
}

Expand Down
2 changes: 1 addition & 1 deletion Analyses/src/ReadBack_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ namespace mu2e {
++stepPtMap2[step.volumeId()];


CLHEP::Hep3Vector hitPos = cal.geomUtil().mu2eToCrystal(step.volumeId(),step.position());
CLHEP::Hep3Vector hitPos = cal.mu2eToCrystal(step.volumeId(),step.position());
_hCaCrystalXY->Fill(hitPos.x(),hitPos.y());

if ( _diagLevel > 1 && _nAnalyzed < _maxFullPrint )
Expand Down
10 changes: 5 additions & 5 deletions CalPatRec/inc/CalHelixFinderAlg.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@ namespace mu2e {
void setTracker (const Tracker* Tracker) { _tracker = Tracker; }
void setCalorimeter(const Calorimeter* Cal ) {
_calorimeter = Cal;
fCaloOffset = (_calorimeter->caloInfo().getDouble("diskCaseZLength")/2.
+ ( _calorimeter->caloInfo().getDouble("BPPipeZOffset")
+ _calorimeter->caloInfo().getDouble("BPHoleZLength")
+ _calorimeter->caloInfo().getDouble("FEEZLength"))/2.
- _calorimeter->caloInfo().getDouble("FPCarbonZLength") - _calorimeter->caloInfo().getDouble("FPFoamZLength")
fCaloOffset = (_calorimeter->G4Info().get<double>("diskCaseZLength")/2.
+ ( _calorimeter->G4Info().get<double>("BPPipeZOffset")
+ _calorimeter->G4Info().get<double>("BPHoleZLength")
+ _calorimeter->G4Info().get<double>("FEEZLength"))/2.
- _calorimeter->G4Info().get<double>("FPCarbonZLength") - _calorimeter->G4Info().get<double>("FPFoamZLength")
);
}
//-----------------------------------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions CalPatRec/src/AgnosticHelixFinder_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,10 @@ namespace mu2e {
_bz0ConvSq = _bz0Conv * _bz0Conv;

// Offset for calo cluster z positions
double offset = _calorimeter->caloInfo().getDouble("diskCaseZLength");
offset += _calorimeter->caloInfo().getDouble("BPPipeZOffset");
offset += _calorimeter->caloInfo().getDouble("BPHoleZLength");
offset += _calorimeter->caloInfo().getDouble("FEEZLength");
double offset = _calorimeter->G4Info().get<double>("diskCaseZLength");
offset += _calorimeter->G4Info().get<double>("BPPipeZOffset");
offset += _calorimeter->G4Info().get<double>("BPHoleZLength");
offset += _calorimeter->G4Info().get<double>("FEEZLength");
offset /= 2.0;
_caloZOffset = offset;
}
Expand Down Expand Up @@ -680,8 +680,8 @@ namespace mu2e {
if (cl.isNonnull()) {
cHit hit;
hit.hitIndice = HitType::CALOCLUSTER;
CLHEP::Hep3Vector gpos = _calorimeter->geomUtil().diskToMu2e(cl->diskID(), cl->cog3Vector());
CLHEP::Hep3Vector tpos = _calorimeter->geomUtil().mu2eToTracker(gpos);
CLHEP::Hep3Vector gpos = _calorimeter->diskToMu2e(cl->diskID(), cl->cog3Vector());
CLHEP::Hep3Vector tpos = _calorimeter->mu2eToTracker(gpos);
_caloPos.SetCoordinates(tpos.x(), tpos.y(), tpos.z() - _caloZOffset);
hit.pos = _caloPos;
_tcHits.push_back(hit);
Expand Down
8 changes: 4 additions & 4 deletions CalPatRec/src/CalHelixFinderAlg.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ namespace mu2e {
return;
}
//fill the calorimeter cluster info
Hep3Vector gpos = _calorimeter->geomUtil().diskToMu2e(cl->diskID(),cl->cog3Vector());
Hep3Vector tpos = _calorimeter->geomUtil().mu2eToTracker(gpos);
Hep3Vector gpos = _calorimeter->diskToMu2e(cl->diskID(),cl->cog3Vector());
Hep3Vector tpos = _calorimeter->mu2eToTracker(gpos);
fCaloTime = cl->time();
fCaloX = tpos.x();
fCaloY = tpos.y();
Expand All @@ -272,8 +272,8 @@ namespace mu2e {
// if (cl == NULL) return false;

// //fill the calorimeter cluster info
// Hep3Vector gpos = _calorimeter->geomUtil().diskToMu2e(cl->diskID(),cl->cog3Vector());
// Hep3Vector tpos = _calorimeter->geomUtil().mu2eToTracker(gpos);
// Hep3Vector gpos = _calorimeter->diskToMu2e(cl->diskID(),cl->cog3Vector());
// Hep3Vector tpos = _calorimeter->mu2eToTracker(gpos);
// fCaloTime = cl->time();
// fCaloX = tpos.x();
// fCaloY = tpos.y();
Expand Down
4 changes: 2 additions & 2 deletions CalPatRec/src/CalHelixFinder_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,9 @@ namespace mu2e {
if(HfResult._timeClusterPtr->hasCaloCluster()) {
CLHEP::Hep3Vector gpos,tpos;

gpos = _hfinder._calorimeter->geomUtil().diskToMu2e(HfResult._timeClusterPtr->caloCluster()->diskID(),
gpos = _hfinder._calorimeter->diskToMu2e(HfResult._timeClusterPtr->caloCluster()->diskID(),
HfResult._timeClusterPtr->caloCluster()->cog3Vector());
tpos = _hfinder._calorimeter->geomUtil().mu2eToTracker(gpos);
tpos = _hfinder._calorimeter->mu2eToTracker(gpos);

hel_t0 = HfResult._timeClusterPtr->caloCluster()->time() - (tpos.z() - z0)/sin(pitchAngle)/(beta*CLHEP::c_light);

Expand Down
6 changes: 3 additions & 3 deletions CalPatRec/src/CalLineTimePeakFinder_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ namespace mu2e {
stopping_target_ = sth.get();

// get the offset between the calo disks and the tracker system
calo_d0_offset_ = calorimeter_->geomUtil().mu2eToTracker(calorimeter_->geomUtil().diskToMu2e(0, CLHEP::Hep3Vector(0., 0., 0.))).z();
calo_d1_offset_ = calorimeter_->geomUtil().mu2eToTracker(calorimeter_->geomUtil().diskToMu2e(1, CLHEP::Hep3Vector(0., 0., 0.))).z();
calo_d0_offset_ = calorimeter_->mu2eToTracker(calorimeter_->diskToMu2e(0, CLHEP::Hep3Vector(0., 0., 0.))).z();
calo_d1_offset_ = calorimeter_->mu2eToTracker(calorimeter_->diskToMu2e(1, CLHEP::Hep3Vector(0., 0., 0.))).z();

// get the target position in the tracker system
target_pos_ = calorimeter_->geomUtil().mu2eToTracker(stopping_target_->centerInMu2e());
target_pos_ = calorimeter_->mu2eToTracker(stopping_target_->centerInMu2e());

}

Expand Down
4 changes: 2 additions & 2 deletions CalPatRec/src/CalTimePeakFinder_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ namespace mu2e {
// convert cluster coordinates defined in the disk frame to the detector
// coordinate system
//-----------------------------------------------------------------------------
gpos = _calorimeter->geomUtil().diskToMu2e(cl->diskID(),cl->cog3Vector());
tpos = _calorimeter->geomUtil().mu2eToTracker(gpos);
gpos = _calorimeter->diskToMu2e(cl->diskID(),cl->cog3Vector());
tpos = _calorimeter->mu2eToTracker(gpos);

xcl = tpos.x();
ycl = tpos.y();
Expand Down
2 changes: 1 addition & 1 deletion CalPatRec/src/DeltaFinder_types.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace mu2e {
mu2e::GeomHandle<mu2e::Tracker> tH;
tracker = tH.get();

// mu2e::GeomHandle<mu2e::DiskCalorimeter> cH;
// mu2e::GeomHandle<mu2e::Calorimeter> cH;
// calorimeter = cH.get();

//-----------------------------------------------------------------------------
Expand Down
9 changes: 5 additions & 4 deletions CaloCluster/src/CaloClusterFast_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ namespace mu2e {
++iterStart;

//start the clustering algorithm for the hits between iStart and iStop
std::queue<int> crystalToVisit;
std::queue<unsigned> crystalToVisit;
std::vector<bool> isVisited(cal.nCrystals());

//put the first hit in the cluster list
Expand All @@ -134,7 +134,8 @@ namespace mu2e {
isVisited[visitId]=true;

auto neighborsId = cal.crystal(visitId).neighbors();
if (extendSearch_) std::copy(cal.nextNeighbors(visitId).begin(), cal.nextNeighbors(visitId).end(), std::back_inserter(neighborsId));
auto nn = cal.crystal(visitId).nextNeighbors();
if (extendSearch_) std::copy(nn.begin(), nn.end(), std::back_inserter(neighborsId));

for (const auto& iId : neighborsId)
{
Expand All @@ -145,7 +146,7 @@ namespace mu2e {
for (auto it=iterStart; it != iterStop; ++it)
{
if (*it==hits.size()) continue;
if (caloHits[*it].crystalID() != iId) continue;
if (caloHits[*it].crystalID() != static_cast<int>(iId)) continue;

if (caloHits[*it].energyDep() > ExpandCut_) crystalToVisit.push(iId);
clusterList.push_back(*it);
Expand All @@ -155,7 +156,7 @@ namespace mu2e {
crystalToVisit.pop();
}

auto functorEnergy = [&caloHits](int a, int b) {return caloHits[a].energyDep() > caloHits[b].energyDep();};
auto functorEnergy = [&caloHits](auto a, auto b) {return caloHits[a].energyDep() > caloHits[b].energyDep();};
std::sort(clusterList.begin(),clusterList.end(),functorEnergy);

fillCluster(cal, caloHitsHandle, caloHits, clusterList, caloClusters );
Expand Down
12 changes: 6 additions & 6 deletions CaloCluster/src/CaloTrigger_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ namespace mu2e {

mu2e::GeomHandle<mu2e::Calorimeter> ch;
const Calorimeter* cal = ch.get();
int nro = cal->caloInfo().getInt("nSiPMPerCrystal");
int nro = cal->G4Info().get<int>("nSiPMPerCrystal");

unsigned offsetT0_ = unsigned(blindTime_/digiSampling_);
unsigned nBinTime = unsigned (mbtime_ - blindTime_ + endTimeBuffer_) / digiSampling_;
Expand Down Expand Up @@ -192,7 +192,7 @@ namespace mu2e {
int ring1max(0);
int ring1max2(0);
std::queue<int> crystalRing1;
for (const auto& nid : cal->neighbors(seed->crId_)) crystalRing1.push(nid);
for (const auto& nid : cal->crystal(seed->crId_).neighbors()) crystalRing1.push(nid);
while (!crystalRing1.empty()){
int nid = crystalRing1.front();
for (int itimebin= seed->index_-DNTBINs_;itimebin<=seed->index_+DNTBINs_;++itimebin){
Expand All @@ -214,7 +214,7 @@ namespace mu2e {
//
int ring2max(0);
std::queue<int> crystalRing2;
for (const auto& nid : cal->nextNeighbors(seed->crId_)) crystalRing2.push(nid);
for (const auto& nid : cal->crystal(seed->crId_).nextNeighbors()) crystalRing2.push(nid);
while (!crystalRing2.empty()){
int nid = crystalRing2.front();
for (int itimebin= seed->index_-DNTBINs_;itimebin<=seed->index_+DNTBINs_;++itimebin){
Expand All @@ -233,7 +233,7 @@ namespace mu2e {

std::queue<int> crystalToVisit;
crystalToVisit.push(seed->crId_);
for (const auto& nid : cal->neighbors(seed->crId_)) crystalToVisit.push(nid);
for (const auto& nid : cal->crystal(seed->crId_).neighbors()) crystalToVisit.push(nid);
if (diagLevel_ > 1) std::cout << " To visit: " << crystalToVisit.size() << std::endl;

while (!crystalToVisit.empty()){
Expand All @@ -248,8 +248,8 @@ namespace mu2e {
yc += cal->crystal(nid).localPosition().y()*hit.val_;
hit.val_=-abs(hit.val_);
if (diagLevel_ > 1) std::cout << " index add close to: " << nid << std::endl;
for (const auto& neighbor : cal->neighbors(nid)) crystalToVisit.push(neighbor);
if (extendSecond_) for (const auto& nneighbor : cal->nextNeighbors(nid)) crystalToVisit.push(nneighbor);
for (const auto& neighbor : cal->crystal(nid).neighbors()) crystalToVisit.push(neighbor);
if (extendSecond_) for (const auto& nneighbor : cal->crystal(nid).nextNeighbors()) crystalToVisit.push(nneighbor);
}
}
crystalToVisit.pop();
Expand Down
7 changes: 4 additions & 3 deletions CaloCluster/src/ClusterFinder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ namespace mu2e {

while (!crystalToVisit_.empty())
{
int visitId = crystalToVisit_.front();
auto visitId = crystalToVisit_.front();
isVisited_[visitId] = true;

std::vector<int> neighborsId = cal_->crystal(visitId).neighbors();
if (addSecondRing_) neighborsId.insert(neighborsId.end(), cal_->nextNeighbors(visitId).begin(), cal_->nextNeighbors(visitId).end());
auto neighborsId = cal_->crystal(visitId).neighbors();
const auto& nn = cal_->crystal(visitId).nextNeighbors();
if (addSecondRing_) neighborsId.insert(neighborsId.end(), nn.begin(), nn.end());

for (auto& iId : neighborsId)
{
Expand Down
8 changes: 4 additions & 4 deletions CaloCluster/src/ClusterUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ namespace mu2e {
double sx(0),sy(0),sz(0),sx2(0),sy2(0),sw(0);
fill(sx,sy,sz,sx2,sy2,sw);

int iSection = cal_.crystal(hits_[0]->crystalID()).diskID();
auto iSection = cal_.crystal(hits_[0]->crystalID()).diskID();
CLHEP::Hep3Vector cogMu2eFrame(sx/sw,sy/sw,sz/sw);
return cal_.geomUtil().mu2eToDiskFF(iSection,cogMu2eFrame);
return cal_.mu2eToDiskFF(iSection,cogMu2eFrame);
}

//-------------------------------------------------------------------------------------------------
Expand All @@ -65,10 +65,10 @@ namespace mu2e {
//-------------------------------------------------------------------------------------------------
void ClusterUtils::fill(double& sx, double& sy, double& sz, double& sx2, double& sy2, double& sw) const
{
int iSection = cal_.crystal(hits_[0]->crystalID()).diskID();
auto iSection = cal_.crystal(hits_[0]->crystalID()).diskID();
for (const auto& hit : hits_)
{
int crId(hit->crystalID());
auto crId(hit->crystalID());
double energy(hit->energyDep());

if (cal_.crystal(crId).diskID() != iSection) continue;
Expand Down
4 changes: 2 additions & 2 deletions CaloDiag/src/CaloExample_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ namespace mu2e {
{
const CaloHit& hit = CaloHits.at(ic);
int diskId = cal.crystal(hit.crystalID()).diskID();
CLHEP::Hep3Vector crystalPos = cal.geomUtil().mu2eToDiskFF(diskId,cal.crystal(hit.crystalID()).position()); //in disk FF frame
CLHEP::Hep3Vector crystalPos = cal.mu2eToDiskFF(diskId,cal.crystal(hit.crystalID()).position()); //in disk FF frame

const auto eDepMCs = caloHitTruth[ic].energyDeposits();

Expand Down Expand Up @@ -455,7 +455,7 @@ namespace mu2e {
if ( (hit.volumeId()<VirtualDetectorId::EMC_Disk_0_SurfIn || hit.volumeId()>VirtualDetectorId::EMC_Disk_1_EdgeOut)
&& hit.volumeId() != VirtualDetectorId::TT_Back) continue;

CLHEP::Hep3Vector VDPos = cal.geomUtil().mu2eToTracker(hit.position());
CLHEP::Hep3Vector VDPos = cal.mu2eToTracker(hit.position());

vdId_[nVd_] = hit.volumeId();
vdPdgId_[nVd_] = hit.simParticle()->pdgId();
Expand Down
8 changes: 4 additions & 4 deletions CaloDiag/src/CaloNNDiag_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ namespace mu2e {
for (unsigned int ic=0; ic<CaloHits.size();++ic){
const CaloHit& hit = CaloHits.at(ic);
int diskId = cal.crystal(hit.crystalID()).diskID();
CLHEP::Hep3Vector crystalPos = cal.geomUtil().mu2eToDiskFF(diskId,cal.crystal(hit.crystalID()).position()); //in disk FF frame
CLHEP::Hep3Vector crystalPos = cal.mu2eToDiskFF(diskId,cal.crystal(hit.crystalID()).position()); //in disk FF frame

//Find the caloDigiMC in the truth map
auto itMC = caloDigiTruth.begin();
Expand Down Expand Up @@ -392,7 +392,7 @@ namespace mu2e {
}

const CaloHit& seedHit = CaloHits.at(cryList[0]);
CLHEP::Hep3Vector seedPos = cal.geomUtil().mu2eToDiskFF(cluster.diskID(),cal.crystal(seedHit.crystalID()).position());
CLHEP::Hep3Vector seedPos = cal.mu2eToDiskFF(cluster.diskID(),cal.crystal(seedHit.crystalID()).position());

cluDisk_[nCluster_] = cluster.diskID();
cluEnergy_[nCluster_] = cluster.energyDep();
Expand Down Expand Up @@ -430,7 +430,7 @@ namespace mu2e {
if (vdMapEntry != vdMap.end())
{
simMom = vdMapEntry->second->momentum().mag();
simPos = cal.geomUtil().mu2eToDiskFF(cluster.diskID(), vdMapEntry->second->position());
simPos = cal.mu2eToDiskFF(cluster.diskID(), vdMapEntry->second->position());
}

sId.push_back(sim->id().asInt());
Expand Down Expand Up @@ -480,7 +480,7 @@ namespace mu2e {

double hitTime = fmod(hit.time(),_mbtime);

CLHEP::Hep3Vector VDPos = cal.geomUtil().mu2eToTracker(hit.position());
CLHEP::Hep3Vector VDPos = cal.mu2eToTracker(hit.position());

vdId_[nVd_] = hit.volumeId();
vdPdgId_[nVd_] = hit.simParticle()->pdgId();
Expand Down
Loading