Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
fc862ab0
Commit
fc862ab0
authored
2 years ago
by
Thomas Madlener
Committed by
MarkusFrankATcernch
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Make storing of double parameters in EDM4hep version dependent
parent
53f5f0db
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
DDG4/edm4hep/Geant4Output2EDM4hep.cpp
+7
-0
7 additions, 0 deletions
DDG4/edm4hep/Geant4Output2EDM4hep.cpp
with
7 additions
and
0 deletions
DDG4/edm4hep/Geant4Output2EDM4hep.cpp
+
7
−
0
View file @
fc862ab0
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
/// podio include files
/// podio include files
#include
<podio/Frame.h>
#include
<podio/Frame.h>
#include
<podio/ROOTFrameWriter.h>
#include
<podio/ROOTFrameWriter.h>
#include
<podio/podioVersion.h>
/// Namespace for the AIDA detector description toolkit
/// Namespace for the AIDA detector description toolkit
namespace
dd4hep
{
namespace
dd4hep
{
...
@@ -107,10 +108,13 @@ namespace dd4hep {
...
@@ -107,10 +108,13 @@ namespace dd4hep {
printout
(
DEBUG
,
"Geant4OutputEDM4hep"
,
"Saving event parameter: %s"
,
p
.
first
);
printout
(
DEBUG
,
"Geant4OutputEDM4hep"
,
"Saving event parameter: %s"
,
p
.
first
);
frame
.
putParameter
(
p
.
first
,
p
.
second
);
frame
.
putParameter
(
p
.
first
,
p
.
second
);
}
}
#if podio_VERSION_MAJOR > 0 || podio_VERSION_MINOR > 16 || podio_VERSION_PATCH > 2
// This functionality is only present in podio > 0.16.2
for
(
auto
const
&
p
:
this
->
dblParameters
())
{
for
(
auto
const
&
p
:
this
->
dblParameters
())
{
printout
(
DEBUG
,
"Geant4OutputEDM4hep"
,
"Saving event parameter: %s"
,
p
.
first
);
printout
(
DEBUG
,
"Geant4OutputEDM4hep"
,
"Saving event parameter: %s"
,
p
.
first
);
frame
.
putParameter
(
p
.
first
,
p
.
second
);
frame
.
putParameter
(
p
.
first
,
p
.
second
);
}
}
#endif
}
}
}
// End namespace sim
}
// End namespace sim
}
// End namespace dd4hep
}
// End namespace dd4hep
...
@@ -378,7 +382,10 @@ void Geant4Output2EDM4hep::saveEvent(OutputContext<G4Event>& ctxt) {
...
@@ -378,7 +382,10 @@ void Geant4Output2EDM4hep::saveEvent(OutputContext<G4Event>& ctxt) {
runNumber
=
parameters
->
runNumber
()
+
runNumberOffset
;
runNumber
=
parameters
->
runNumber
()
+
runNumberOffset
;
eventNumber
=
parameters
->
eventNumber
()
+
eventNumberOffset
;
eventNumber
=
parameters
->
eventNumber
()
+
eventNumberOffset
;
parameters
->
extractParameters
(
m_frame
);
parameters
->
extractParameters
(
m_frame
);
#if podio_VERSION_MAJOR > 0 || podio_VERSION_MINOR > 16 || podio_VERSION_PATCH > 2
// This functionality is only present in podio > 0.16.2
eventWeight
=
m_frame
.
getParameter
<
double
>
(
"EventWeights"
);
eventWeight
=
m_frame
.
getParameter
<
double
>
(
"EventWeights"
);
#endif
}
else
{
// ... or from DD4hep framework
}
else
{
// ... or from DD4hep framework
runNumber
=
m_runNo
+
runNumberOffset
;
runNumber
=
m_runNo
+
runNumberOffset
;
eventNumber
=
ctxt
.
context
->
GetEventID
()
+
eventNumberOffset
;
eventNumber
=
ctxt
.
context
->
GetEventID
()
+
eventNumberOffset
;
...
...
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