diff --git a/Utilities/KalDet/src/ild/common/ILDDiscMeasLayer.cc b/Utilities/KalDet/src/ild/common/ILDDiscMeasLayer.cc index d0c0dad4758955b35b580b8ee21e0d71d77c9fff..b0dba150ab529a554fd6e290e6fe934127924f73 100644 --- a/Utilities/KalDet/src/ild/common/ILDDiscMeasLayer.cc +++ b/Utilities/KalDet/src/ild/common/ILDDiscMeasLayer.cc @@ -211,7 +211,7 @@ ILDVTrackHit* ILDDiscMeasLayer::ConvertLCIOTrkHit(edm4hep::ConstTrackerHit trkhi //edm4hep::TrackerHitPlane* plane_hit = dynamic_cast<EVENT::TrackerHitPlane*>( trkhit ) ; //edm4hep::TrackerHitPlane* plane_hit = trkhit; - if(trkhit.getType()!=8) return NULL; + if((trkhit.getType()&8)!=8) return NULL; //edm4hep::ConstTrackerHit plane_hit = trkhit; //if( plane_hit == NULL ) return NULL; // SJA:FIXME: should be replaced with an exception diff --git a/Utilities/KalDet/src/ild/common/ILDRotatedTrapMeaslayer.cc b/Utilities/KalDet/src/ild/common/ILDRotatedTrapMeaslayer.cc index 38b3b56fb7d640512d5307a54515c2053be6d49c..73d1a503770f2ba2300d62d8ae85cd02c08cdecb 100644 --- a/Utilities/KalDet/src/ild/common/ILDRotatedTrapMeaslayer.cc +++ b/Utilities/KalDet/src/ild/common/ILDRotatedTrapMeaslayer.cc @@ -158,7 +158,7 @@ Bool_t ILDRotatedTrapMeaslayer::IsOnSurface(const TVector3 &xx) const ILDVTrackHit* ILDRotatedTrapMeaslayer::ConvertLCIOTrkHit(edm4hep::ConstTrackerHit trkhit) const { //EVENT::TrackerHitPlane* plane_hit = dynamic_cast<EVENT::TrackerHitPlane*>( trkhit ) ; - if(trkhit.getType()!=8) return NULL; + if((trkhit.getType()&8)!=8) return NULL; //if( plane_hit == NULL ) return NULL; // SJA:FIXME: should be replaced with an exception const edm4hep::Vector3d& pos=trkhit.getPosition(); const TVector3 hit(pos.x, pos.y, pos.z); diff --git a/Utilities/KalDet/src/ild/common/ILDSegmentedDiscMeasLayer.cc b/Utilities/KalDet/src/ild/common/ILDSegmentedDiscMeasLayer.cc index 9fca07c113ed80140bcca6ed6c29283ba873f3ef..26159b08d0982af98133cb1a5aef23f8b1301d97 100644 --- a/Utilities/KalDet/src/ild/common/ILDSegmentedDiscMeasLayer.cc +++ b/Utilities/KalDet/src/ild/common/ILDSegmentedDiscMeasLayer.cc @@ -497,7 +497,7 @@ Bool_t ILDSegmentedDiscMeasLayer::IsOnSurface(const TVector3 &xx) const ILDVTrackHit* ILDSegmentedDiscMeasLayer::ConvertLCIOTrkHit(edm4hep::ConstTrackerHit trkhit) const { //EVENT::TrackerHitPlane* plane_hit = dynamic_cast<EVENT::TrackerHitPlane*>( trkhit ) ; - if(trkhit.getType()!=8) { + if((trkhit.getType()&8)!=8) { //if( plane_hit == NULL ) { // streamlog_out(ERROR) << "ILDSegmentedDiscMeasLayer::ConvertLCIOTrkHit dynamic_cast to TrackerHitPlane failed " << std::endl; return NULL; // SJA:FIXME: should be replaced with an exception diff --git a/Utilities/KalDet/src/ild/common/ILDSegmentedDiscStripMeasLayer.cc b/Utilities/KalDet/src/ild/common/ILDSegmentedDiscStripMeasLayer.cc index e547982b16df06eaba009e0b89ff2a9960549f26..1cf7bf454af478d5264cea1be064981bce977e46 100644 --- a/Utilities/KalDet/src/ild/common/ILDSegmentedDiscStripMeasLayer.cc +++ b/Utilities/KalDet/src/ild/common/ILDSegmentedDiscStripMeasLayer.cc @@ -245,7 +245,7 @@ void ILDSegmentedDiscStripMeasLayer::CalcDhDa(const TVTrackHit &vht, ILDVTrackHit* ILDSegmentedDiscStripMeasLayer::ConvertLCIOTrkHit(edm4hep::ConstTrackerHit trkhit) const { //EVENT::TrackerHitPlane* plane_hit = dynamic_cast<EVENT::TrackerHitPlane*>( trkhit ) ; - if(trkhit.getType()!=8){ + if((trkhit.getType()&8)!=8){ //if( plane_hit == NULL ) { // streamlog_out(ERROR) << "ILDSegmentedDiscStripMeasLayer::ConvertLCIOTrkHit dynamic_cast to TrackerHitPlane failed " << std::endl; return NULL; // SJA:FIXME: should be replaced with an exception @@ -272,20 +272,20 @@ ILDVTrackHit* ILDSegmentedDiscStripMeasLayer::ConvertLCIOTrkHit(edm4hep::ConstTr bool hit_on_surface = IsOnSurface(hit); - // streamlog_out(DEBUG1) << "ILDSegmentedDiscStripMeasLayer::ConvertLCIOTrkHit ILDPlanarStripHit created" - // << " for CellID " << trkhit.getCellID() - // << " Disc Z = " << this->GetXc().Z() - // << " u = " << x[0] - // << " du = " << dx[0]; + //std::cout << "ILDSegmentedDiscStripMeasLayer::ConvertLCIOTrkHit ILDPlanarStripHit created" + // << " for CellID " << trkhit.getCellID() + // << " Disc Z = " << this->GetXc().Z() + // << " u = " << x[0] + // << " du = " << dx[0]; - // if(ILDPlanarStripHit_DIM == 2) streamlog_out(DEBUG1) << " v = " << x[1] << " dv = " << dx[1]; + //if(ILDPlanarStripHit_DIM == 2) std::cout << " v = " << x[1] << " dv = " << dx[1]; - // streamlog_out(DEBUG1) << " x = " << hit.x() - // << " y = " << hit.y() - // << " z = " << hit.z() - // << " r = " << hit.Perp() - // << " onSurface = " << hit_on_surface - // << std::endl ; + //std::cout << " x = " << hit.x() + // << " y = " << hit.y() + // << " z = " << hit.z() + // << " r = " << hit.Perp() + // << " onSurface = " << hit_on_surface + // << std::endl ; ILDPlanarStripHit hh( *this , x, dx, this->GetBz(),trkhit);