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
a7b45302
Commit
a7b45302
authored
4 years ago
by
fangwx@ihep.ac.cn
Browse files
Options
Downloads
Patches
Plain Diff
change G4ThreeVector to DDRec Vector3D
parent
d1eea3bf
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Digitisers/DCHDigi/CMakeLists.txt
+0
-2
0 additions, 2 deletions
Digitisers/DCHDigi/CMakeLists.txt
Digitisers/DCHDigi/src/DCHDigiAlg.cpp
+7
-7
7 additions, 7 deletions
Digitisers/DCHDigi/src/DCHDigiAlg.cpp
with
7 additions
and
9 deletions
Digitisers/DCHDigi/CMakeLists.txt
+
0
−
2
View file @
a7b45302
gaudi_subdir
(
DCHDigi v0r0
)
gaudi_subdir
(
DCHDigi v0r0
)
find_package
(
Geant4 REQUIRED ui_all vis_all
)
include
(
${
Geant4_USE_FILE
}
)
find_package
(
DD4hep COMPONENTS DDG4 REQUIRED
)
find_package
(
DD4hep COMPONENTS DDG4 REQUIRED
)
find_package
(
EDM4HEP REQUIRED
)
find_package
(
EDM4HEP REQUIRED
)
message
(
"EDM4HEP_INCLUDE_DIRS:
${
EDM4HEP_INCLUDE_DIR
}
"
)
message
(
"EDM4HEP_INCLUDE_DIRS:
${
EDM4HEP_INCLUDE_DIR
}
"
)
...
...
This diff is collapsed.
Click to expand it.
Digitisers/DCHDigi/src/DCHDigiAlg.cpp
+
7
−
7
View file @
a7b45302
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
#include
"DD4hep/Detector.h"
#include
"DD4hep/Detector.h"
#include
<DD4hep/Objects.h>
#include
<DD4hep/Objects.h>
#include
"
G4Three
Vector.
h
h"
#include
"
DDRec/
Vector
3D
.h"
#include
<array>
#include
<array>
...
@@ -90,12 +90,12 @@ StatusCode DCHDigiAlg::execute()
...
@@ -90,12 +90,12 @@ StatusCode DCHDigiAlg::execute()
float
min_distance
=
999
;
float
min_distance
=
999
;
for
(
unsigned
int
i
=
0
;
i
<
simhit_size
;
i
++
)
for
(
unsigned
int
i
=
0
;
i
<
simhit_size
;
i
++
)
{
{
G4Three
Vector
west
(
0
,
0
,
0
);
dd4hep
::
rec
::
Vector
3D
west
(
0
,
0
,
0
);
G4Three
Vector
east
(
0
,
0
,
0
);
dd4hep
::
rec
::
Vector
3D
east
(
0
,
0
,
0
);
G4Three
Vector
pos
(
iter
->
second
.
at
(
i
).
getPosition
()[
0
],
iter
->
second
.
at
(
i
).
getPosition
()[
1
],
iter
->
second
.
at
(
i
).
getPosition
()[
2
]);
dd4hep
::
rec
::
Vector
3D
pos
(
iter
->
second
.
at
(
i
).
getPosition
()[
0
],
iter
->
second
.
at
(
i
).
getPosition
()[
1
],
iter
->
second
.
at
(
i
).
getPosition
()[
2
]);
G4Three
Vector
numerator
=
(
east
-
west
).
cross
(
west
-
pos
)
;
dd4hep
::
rec
::
Vector
3D
numerator
=
(
east
-
west
).
cross
(
west
-
pos
)
;
G4Three
Vector
denominator
=
(
east
-
west
)
;
dd4hep
::
rec
::
Vector
3D
denominator
=
(
east
-
west
)
;
float
distance
=
numerator
.
mag
()
/
denominator
.
mag
()
;
float
distance
=
numerator
.
r
()
/
denominator
.
r
()
;
std
::
cout
<<
"distance="
<<
distance
<<
std
::
endl
;
std
::
cout
<<
"distance="
<<
distance
<<
std
::
endl
;
if
(
distance
<
min_distance
){
if
(
distance
<
min_distance
){
min_distance
=
distance
;
min_distance
=
distance
;
...
...
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