diff --git a/.build.ci.sh b/.build.ci.sh
index 011fd6aec2830f401761aa721d7f205ada99e475..6e4c3265fe63ab5c6d4acf1c9d01e13c5e44658d 100644
--- a/.build.ci.sh
+++ b/.build.ci.sh
@@ -8,7 +8,6 @@ logfile=mylog.txt
if [ "$LCG_RELEASE" = "KEY4HEP_STACK" ]; then
logfile=mylog-k4.sh
- source /cvmfs/sw.hsf.org/key4hep/setup.sh
./build-k4.sh >& ${logfile} &
buildpid=$!
else
diff --git a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp b/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
index 2a4ee084e2ecf41a90a4dcc700d8e70683f79cdd..973a556282a16dccc8933c32cb10307926ec1725 100644
--- a/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
@@ -259,7 +259,7 @@ StatusCode PlanarDigiAlg::execute()
localPointSmeared.setY( localPoint.y() + dy );
//check if hit is in boundaries
- if ( ms->isLocalInBoundary( localPointSmeared ) && fabs(dx)<_maxPull*resU && fabs(dy)<_maxPull*resV ) {
+ if ( ms->isLocalInBoundary( localPointSmeared ) && fabs(dx)<=_maxPull*resU && fabs(dy)<=_maxPull*resV ) {
//if ( ms->isLocalInBoundary( localPointSmeared ) ) {
accept_hit = true;
break;
diff --git a/Examples/options/sim-rec-trackerecal.py b/Examples/options/sim-rec-trackerecal.py
index 1117e414ab57dbc65ee71160ee28c5d3ca61af95..c3a8f6d6865ecf240769cfe6fee9cda9b9f6f11b 100644
--- a/Examples/options/sim-rec-trackerecal.py
+++ b/Examples/options/sim-rec-trackerecal.py
@@ -79,7 +79,7 @@ tpc_sensdettool.TypeOption = 1
from Configurables import GearSvc
gearsvc = GearSvc("GearSvc")
-gearsvc.GearXMLFile = "Detector/DetCEPCv4/compact/FullDetGear.xml"
+#gearsvc.GearXMLFile = "Detector/DetCEPCv4/compact/FullDetGear.xml"
from Configurables import TrackSystemSvc
tracksystemsvc = TrackSystemSvc("TrackSystemSvc")
@@ -331,7 +331,7 @@ ApplicationMgr(
TopAlg = [genalg, detsimalg, digiVXD, digiSIT, digiSET, digiFTD, spSIT, spFTD, digiTPC, clupatra, tracking, forward, subset, full, simHitMerge, caloDigi, pandoralg, write],
EvtSel = 'NONE',
EvtMax = 10,
- ExtSvc = [rndmengine, dsvc, evtseeder, gearsvc, geosvc, tracksystemsvc],
+ ExtSvc = [rndmengine, dsvc, evtseeder, geosvc, gearsvc, tracksystemsvc],
HistogramPersistency='ROOT',
OutputLevel=INFO
)
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp b/Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp
index 1912eee92592f0b8071fcabed38259a61c049f87..48908a6439a27cc352020a83572640803034f777 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp
@@ -53,7 +53,7 @@ pandora::StatusCode MCParticleCreator::CreateMCParticles(const CollectionMaps& c
mcParticleParameters.m_particleId = pMcParticle.getPDG();
mcParticleParameters.m_mcParticleType = pandora::MC_3D;
mcParticleParameters.m_pParentAddress = &pMcParticle;
- unsigned int p_id = pMcParticle.id();
+ unsigned int p_id = pMcParticle.id().index;
//auto p_mc = const_cast<edm4hep::MCParticle*>(&pMcParticle);
auto p_mc = &pMcParticle;
(*m_id_pMC_map) [p_id] = p_mc;
@@ -131,8 +131,8 @@ pandora::StatusCode MCParticleCreator::CreateCaloHitToMCParticleRelationships(co
auto conb = pSimHit.getContributions(iCont);
auto ipa = conb.getParticle();
float ien = conb.getEnergy();
- if( m_id_pMC_map->find(ipa.id()) == m_id_pMC_map->end() ) continue;
- auto p_tmp = (*m_id_pMC_map)[ipa.id()];
+ if( m_id_pMC_map->find(ipa.id().index) == m_id_pMC_map->end() ) continue;
+ auto p_tmp = (*m_id_pMC_map)[ipa.id().index];
mcParticleToEnergyWeightMap[p_tmp] += ien;
}
@@ -190,13 +190,13 @@ pandora::StatusCode MCParticleCreator::CreateTrackToMCParticleRelationships(cons
if( pMCRecoTrackerAssociationCollection.at(ic).getRec().id() != pTrack->getTrackerHits(ith).id() ) continue;
auto pSimHit = pMCRecoTrackerAssociationCollection.at(ic).getSim();
auto ipa = pSimHit.getMCParticle();
- if( m_id_pMC_map->find(ipa.id()) == m_id_pMC_map->end() ) continue;
+ if( m_id_pMC_map->find(ipa.id().index) == m_id_pMC_map->end() ) continue;
const float trueMomentum(pandora::CartesianVector(ipa.getMomentum()[0], ipa.getMomentum()[1], ipa.getMomentum()[2]).GetMagnitude());
const float deltaMomentum(std::fabs(recoMomentum - trueMomentum));
if (deltaMomentum < bestDeltaMomentum)
{
//pBestMCParticle =((*m_id_pMC_map)[ipa.id()]);
- best_mc_id = ipa.id() ;
+ best_mc_id = ipa.id().index ;
bestDeltaMomentum = deltaMomentum;
}
}
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp b/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp
index cfe8f2f25f1906723527534f6ec3154616c752c7..a95ea9c70b872d0731245f911af378d8e8a6dc30 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp
@@ -669,9 +669,9 @@ StatusCode PandoraPFAlg::CreateMCRecoParticleAssociation()
if(it->getRec().id() != hit.id()) continue;
for(auto itc = it->getSim().contributions_begin(); itc != it->getSim().contributions_end(); itc++)
{
- if(mc_map.find(itc->getParticle().id()) == mc_map.end()) mc_map[itc->getParticle().id()] = itc->getParticle() ;
- if(id_edep_map.find(itc->getParticle().id()) != id_edep_map.end()) id_edep_map[itc->getParticle().id()] = id_edep_map[itc->getParticle().id()] + itc->getEnergy() ;
- else id_edep_map[itc->getParticle().id()] = itc->getEnergy() ;
+ if(mc_map.find(itc->getParticle().id().index) == mc_map.end()) mc_map[itc->getParticle().id().index] = itc->getParticle() ;
+ if(id_edep_map.find(itc->getParticle().id().index) != id_edep_map.end()) id_edep_map[itc->getParticle().id().index] = id_edep_map[itc->getParticle().id().index] + itc->getEnergy() ;
+ else id_edep_map[itc->getParticle().id().index] = itc->getEnergy() ;
tot_en += itc->getEnergy() ;
}
}
diff --git a/Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp b/Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp
index e633a9da650edd8cca3274b5ffc153af6345407d..8ebe8e239504f3475fa07c64db0199a72ea2e72b 100644
--- a/Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp
+++ b/Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp
@@ -321,7 +321,7 @@ pandora::StatusCode TrackCreator::ExtractKinks(const CollectionMaps& collectionM
for (unsigned int iTrack = 0, nTracks = pReconstructedParticle.tracks_size(); iTrack < nTracks; ++iTrack)
{
auto pTrack = pReconstructedParticle.getTracks(iTrack);
- (0 == iTrack) ? m_parentTrackList.insert(pTrack.id()) : m_daughterTrackList.insert(pTrack.id());
+ (0 == iTrack) ? m_parentTrackList.insert(pTrack.id().index) : m_daughterTrackList.insert(pTrack.id().index);
int trackPdgCode = pandora::UNKNOWN_PARTICLE_TYPE;
@@ -421,7 +421,7 @@ pandora::StatusCode TrackCreator::ExtractProngsAndSplits(const CollectionMaps& c
for (unsigned int iTrack = 0, nTracks = pReconstructedParticle.tracks_size(); iTrack < nTracks; ++iTrack)
{
edm4hep::Track pTrack = pReconstructedParticle.getTracks(iTrack);
- (0 == iTrack) ? m_parentTrackList.insert(pTrack.id()) : m_daughterTrackList.insert(pTrack.id());
+ (0 == iTrack) ? m_parentTrackList.insert(pTrack.id().index) : m_daughterTrackList.insert(pTrack.id().index);
if (0 == m_settings.m_shouldFormTrackRelationships) continue;
@@ -490,7 +490,7 @@ pandora::StatusCode TrackCreator::ExtractV0s(const CollectionMaps& collectionMap
for (unsigned int iTrack = 0, nTracks = pReconstructedParticle.tracks_size(); iTrack < nTracks; ++iTrack)
{
edm4hep::Track pTrack = pReconstructedParticle.getTracks(iTrack);
- m_v0TrackList.insert(pTrack.id());
+ m_v0TrackList.insert(pTrack.id().index);
int trackPdgCode = pandora::UNKNOWN_PARTICLE_TYPE;
@@ -546,7 +546,7 @@ bool TrackCreator::IsConflictingRelationship(const edm4hep::ReconstructedParticl
for (unsigned int iTrack = 0, nTracks = Particle.tracks_size(); iTrack < nTracks; ++iTrack)
{
edm4hep::Track pTrack = Particle.getTracks(iTrack) ;
- unsigned int pTrack_id = pTrack.id() ;
+ unsigned int pTrack_id = pTrack.id().index ;
if (this->IsDaughter(pTrack_id) || this->IsParent(pTrack_id) || this->IsV0(pTrack_id))
return true;
@@ -859,7 +859,7 @@ void TrackCreator::DefineTrackPfoUsage(const edm4hep::Track *const pTrack, Pando
bool canFormPfo(false);
bool canFormClusterlessPfo(false);
- if (trackParameters.m_reachesCalorimeter.Get() && !this->IsParent(pTrack->id()))
+ if (trackParameters.m_reachesCalorimeter.Get() && !this->IsParent(pTrack->id().index))
{
const float d0(std::fabs(pTrack->getTrackStates(0).D0)), z0(std::fabs(pTrack->getTrackStates(0).Z0));
@@ -888,8 +888,8 @@ void TrackCreator::DefineTrackPfoUsage(const edm4hep::Track *const pTrack, Pando
const float zCutForNonVertexTracks(m_tpcInnerR * std::fabs(pZ / pT) + m_settings.m_zCutForNonVertexTracks);
const bool passRzQualityCuts((zMin < zCutForNonVertexTracks) && (rInner < m_tpcInnerR + m_settings.m_maxTpcInnerRDistance));
- const bool isV0(this->IsV0(pTrack->id()));
- const bool isDaughter(this->IsDaughter(pTrack->id()));
+ const bool isV0(this->IsV0(pTrack->id().index));
+ const bool isDaughter(this->IsDaughter(pTrack->id().index));
// Decide whether track can be associated with a pandora cluster and used to form a charged PFO
if ((d0 < m_settings.m_d0TrackCut) && (z0 < m_settings.m_z0TrackCut) && (rInner < m_tpcInnerR + m_settings.m_maxTpcInnerRDistance))
@@ -926,7 +926,7 @@ void TrackCreator::DefineTrackPfoUsage(const edm4hep::Track *const pTrack, Pando
}
}
}
- else if (this->IsDaughter(pTrack->id()) || this->IsV0(pTrack->id()))
+ else if (this->IsDaughter(pTrack->id().index) || this->IsV0(pTrack->id().index))
{
std::cout<<"WARNING Recovering daughter or v0 track " << trackParameters.m_momentumAtDca.Get().GetMagnitude() << std::endl;
canFormPfo = true;
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp b/Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp
index 40f44d1a4a5a3f76cf8f527c704d855eeb709ddb..2da13168523268d37056960708474d8891c12ad2 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp
@@ -57,7 +57,7 @@ pandora::StatusCode MCParticleCreator::CreateMCParticles(const CollectionMaps& c
mcParticleParameters.m_particleId = pMcParticle.getPDG();
mcParticleParameters.m_mcParticleType = pandora::MC_3D;
mcParticleParameters.m_pParentAddress = &pMcParticle;
- unsigned int p_id = pMcParticle.id();
+ unsigned int p_id = pMcParticle.id().index;
auto p_mc = &pMcParticle;
(*m_id_pMC_map) [p_id] = p_mc;
mcParticleParameters.m_momentum = pandora::CartesianVector(pMcParticle.getMomentum()[0], pMcParticle.getMomentum()[1],
@@ -271,8 +271,8 @@ pandora::StatusCode MCParticleCreator::CreateCaloHitToMCParticleRelationships(co
edm4hep::CaloHitContribution conb = pSimHit.getContributions(iCont);
auto ipa = conb.getParticle();
float ien = conb.getEnergy();
- if( m_id_pMC_map->find(ipa.id()) == m_id_pMC_map->end() ) continue;
- auto p_tmp = (*m_id_pMC_map)[ipa.id()];
+ if( m_id_pMC_map->find(ipa.id().index) == m_id_pMC_map->end() ) continue;
+ auto p_tmp = (*m_id_pMC_map)[ipa.id().index];
mcParticleToEnergyWeightMap[p_tmp] += ien;
}
@@ -331,12 +331,12 @@ pandora::StatusCode MCParticleCreator::CreateTrackToMCParticleRelationships(cons
if( pMCRecoTrackerAssociationCollection.at(ic).getRec().id() != pTrack->getTrackerHits(ith).id() ) continue;
auto pSimHit = pMCRecoTrackerAssociationCollection.at(ic).getSim();
auto ipa = pSimHit.getMCParticle();
- if( m_id_pMC_map->find(ipa.id()) == m_id_pMC_map->end() ) continue;
+ if( m_id_pMC_map->find(ipa.id().index) == m_id_pMC_map->end() ) continue;
const float trueMomentum(pandora::CartesianVector(ipa.getMomentum()[0], ipa.getMomentum()[1], ipa.getMomentum()[2]).GetMagnitude());
const float deltaMomentum(std::fabs(recoMomentum - trueMomentum));
if (deltaMomentum < bestDeltaMomentum)
{
- pBestMCParticle = ((*m_id_pMC_map)[ipa.id()]);
+ pBestMCParticle = ((*m_id_pMC_map)[ipa.id().index]);
bestDeltaMomentum = deltaMomentum;
}
}
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp b/Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp
index b0a1d7ca4fd4c57807960672cc588f5f3576cf7e..16996f6ca34d503c97f67350c1262ac7343bf45d 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp
@@ -591,7 +591,7 @@ StatusCode PandoraMatrixAlg::Ana()
{
if(reco_associa_col->at(j).getRec().id() != pReco.id() ) continue;
std::cout<<"MC pid ="<<reco_associa_col->at(j).getSim().getPDG()<<",weight="<<reco_associa_col->at(j).getWeight()<<", px="<<reco_associa_col->at(j).getSim().getMomentum()[0]<<", py="<<reco_associa_col->at(j).getSim().getMomentum()[1]<<",pz="<<reco_associa_col->at(j).getSim().getMomentum()[2]<<std::endl;
- tmp_mc_id .push_back(reco_associa_col->at(j).getSim().id());
+ tmp_mc_id .push_back(reco_associa_col->at(j).getSim().id().index);
tmp_mc_weight.push_back(reco_associa_col->at(j).getWeight());
}
m_pReco_mc_id .push_back(tmp_mc_id);
@@ -604,7 +604,7 @@ StatusCode PandoraMatrixAlg::Ana()
{
for(unsigned int i=0 ; i< MCParticle->size(); i++)
{
- m_mc_id .push_back(MCParticle->at(i).id());
+ m_mc_id .push_back(MCParticle->at(i).id().index);
m_mc_p_size.push_back(MCParticle->at(i).parents_size());
m_mc_pid .push_back(MCParticle->at(i).getPDG());
m_mc_mass .push_back(MCParticle->at(i).getMass());
@@ -655,9 +655,9 @@ StatusCode PandoraMatrixAlg::CreateMCRecoParticleAssociation()
if(it->getRec().id() != hit.id()) continue;
for(auto itc = it->getSim().contributions_begin(); itc != it->getSim().contributions_end(); itc++)
{
- if(mc_map.find(itc->getParticle().id()) == mc_map.end()) mc_map[itc->getParticle().id()] = itc->getParticle() ;
- if(id_edep_map.find(itc->getParticle().id()) != id_edep_map.end()) id_edep_map[itc->getParticle().id()] = id_edep_map[itc->getParticle().id()] + itc->getEnergy() ;
- else id_edep_map[itc->getParticle().id()] = itc->getEnergy() ;
+ if(mc_map.find(itc->getParticle().id().index) == mc_map.end()) mc_map[itc->getParticle().id().index] = itc->getParticle() ;
+ if(id_edep_map.find(itc->getParticle().id().index) != id_edep_map.end()) id_edep_map[itc->getParticle().id().index] = id_edep_map[itc->getParticle().id().index] + itc->getEnergy() ;
+ else id_edep_map[itc->getParticle().id().index] = itc->getEnergy() ;
tot_en += itc->getEnergy() ;
}
}
diff --git a/Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp b/Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp
index c06f2d9b87e04193fded0be657e07e7270d5165b..c290e069311e26d5294033c7eaddf8bebdde34d9 100644
--- a/Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp
+++ b/Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp
@@ -185,7 +185,7 @@ pandora::StatusCode TrackCreator::ExtractKinks(const CollectionMaps& collectionM
for (unsigned int iTrack = 0, nTracks = pReconstructedParticle.tracks_size(); iTrack < nTracks; ++iTrack)
{
auto pTrack = pReconstructedParticle.getTracks(iTrack);
- (0 == iTrack) ? m_parentTrackList.insert(pTrack.id()) : m_daughterTrackList.insert(pTrack.id());
+ (0 == iTrack) ? m_parentTrackList.insert(pTrack.id().index) : m_daughterTrackList.insert(pTrack.id().index);
int trackPdgCode = pandora::UNKNOWN_PARTICLE_TYPE;
@@ -285,7 +285,7 @@ pandora::StatusCode TrackCreator::ExtractProngsAndSplits(const CollectionMaps& c
for (unsigned int iTrack = 0, nTracks = pReconstructedParticle.tracks_size(); iTrack < nTracks; ++iTrack)
{
auto pTrack = pReconstructedParticle.getTracks(iTrack);
- (0 == iTrack) ? m_parentTrackList.insert(pTrack.id()) : m_daughterTrackList.insert(pTrack.id());
+ (0 == iTrack) ? m_parentTrackList.insert(pTrack.id().index) : m_daughterTrackList.insert(pTrack.id().index);
if (0 == m_settings.m_shouldFormTrackRelationships) continue;
@@ -354,7 +354,7 @@ pandora::StatusCode TrackCreator::ExtractV0s(const CollectionMaps& collectionMap
for (unsigned int iTrack = 0, nTracks = pReconstructedParticle.tracks_size(); iTrack < nTracks; ++iTrack)
{
auto pTrack = pReconstructedParticle.getTracks(iTrack);
- m_v0TrackList.insert(pTrack.id());
+ m_v0TrackList.insert(pTrack.id().index);
int trackPdgCode = pandora::UNKNOWN_PARTICLE_TYPE;
@@ -409,7 +409,7 @@ bool TrackCreator::IsConflictingRelationship(const edm4hep::ReconstructedParticl
for (unsigned int iTrack = 0, nTracks = Particle.tracks_size(); iTrack < nTracks; ++iTrack)
{
edm4hep::Track pTrack = Particle.getTracks(iTrack) ;
- unsigned int pTrack_id = pTrack.id() ;
+ unsigned int pTrack_id = pTrack.id().index ;
if (this->IsDaughter(pTrack_id) || this->IsParent(pTrack_id) || this->IsV0(pTrack_id))
return true;
@@ -720,7 +720,7 @@ void TrackCreator::DefineTrackPfoUsage(edm4hep::Track *const pTrack, PandoraApi:
bool canFormPfo(false);
bool canFormClusterlessPfo(false);
- if (trackParameters.m_reachesCalorimeter.Get() && !this->IsParent(pTrack->id()))
+ if (trackParameters.m_reachesCalorimeter.Get() && !this->IsParent(pTrack->id().index))
{
const float d0(std::fabs(pTrack->getTrackStates(0).D0)), z0(std::fabs(pTrack->getTrackStates(0).Z0));
@@ -748,8 +748,8 @@ void TrackCreator::DefineTrackPfoUsage(edm4hep::Track *const pTrack, PandoraApi:
const float zCutForNonVertexTracks(m_tpcInnerR * std::fabs(pZ / pT) + m_settings.m_zCutForNonVertexTracks);
const bool passRzQualityCuts((zMin < zCutForNonVertexTracks) && (rInner < m_tpcInnerR + m_settings.m_maxTpcInnerRDistance));
- const bool isV0(this->IsV0(pTrack->id()));
- const bool isDaughter(this->IsDaughter(pTrack->id()));
+ const bool isV0(this->IsV0(pTrack->id().index));
+ const bool isDaughter(this->IsDaughter(pTrack->id().index));
// Decide whether track can be associated with a pandora cluster and used to form a charged PFO
if ((d0 < m_settings.m_d0TrackCut) && (z0 < m_settings.m_z0TrackCut) && (rInner < m_tpcInnerR + m_settings.m_maxTpcInnerRDistance))
@@ -786,7 +786,7 @@ void TrackCreator::DefineTrackPfoUsage(edm4hep::Track *const pTrack, PandoraApi:
}
}
}
- else if (this->IsDaughter(pTrack->id()) || this->IsV0(pTrack->id()))
+ else if (this->IsDaughter(pTrack->id().index) || this->IsV0(pTrack->id().index))
{
std::cout<<"WARNING Recovering daughter or v0 track " << trackParameters.m_momentumAtDca.Get().GetMagnitude() << std::endl;
canFormPfo = true;
diff --git a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
index 9ecee56418ae4387e73572d73b42b757a92bd2b2..6ff24484f6ee4503da8d4cde40432ace4955d993 100644
--- a/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
+++ b/Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
@@ -287,7 +287,8 @@ namespace clupatra_new{
UTIL::BitField64 encoder( UTIL::ILDCellID0::encoder_string ) ;
encoder[UTIL::ILDCellID0::subdet] = UTIL::ILDDetID::TPC ;
- edm4hep::TrackerHit firstHit; // = 0 ;
+ edm4hep::TrackerHit firstHit = 0;
+ // = 0 equal to unlink()
//firstHit.unlink();
IMarlinTrack* bwTrk = 0 ;
diff --git a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp b/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp
index fad902455532603dbf9c952db23dff1f49768b9c..ee5f1feb25c5cda5c95f0f4d9dab9801e943db04 100755
--- a/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp
+++ b/Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp
@@ -1166,13 +1166,18 @@ void FullLDCTrackingAlg::prepareVectors() {
trackExt->setNDF(tpcTrack.getNdf());
trackExt->setChi2(tpcTrack.getChi2());
for (int iHit=0;iHit<nHits;++iHit) {
- edm4hep::TrackerHit hit = tpcTrack.getTrackerHits(iHit);//hitVec[iHit];
- if(!hit.isAvailable()) error() << "Tracker hit not available" << endmsg;
+ edm4hep::TrackerHit hit = tpcTrack.getTrackerHits(iHit);
+ if (!hit.isAvailable()) {
+ error() << "Tracker hit not available" << endmsg;
+ continue;
+ }
//info() << "hit " << hit.id() << " " << hit.getCellID() << " " << hit.getPosition()[0] << " " << hit.getPosition()[1] << " " << hit.getPosition()[2] << endmsg;
auto it = mapTrackerHits.find(hit);
- if(it==mapTrackerHits.end()) error() << "Cannot find hit " << hit.id() << " in map" << endmsg;
- else continue;
- TrackerHitExtended * hitExt = it->second;
+ if (it==mapTrackerHits.end()) {
+ error() << "Cannot find hit " << hit.id() << " in map" << endmsg;
+ continue;
+ }
+ TrackerHitExtended* hitExt = it->second;
//info() << hit.id() << " " << hitExt << endmsg;
hitExt->setTrackExtended( trackExt );
trackExt->addTrackerHitExtended( hitExt );
@@ -1231,8 +1236,17 @@ void FullLDCTrackingAlg::prepareVectors() {
char strg[200];
HelixClass helixSi;
for (int iHit=0;iHit<nHits;++iHit) {
- edm4hep::TrackerHit hit = siTrack.getTrackerHits(iHit);//hitVec[iHit];
- TrackerHitExtended * hitExt = mapTrackerHits[hit];
+ edm4hep::TrackerHit hit = siTrack.getTrackerHits(iHit);
+ if (!hit.isAvailable()) {
+ error() << "Tracker hit not available" << endmsg;
+ continue;
+ }
+ auto it = mapTrackerHits.find(hit);
+ if (it==mapTrackerHits.end()) {
+ error() << "Cannot find hit " << hit.id() << " in map" << endmsg;
+ continue;
+ }
+ TrackerHitExtended* hitExt = it->second;
hitExt->setTrackExtended( trackExt );
trackExt->addTrackerHitExtended( hitExt );
@@ -1534,8 +1548,8 @@ TrackExtended * FullLDCTrackingAlg::CombineTracks(TrackExtended * tpcTrack, Trac
int nTPCHits = int(tpcHitVec.size());
int nHits = nTPCHits + nSiHits;
- //std::cout << "FullLDCTrackingAlg::CombineTracks nSiHits = " << nSiHits << endmsg;
- //std::cout << "FullLDCTrackingAlg::CombineTracks nTPCHits = " << nTPCHits << endmsg;
+ //debug() << "FullLDCTrackingAlg::CombineTracks nSiHits = " << nSiHits << endmsg;
+ //debug() << "FullLDCTrackingAlg::CombineTracks nTPCHits = " << nTPCHits << endmsg;
TrackerHitVec trkHits;
trkHits.reserve(nHits);
@@ -1748,7 +1762,7 @@ TrackExtended * FullLDCTrackingAlg::CombineTracks(TrackExtended * tpcTrack, Trac
tpcHitInFit.push_back(tpcHitVec[i]);
}
}
-
+
debug() << "FullLDCTrackingAlg::CombineTracks: Check for Silicon Hit rejections ... " << endmsg;
if ( (int)siOutliers.size() > _maxAllowedSiHitRejectionsForTrackCombination ) {
diff --git a/build.sh b/build.sh
index c584e4a7ded51759bc6c900702537d21d5cf48fe..5c7393d169fd5b35240df699e7c1314b5cc783a3 100755
--- a/build.sh
+++ b/build.sh
@@ -97,7 +97,7 @@ function run-install() {
# The current default platform
lcg_platform=x86_64-centos7-gcc11-opt
-lcg_version=103.0.0
+lcg_version=103.0.2
bldtool=${CEPCSW_BLDTOOL} # make, ninja # set in env var
diff --git a/setup.sh b/setup.sh
index 7e678023cf9c362148fe13ad70ae39f157f368b8..3e09a68fff76f3d16300423d10bd8aba3d713317 100644
--- a/setup.sh
+++ b/setup.sh
@@ -70,7 +70,7 @@ function setup-install-area() {
# CEPCSW_LCG_VERSION=${1}; shift
if [ -z "$CEPCSW_LCG_VERSION" ]; then
- CEPCSW_LCG_VERSION=103.0.0
+ CEPCSW_LCG_VERSION=103.0.2
fi
export CEPCSW_LCG_VERSION