Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wenxingfang/CEPCSW
Browse files Browse the repository at this point in the history 
update to main
  • Loading branch information
@wenxingfang
wenxingfang committed Nov 8, 2023
2 parents f50cd1a + 10ba324 commit f8b1cf5
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 51 deletions.
1 change: 0 additions & 1 deletion .build.ci.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Examples/options/sim-rec-trackerecal.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

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")
Expand Down Expand Up @@ -331,7 +331,7 @@
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
)
10 changes: 5 additions & 5 deletions Reconstruction/PFA/Pandora/GaudiPandora/src/MCParticleCreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
}
Expand Down
6 changes: 3 additions & 3 deletions Reconstruction/PFA/Pandora/GaudiPandora/src/PandoraPFAlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() ;
}
}
Expand Down
16 changes: 8 additions & 8 deletions Reconstruction/PFA/Pandora/GaudiPandora/src/TrackCreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions Reconstruction/PFA/Pandora/MatrixPandora/src/MCParticleCreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}
}
Expand Down
10 changes: 5 additions & 5 deletions Reconstruction/PFA/Pandora/MatrixPandora/src/PandoraMatrixAlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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());
Expand Down Expand Up @@ -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() ;
}
}
Expand Down
16 changes: 8 additions & 8 deletions Reconstruction/PFA/Pandora/MatrixPandora/src/TrackCreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
Expand Down
Loading

0 comments on commit f8b1cf5

Please sign in to comment.