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
ff4166c9
Commit
ff4166c9
authored
4 years ago
by
guofangyi@ihep.ac.cn
Browse files
Options
Downloads
Patches
Plain Diff
correct id, add comment
parent
0784c8a3
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
Detector/DetCRD/compact/ecalBarrel.xml
+1
-1
1 addition, 1 deletion
Detector/DetCRD/compact/ecalBarrel.xml
Detector/DetCRD/src/Calorimeter/CRDEcal.cpp
+3
-3
3 additions, 3 deletions
Detector/DetCRD/src/Calorimeter/CRDEcal.cpp
with
4 additions
and
4 deletions
Detector/DetCRD/compact/ecalBarrel.xml
+
1
−
1
View file @
ff4166c9
...
...
@@ -38,7 +38,7 @@
grid_size_x="1*cm"
grid_size_y="1*cm"
grid_size_z="1*cm"/-->
<id>
block
:8,layer:12,
piece
:12,bar:12
</id>
<id>
system
:8,layer:12,
block
:12,bar:12
</id>
</readout>
</readouts>
...
...
This diff is collapsed.
Click to expand it.
Detector/DetCRD/src/Calorimeter/CRDEcal.cpp
+
3
−
3
View file @
ff4166c9
...
...
@@ -88,7 +88,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
bar_odd
.
setSensitiveDetector
(
sens
);
for
(
int
iz
=
1
;
iz
<=
Nbarz_odd
;
iz
++
){
dd4hep
::
PlacedVolume
plv
=
det_vol
.
placeVolume
(
bar_odd
,
Position
((
2
*
iphi
-
1
)
*
barz_odd
/
2
-
lx
,
(
2
*
iz
-
1
)
*
barx
/
2
-
dim_y
,
(
2
*
ilayer
-
1
)
*
bary
/
2
-
dim_z
));
plv
.
addPhysVolID
(
"layer"
,
ilayer
).
addPhysVolID
(
"
piece
"
,
iphi
).
addPhysVolID
(
"bar"
,
iz
);
plv
.
addPhysVolID
(
"layer"
,
ilayer
).
addPhysVolID
(
"
block
"
,
iphi
).
addPhysVolID
(
"bar"
,
iz
);
std
::
string
barname
=
"CrystalBar_"
+
std
::
to_string
(
ilayer
)
+
"_"
+
std
::
to_string
(
iphi
)
+
"_"
+
std
::
to_string
(
iz
);
dd4hep
::
DetElement
sd
(
stavedet
,
barname
,
detid
);
sd
.
setPlacement
(
plv
);
...
...
@@ -107,7 +107,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
//Loop in Z direction
for
(
int
iz
=
1
;
iz
<=
Nbarz_even
;
iz
++
){
dd4hep
::
PlacedVolume
plv
=
det_vol
.
placeVolume
(
bar_even
,
Position
(
lx
-
(
2
*
iphi
-
1
)
*
bary
/
2
,
(
2
*
iz
-
1
)
*
barz_even
/
2
-
dim_y
,
(
2
*
ilayer
-
1
)
*
bary
/
2
-
dim_z
));
plv
.
addPhysVolID
(
"layer"
,
ilayer
).
addPhysVolID
(
"
piece
"
,
iphi
).
addPhysVolID
(
"bar"
,
iz
);
plv
.
addPhysVolID
(
"layer"
,
ilayer
).
addPhysVolID
(
"
block
"
,
iphi
).
addPhysVolID
(
"bar"
,
iz
);
std
::
string
barname
=
"CrystalBar_"
+
std
::
to_string
(
ilayer
)
+
"_"
+
std
::
to_string
(
iphi
)
+
"_"
+
std
::
to_string
(
iz
);
dd4hep
::
DetElement
sd
(
stavedet
,
barname
,
detid
);
sd
.
setPlacement
(
plv
);
...
...
@@ -125,7 +125,7 @@ static dd4hep::Ref_t create_detector(dd4hep::Detector& theDetector,
double
posy
=
r0
*
cos
(
rotAngle
)
-
dx
*
sin
(
rotAngle
);
dd4hep
::
Transform3D
transform
(
dd4hep
::
RotationZ
(
rotAngle
)
*
dd4hep
::
RotationX
(
-
90
*
degree
),
dd4hep
::
Position
(
posx
,
posy
,
0.
));
dd4hep
::
PlacedVolume
plv
=
envelopeVol
.
placeVolume
(
det_vol
,
transform
);
plv
.
addPhysVolID
(
"
block
"
,
i
);
plv
.
addPhysVolID
(
"
system
"
,
i
);
DetElement
sd
(
ECAL
,
_toString
(
i
,
"trap%3d"
),
detid
);
sd
.
setPlacement
(
plv
);
}
...
...
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