Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container 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
Sergey Gorbunov
cbmroot
Commits
aee5a8b8
Commit
aee5a8b8
authored
1 month ago
by
Martin Beyer
Committed by
Florian Uhlig
1 month ago
Browse files
Options
Downloads
Patches
Plain Diff
Rich: Track projection fix using the CFV
parent
54f2cd02
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
core/detectors/rich/CbmRichGeoManager.cxx
+12
-4
12 additions, 4 deletions
core/detectors/rich/CbmRichGeoManager.cxx
core/detectors/rich/CbmRichRecGeoPar.h
+4
-1
4 additions, 1 deletion
core/detectors/rich/CbmRichRecGeoPar.h
with
16 additions
and
5 deletions
core/detectors/rich/CbmRichGeoManager.cxx
+
12
−
4
View file @
aee5a8b8
...
@@ -200,14 +200,21 @@ void CbmRichGeoManager::InitPmtCyl()
...
@@ -200,14 +200,21 @@ void CbmRichGeoManager::InitPmtCyl()
}
}
}
}
for
(
map
<
string
,
CbmRichRecGeoParPmt
>::
iterator
it
=
fGP
->
fPmtMap
.
begin
();
it
!=
fGP
->
fPmtMap
.
end
();
it
++
)
{
for
(
map
<
string
,
CbmRichRecGeoParPmt
>::
iterator
it
=
fGP
->
fPmtMap
.
begin
();
it
!=
fGP
->
fPmtMap
.
end
();)
{
it
->
second
.
fPlaneX
=
mapPmtPlaneMinMax
[
it
->
first
].
GetMeanX
();
it
->
second
.
fPlaneX
=
mapPmtPlaneMinMax
[
it
->
first
].
GetMeanX
();
it
->
second
.
fPlaneY
=
mapPmtPlaneMinMax
[
it
->
first
].
GetMeanY
();
it
->
second
.
fPlaneY
=
mapPmtPlaneMinMax
[
it
->
first
].
GetMeanY
();
it
->
second
.
fPlaneZ
=
mapPmtPlaneMinMax
[
it
->
first
].
GetMeanZ
();
it
->
second
.
fPlaneZ
=
mapPmtPlaneMinMax
[
it
->
first
].
GetMeanZ
();
// cout << "name:" << it->first << " strip(x,y,z):" <<it->second.fX << "," << it->second.fY << "," << it->second.fZ <<
// LOG(info) << "name:" << it->first << " strip(x,y,z):" <<it->second.fX << "," << it->second.fY << "," << it->second.fZ <<
// " pmtPlane(x,y,z):" <<it->second.fPlaneX << "," << it->second.fPlaneY << "," << it->second.fPlaneZ << ", " <<
// " pmtPlane(x,y,z):" <<it->second.fPlaneX << "," << it->second.fPlaneY << "," << it->second.fPlaneZ << ", " <<
// "theta:" << it->second.fTheta << ", phi:" << it->second.fPhi << endl;
// "theta:" << it->second.fTheta << ", phi:" << it->second.fPhi;
if
(
!
mapPmtPlaneMinMax
[
it
->
first
].
fPointAdded
)
{
it
=
fGP
->
fPmtMap
.
erase
(
it
);
}
else
{
++
it
;
}
}
}
// Calculate gap between camera_strip
// Calculate gap between camera_strip
...
@@ -220,6 +227,7 @@ void CbmRichGeoManager::InitPmtCyl()
...
@@ -220,6 +227,7 @@ void CbmRichGeoManager::InitPmtCyl()
geoIterator
.
GetPath
(
nodePath
);
geoIterator
.
GetPath
(
nodePath
);
string
nodePathStr
=
string
(
nodePath
.
Data
())
+
"/"
;
string
nodePathStr
=
string
(
nodePath
.
Data
())
+
"/"
;
if
(
fGP
->
fPmtMap
.
find
(
nodePathStr
)
==
fGP
->
fPmtMap
.
end
())
continue
;
const
TGeoMatrix
*
curMatrix
=
geoIterator
.
GetCurrentMatrix
();
const
TGeoMatrix
*
curMatrix
=
geoIterator
.
GetCurrentMatrix
();
const
Double_t
*
curNodeTr
=
curMatrix
->
GetTranslation
();
const
Double_t
*
curNodeTr
=
curMatrix
->
GetTranslation
();
// const Double_t* curNodeRot = curMatrix->GetRotationMatrix();
// const Double_t* curNodeRot = curMatrix->GetRotationMatrix();
...
...
This diff is collapsed.
Click to expand it.
core/detectors/rich/CbmRichRecGeoPar.h
+
4
−
1
View file @
aee5a8b8
...
@@ -262,6 +262,7 @@ public:
...
@@ -262,6 +262,7 @@ public:
fMaxPmtY
=
TMath
::
Max
(
fMaxPmtY
,
y
);
fMaxPmtY
=
TMath
::
Max
(
fMaxPmtY
,
y
);
fMinPmtZ
=
TMath
::
Min
(
fMinPmtZ
,
z
);
fMinPmtZ
=
TMath
::
Min
(
fMinPmtZ
,
z
);
fMaxPmtZ
=
TMath
::
Max
(
fMaxPmtZ
,
z
);
fMaxPmtZ
=
TMath
::
Max
(
fMaxPmtZ
,
z
);
fPointAdded
=
true
;
}
}
Double_t
GetMeanX
()
{
return
(
fMinPmtX
+
fMaxPmtX
)
/
2.
;
}
Double_t
GetMeanX
()
{
return
(
fMinPmtX
+
fMaxPmtX
)
/
2.
;
}
...
@@ -270,7 +271,9 @@ public:
...
@@ -270,7 +271,9 @@ public:
Double_t
GetMeanZ
()
{
return
(
fMinPmtZ
+
fMaxPmtZ
)
/
2.
;
}
Double_t
GetMeanZ
()
{
return
(
fMinPmtZ
+
fMaxPmtZ
)
/
2.
;
}
private
:
bool
fPointAdded
{
false
};
// true if at least one point was added
private
:
Double_t
fMinPmtX
;
Double_t
fMinPmtX
;
Double_t
fMaxPmtX
;
Double_t
fMaxPmtX
;
Double_t
fMinPmtY
;
Double_t
fMinPmtY
;
...
...
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