From d6f5d6097c9e6bd6a7ae532655c563adcec77469 Mon Sep 17 00:00:00 2001
From: Chengdong Fu <fucd@ihep.ac.cn>
Date: Mon, 12 Oct 2020 14:36:41 +0800
Subject: [PATCH] fix bug of lost raw hits of strip
---
.../KalDet/src/ild/common/ILDDiscMeasLayer.cc | 2 +-
.../src/ild/common/ILDRotatedTrapMeaslayer.cc | 2 +-
.../ild/common/ILDSegmentedDiscMeasLayer.cc | 2 +-
.../common/ILDSegmentedDiscStripMeasLayer.cc | 26 +++++++++----------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Utilities/KalDet/src/ild/common/ILDDiscMeasLayer.cc b/Utilities/KalDet/src/ild/common/ILDDiscMeasLayer.cc
index d0c0dad4..b0dba150 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 38b3b56f..73d1a503 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 9fca07c1..26159b08 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 e547982b..1cf7bf45 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);
--
GitLab