Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
CEPCSW_OTE_development
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
yudian2002@sjtu.edu.cn
CEPCSW_OTE_development
Commits
1ac4e0e0
Commit
1ac4e0e0
authored
3 years ago
by
lintao@ihep.ac.cn
Browse files
Options
Downloads
Patches
Plain Diff
quickfix on the compilation problem in lcg98.
parent
51c4815e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
+4
-4
4 additions, 4 deletions
Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
Reconstruction/RecGenfitAlg/src/GenfitTrack.h
+4
-4
4 additions, 4 deletions
Reconstruction/RecGenfitAlg/src/GenfitTrack.h
with
8 additions
and
8 deletions
Reconstruction/RecGenfitAlg/src/GenfitTrack.cpp
+
4
−
4
View file @
1ac4e0e0
...
@@ -162,7 +162,7 @@ bool GenfitTrack::createGenfitTrackFromMCParticle(int pidType,
...
@@ -162,7 +162,7 @@ bool GenfitTrack::createGenfitTrackFromMCParticle(int pidType,
///Create a Genfit track with MCParticle, unit conversion here
///Create a Genfit track with MCParticle, unit conversion here
bool
GenfitTrack
::
createGenfitTrackFromEDM4HepTrack
(
int
pidType
,
bool
GenfitTrack
::
createGenfitTrackFromEDM4HepTrack
(
int
pidType
,
edm4hep
::
ConstTrack
&
track
,
double
eventStartTime
)
edm4hep
::
ConstTrack
track
,
double
eventStartTime
)
{
{
//std::cout<<__FILE__<<" "<<__LINE__<<" bz kilogauss "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::kilogauss<<std::endl;
//std::cout<<__FILE__<<" "<<__LINE__<<" bz kilogauss "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::kilogauss<<std::endl;
//std::cout<<__FILE__<<" "<<__LINE__<<" bz tesla "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::tesla<<std::endl;
//std::cout<<__FILE__<<" "<<__LINE__<<" bz tesla "<<m_genfitField->getBz({0.,0.,0.})/dd4hep::tesla<<std::endl;
...
@@ -196,7 +196,7 @@ bool GenfitTrack::createGenfitTrackFromEDM4HepTrack(int pidType,
...
@@ -196,7 +196,7 @@ bool GenfitTrack::createGenfitTrackFromEDM4HepTrack(int pidType,
}
}
/// Add a 3d SpacepointMeasurement on TrackerHit
/// Add a 3d SpacepointMeasurement on TrackerHit
bool
GenfitTrack
::
addSpacePointTrakerHit
(
edm4hep
::
ConstTrackerHit
&
hit
,
bool
GenfitTrack
::
addSpacePointTrakerHit
(
edm4hep
::
ConstTrackerHit
hit
,
int
hitID
)
int
hitID
)
{
{
edm4hep
::
Vector3d
pos
=
hit
.
getPosition
();
edm4hep
::
Vector3d
pos
=
hit
.
getPosition
();
...
@@ -307,7 +307,7 @@ void GenfitTrack::addWireMeasurement(double driftDistance,
...
@@ -307,7 +307,7 @@ void GenfitTrack::addWireMeasurement(double driftDistance,
}
//end of addWireMeasurementOnTrack
}
//end of addWireMeasurementOnTrack
//Add wire measurement on wire, unit conversion here
//Add wire measurement on wire, unit conversion here
bool
GenfitTrack
::
addWireMeasurementOnTrack
(
edm4hep
::
ConstTrack
&
track
,
double
sigma
)
bool
GenfitTrack
::
addWireMeasurementOnTrack
(
edm4hep
::
ConstTrack
track
,
double
sigma
)
{
{
for
(
unsigned
int
iHit
=
0
;
iHit
<
track
.
trackerHits_size
();
iHit
++
){
for
(
unsigned
int
iHit
=
0
;
iHit
<
track
.
trackerHits_size
();
iHit
++
){
edm4hep
::
ConstTrackerHit
hit
=
track
.
getTrackerHits
(
iHit
);
edm4hep
::
ConstTrackerHit
hit
=
track
.
getTrackerHits
(
iHit
);
...
@@ -644,7 +644,7 @@ double GenfitTrack::extrapolateToHit( TVector3& poca, TVector3& pocaDir,
...
@@ -644,7 +644,7 @@ double GenfitTrack::extrapolateToHit( TVector3& poca, TVector3& pocaDir,
///Add space point measurement from edm4hep::Track to genfit track
///Add space point measurement from edm4hep::Track to genfit track
int
GenfitTrack
::
addSimTrackerHits
(
edm4hep
::
ConstTrack
&
track
,
int
GenfitTrack
::
addSimTrackerHits
(
edm4hep
::
ConstTrack
track
,
const
edm4hep
::
MCRecoTrackerAssociationCollection
*
assoHits
,
const
edm4hep
::
MCRecoTrackerAssociationCollection
*
assoHits
,
float
sigma
,
bool
smear
){
float
sigma
,
bool
smear
){
//A TrakerHit collection
//A TrakerHit collection
...
...
This diff is collapsed.
Click to expand it.
Reconstruction/RecGenfitAlg/src/GenfitTrack.h
+
4
−
4
View file @
1ac4e0e0
...
@@ -92,14 +92,14 @@ class GenfitTrack {
...
@@ -92,14 +92,14 @@ class GenfitTrack {
///Create genfit track from MCParticle
///Create genfit track from MCParticle
bool
createGenfitTrackFromMCParticle
(
int
pidTyep
,
const
edm4hep
::
MCParticle
&
bool
createGenfitTrackFromMCParticle
(
int
pidTyep
,
const
edm4hep
::
MCParticle
&
mcParticle
,
double
eventStartTime
=
0.
);
mcParticle
,
double
eventStartTime
=
0.
);
bool
createGenfitTrackFromEDM4HepTrack
(
int
pidType
,
edm4hep
::
ConstTrack
&
track
,
bool
createGenfitTrackFromEDM4HepTrack
(
int
pidType
,
edm4hep
::
ConstTrack
track
,
double
eventStartTime
);
double
eventStartTime
);
// /// Prepare a hit list, return number of hits on track
// /// Prepare a hit list, return number of hits on track
// int PrepareHits();//TODO
// int PrepareHits();//TODO
/// Add a space point measurement, return number of hits on track
/// Add a space point measurement, return number of hits on track
bool
addSpacePointTrakerHit
(
edm4hep
::
ConstTrackerHit
&
hit
,
int
hitID
);
bool
addSpacePointTrakerHit
(
edm4hep
::
ConstTrackerHit
hit
,
int
hitID
);
/// Add a space point measurement, return number of hits on track
/// Add a space point measurement, return number of hits on track
virtual
bool
addSpacePointMeasurement
(
const
TVectorD
&
,
double
,
virtual
bool
addSpacePointMeasurement
(
const
TVectorD
&
,
double
,
...
@@ -111,10 +111,10 @@ class GenfitTrack {
...
@@ -111,10 +111,10 @@ class GenfitTrack {
const
TVector3
&
endPoint2
,
int
lrAmbig
,
int
detID
,
int
hitID
);
const
TVector3
&
endPoint2
,
int
lrAmbig
,
int
detID
,
int
hitID
);
/// Add a WireMeasurement with DC digi
/// Add a WireMeasurement with DC digi
virtual
bool
addWireMeasurementOnTrack
(
edm4hep
::
ConstTrack
&
track
,
double
sigma
);
virtual
bool
addWireMeasurementOnTrack
(
edm4hep
::
ConstTrack
track
,
double
sigma
);
///Add space point from truth to track
///Add space point from truth to track
int
addSimTrackerHits
(
edm4hep
::
ConstTrack
&
track
,
int
addSimTrackerHits
(
edm4hep
::
ConstTrack
track
,
const
edm4hep
::
MCRecoTrackerAssociationCollection
*
assoHits
,
const
edm4hep
::
MCRecoTrackerAssociationCollection
*
assoHits
,
float
sigma
,
bool
smear
=
false
);
// float nSigmaSelection
float
sigma
,
bool
smear
=
false
);
// float nSigmaSelection
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment