Skip to content
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

REC: Tracking bug fix #251

Merged
merged 5 commits into from
Oct 17, 2023
Merged

REC: Tracking bug fix #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36a7d55
avoid null hit for strip dV=0
fucd Oct 16, 2023
027ba40
fix run error
fucd Oct 16, 2023
4c5c921
add unlink while create TrackerHit object
fucd Oct 16, 2023
e883576
fix bug
fucd Oct 16, 2023
293277b
remove DEBUG for Clupatra
fucd Oct 17, 2023
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
2 changes: 1 addition & 1 deletion Digitisers/SimpleDigi/src/PlanarDigiAlg.cpp
View file
Open in desktop
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
Open in desktop
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
)
3 changes: 2 additions & 1 deletion Reconstruction/Tracking/src/Clupatra/clupatra_new.cpp
View file
Open in desktop
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
34 changes: 24 additions & 10 deletions Reconstruction/Tracking/src/FullLDCTracking/FullLDCTrackingAlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down Expand Up @@ -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 );
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 ) {
Expand Down
Loading