Skip to content
Snippets Groups Projects
Commit ea1b0c9b authored by FU Chengdong's avatar FU Chengdong
Browse files

avoid return null IMarlinTrack ptr

parent 438cb96c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Reconstruction/Tracking/src/Clupatra/ClupatraAlg.cpp
+ 11
− 11
View file @ ea1b0c9b
...@@ -799,7 +799,7 @@ StatusCode ClupatraAlg::execute() { ...@@ -799,7 +799,7 @@ StatusCode ClupatraAlg::execute() {
//=============================================================================================== //===============================================================================================
// FIXME Mingrui // FIXME Mingrui
debug() << " =========== refitting final " << cluList.size() << " track segments " << endmsg ; debug() << " =========== refitting final " << cluList.size() << " track segments chi2 cut = " << _dChi2Max << endmsg ;
//---- refit cluster tracks individually to save memory ( KalTest tracks have ~1MByte each) //---- refit cluster tracks individually to save memory ( KalTest tracks have ~1MByte each)
...@@ -811,10 +811,12 @@ StatusCode ClupatraAlg::execute() { ...@@ -811,10 +811,12 @@ StatusCode ClupatraAlg::execute() {
continue ; continue ;
MarlinTrk::IMarlinTrack* trk = fit( *icv ) ; MarlinTrk::IMarlinTrack* trk = fit( *icv ) ;
trk->smooth() ; if(trk){
edm4hep::MutableTrack edm4hepTrk = converter( *icv ) ; trk->smooth() ;
tsCol_tmp.push_back( new ClupaPlcioTrack(edm4hepTrk) ) ; edm4hep::MutableTrack edm4hepTrk = converter( *icv ) ;
MarTrk_of_edm4hepTrack(edm4hepTrk) = 0 ; tsCol_tmp.push_back( new ClupaPlcioTrack(edm4hepTrk) ) ;
MarTrk_of_edm4hepTrack(edm4hepTrk) = 0 ;
}
delete trk ; delete trk ;
} }
...@@ -883,14 +885,13 @@ StatusCode ClupatraAlg::execute() { ...@@ -883,14 +885,13 @@ StatusCode ClupatraAlg::execute() {
nntrkclu.cluster( incSegVec.begin() , incSegVec.end() , std::back_inserter( incSegCluVec ), trkMerge , 2 ) ; nntrkclu.cluster( incSegVec.begin() , incSegVec.end() , std::back_inserter( incSegCluVec ), trkMerge , 2 ) ;
// FIXME: Mingrui debug() << " ===== merged track segments - # cluster: " << incSegCluVec.size()
// streamlog_out( DEBUG4 ) << " ===== merged track segments - # cluster: " << incSegCluVec.size() << " from " << incSegVec.size() << " incomplete track segments =====" << endmsg;
// << " from " << incSegVec.size() << " incomplete track segments " << " ============================== " << std::endl ;
for( TrackClusterer::cluster_vector::iterator it= incSegCluVec.begin() ; it != incSegCluVec.end() ; ++it) { for( TrackClusterer::cluster_vector::iterator it= incSegCluVec.begin() ; it != incSegCluVec.end() ; ++it) {
// FIXME: Mingrui // FIXME: Mingrui
// streamlog_out( DEBUG4 ) << edm4hep::header<edm4hep::Track>() << std::endl ; // streamlog_out( DEBUG4 ) << edm4hep::header<edm4hep::Track>() << std::endl ;
TrackClusterer::cluster_type* incSegClu = *it ; TrackClusterer::cluster_type* incSegClu = *it ;
...@@ -951,8 +952,7 @@ StatusCode ClupatraAlg::execute() { ...@@ -951,8 +952,7 @@ StatusCode ClupatraAlg::execute() {
delete mTrk ; delete mTrk ;
computeTrackInfo( track ) ; computeTrackInfo( track ) ;
// FIXME: Mingrui debug() << " ****** created new track : " << " : " << track.id() << endmsg;
// streamlog_out( DEBUG4 ) << " ****** created new track : " << " : " << lcshort( (Track*) track ) << std::endl ;
} }
}// loop over l }// loop over l
......
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