Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
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
Computing
cbmroot
Commits
cc56943d
Commit
cc56943d
authored
6 months ago
by
Sergei Zharko
Committed by
Sergey Gorbunov
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
comments/warning printouts clean-up
parent
a3afbc4e
No related branches found
No related tags found
1 merge request
!1952
KF: material budget maps caching
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
algo/kf/core/geo/KfSetupBuilder.cxx
+1
-2
1 addition, 2 deletions
algo/kf/core/geo/KfSetupBuilder.cxx
algo/kf/core/geo/KfSetupBuilder.h
+4
-4
4 additions, 4 deletions
algo/kf/core/geo/KfSetupBuilder.h
reco/kfnew/CbmKfTrackingSetupBuilder.h
+4
-4
4 additions, 4 deletions
reco/kfnew/CbmKfTrackingSetupBuilder.h
with
9 additions
and
10 deletions
algo/kf/core/geo/KfSetupBuilder.cxx
+
1
−
2
View file @
cc56943d
...
...
@@ -137,12 +137,11 @@ bool SetupBuilder::LoadMaterial()
ia
>>
targetMat
;
ia
>>
fvMaterial
;
fTarget
.
SetMaterial
(
targetMat
);
// TODO: Provide consistency check (geometry hash)
}
catch
(
const
std
::
exception
&
err
)
{
LOG
(
warn
)
<<
"kf::SetupBuilder::LoadMaterial: input file
\"
"
<<
fsMaterialCacheFile
<<
"
\"
has inconsistent format "
"or was corrupted. The material maps will be generated"
;
"or was corrupted. The material maps will be
re-
generated"
;
return
false
;
}
LOG
(
info
)
<<
"kf::SetupBuilder::LoadMaterial: the material maps were loaded from cache file
\"
"
<<
fsMaterialCacheFile
...
...
This diff is collapsed.
Click to expand it.
algo/kf/core/geo/KfSetupBuilder.h
+
4
−
4
View file @
cc56943d
...
...
@@ -124,10 +124,10 @@ namespace cbm::algo::kf
/// \param filename Material budget cache file name
/// \param refHash Reference hash of the geometry
///
/// If provided, the instance will try to read the material budget maps from the file.
If the file does not exist,
/// or the geometry hash was changed since the last time
, the material budget maps will be recreated on the flight
///
and stored to the file. If the reference hash differs from
one
,
read from the file, a warning will be produced,
/// and the new cache file will be generated.
/// If provided, the instance will try to read the material budget maps from the file.
///
If the file does not exist,
or the geometry hash was changed since the last time
(reference hash differs from
///
the
one read from the file
)
, a warning will be produced,
the material budget maps will be recreated on the fly
/// and the
y will be stored again to the file (meaning a
new cache file will be generated
over the existing one)
.
void
SetMaterialCacheFile
(
const
std
::
string
&
filename
,
size_t
refHash
)
{
fsMaterialCacheFile
=
filename
;
...
...
This diff is collapsed.
Click to expand it.
reco/kfnew/CbmKfTrackingSetupBuilder.h
+
4
−
4
View file @
cc56943d
...
...
@@ -75,10 +75,10 @@ namespace cbm::kf
/// \param filename Material budget cache file name
/// \param geoHash A hash of the geometry
///
/// If provided, the instance will try to read the material budget maps from the file.
If the file does not exist,
/// or the geometry hash was changed since the last time
, the material budget maps will be recreated on the flight
///
and stored to the file. If the reference hash differs from
one
,
read from the file, a warning will be produced,
/// and the new cache file will be generated.
/// If provided, the instance will try to read the material budget maps from the file.
///
If the file does not exist,
or the geometry hash was changed since the last time
(reference hash differs from
///
the
one read from the file
)
, a warning will be produced,
the material budget maps will be recreated on the fly
/// and the
y will be stored again to the file (meaning a
new cache file will be generated
over the existing one)
.
void
SetMaterialCacheFile
(
const
TString
&
filename
,
size_t
geoHash
)
{
fBuilder
.
SetMaterialCacheFile
(
filename
.
Data
(),
geoHash
);
...
...
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