Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix user analysis test #1368

Merged
merged 3 commits into from
Dec 10, 2024
+7 −9
Merged

Fix user analysis test #1368

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dcf403
HitTupleAction: use Data* because that does not segfault in the test …
andresailer Dec 10, 2024
de6495c
HitTupleAction: Go back to Data, but without setAddress this works...
andresailer Dec 10, 2024
7c07fe0
HitTupleAction: use a better name for the tree so we can use root cli…
andresailer Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions examples/DDG4/src/HitTupleAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void myanalysis::HitTupleAction::end(const G4Event* event) {
// Name Option Title
m_outFile = TFile::Open(m_outFileName.c_str(), "RECREATE", "DDG4 User file");
if ( m_outFile && !m_outFile->IsZombie() ) {
m_outTree = new TTree("DDG4 User Test","DDG4 data");
m_outTree = new TTree("DDG4_User_Test","DDG4_data");
printout(ALWAYS,"HitTupleAction","+++ Successfully opened ROOT file %s and created TTree:%s",
m_outFile->GetName(), "DDG4 User Test");
if ( m_containers.size() == 1 && (m_containers[0] == "*" || m_containers[0] == "ALL") ) {
Expand All @@ -167,8 +167,7 @@ void myanalysis::HitTupleAction::end(const G4Event* event) {
}
for(const auto& c : m_containers) {
std::pair<TBranch*, Data>& e = m_deposits[c];
TClass* cl = gROOT->GetClass(typeid(Data));
e.first = m_outTree->Branch(c.c_str(), cl->GetName(), (void*)0);
e.first = m_outTree->Branch(c.c_str(), &e.second);
e.first->SetAutoDelete(false);
printout(ALWAYS,"HitTupleAction","+++ Prepare hit branch %s in root file.",c.c_str());
}
Expand All @@ -188,11 +187,10 @@ void myanalysis::HitTupleAction::end(const G4Event* event) {
if ( coll ) {
std::pair<TBranch*, Data>& e = m_deposits[nam];
size_t nhits = coll->GetSize();
Data* d = &e.second;
Data& d = e.second;
d.first = 0e0;
d.second.clear();

e.second.first = 0e0;
e.second.second.clear();
e.first->SetAddress(&d);
for ( size_t j=0; j<nhits; ++j ) {
double dep = 0e0;
Geant4HitData* h = coll->hit(j);
Expand All @@ -208,8 +206,8 @@ void myanalysis::HitTupleAction::end(const G4Event* event) {
continue;
}
if ( dep > 0 ) {
e.second.first += dep;
e.second.second.push_back(dep);
d.first += dep;
d.second.push_back(dep);
}
}
}
Expand Down
Loading