From 3aac14564740202f462b3e2778e9893da483ffc7 Mon Sep 17 00:00:00 2001
From: wenxingfang <1473717798@qq.com>
Date: Thu, 9 Nov 2023 11:39:54 +0800
Subject: [PATCH] check if TrackHeedSimTool exist in Edm4hepWriterAnaElemTool
---
Examples/options/tut_detsim_SDT_Heed.py | 1 -
.../src/Edm4hepWriterAnaElemTool.cpp | 25 +++++++++----------
.../DetSimAna/src/Edm4hepWriterAnaElemTool.h | 3 +++
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Examples/options/tut_detsim_SDT_Heed.py b/Examples/options/tut_detsim_SDT_Heed.py
index 049c3c22..e3ee257b 100644
--- a/Examples/options/tut_detsim_SDT_Heed.py
+++ b/Examples/options/tut_detsim_SDT_Heed.py
@@ -181,7 +181,6 @@ elif dedxoption == "TrackHeedSimTool":
dedx_simtool.save_mc = True##IF this is False then ...
dedx_simtool.debug = False
dedx_simtool.sim_pulse = True
- #dedx_simtool.model='/junofs/users/wxfang/MyGit/tmp/fork_cepcsw_20220418/CEPCSW/Digitisers/SimCurrentONNX/src/model_test.onnx'
#dedx_simtool.model='/junofs/users/wxfang/MyGit/tmp/fork_cepcsw_20220418/CEPCSW/Digitisers/SimCurrentONNX/src/model_90He10C4H10_18mm.onnx'
dedx_simtool.model='model_90He10C4H10_18mm.onnx'
dedx_simtool.batchsize = 100
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
index 8e121bac..4d7c3406 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.cpp
@@ -14,7 +14,6 @@
#include "DDG4/Geant4HitCollection.h"
#include "DDG4/Geant4Data.h"
#include "DetSimSD/Geant4Hits.h"
-#include <DetSimInterface/IDedxSimTool.h>
DECLARE_COMPONENT(Edm4hepWriterAnaElemTool)
@@ -90,11 +89,9 @@ Edm4hepWriterAnaElemTool::BeginOfEventAction(const G4Event* anEvent) {
m_track2primary.clear();
auto SimPIonCol = m_SimPrimaryIonizationCol.createAndPut();
- ToolHandleArray<IDedxSimTool> tmp_m_dedx_tools;
- tmp_m_dedx_tools.push_back("TrackHeedSimTool");
- for (auto dedxtool: tmp_m_dedx_tools) {
- debug() << "reset dedx_tool:" <<dedxtool << endmsg;
- dedxtool->reset();
+ if(hasTrackHeedSimTool){
+ debug() << "reset TrackHeedSimTool" << endmsg;
+ m_TrackHeedSimTool->reset();
}
}
@@ -106,14 +103,10 @@ Edm4hepWriterAnaElemTool::EndOfEventAction(const G4Event* anEvent) {
// save all data
auto SimPrimaryIonizationCol = m_SimPrimaryIonizationCol.get();
msg() << "SimPrimaryIonizationCol size ="<<SimPrimaryIonizationCol->size()<<endmsg;
- ToolHandleArray<IDedxSimTool> tmp_m_dedx_tools;
- tmp_m_dedx_tools.push_back("TrackHeedSimTool");
- for (auto dedxtool: tmp_m_dedx_tools) {
- debug() << "call endOfEvent() for dedx_tool:" << dedxtool << endmsg;
- dedxtool->endOfEvent();
+ if(hasTrackHeedSimTool){
+ debug() << "call endOfEvent() for TrackHeedSimTool" << endmsg;
+ m_TrackHeedSimTool->endOfEvent();
}
-
-
// create collections.
auto trackercols = m_trackerCol.createAndPut();
auto calorimetercols = m_calorimeterCol.createAndPut();
@@ -580,6 +573,12 @@ StatusCode
Edm4hepWriterAnaElemTool::initialize() {
StatusCode sc;
+ m_TrackHeedSimTool = ToolHandle<IDedxSimTool>("TrackHeedSimTool",nullptr,false);
+ if(m_TrackHeedSimTool){
+ msg() << "find TrackHeedSimTool" << endmsg;
+ hasTrackHeedSimTool = true;
+ }
+
return sc;
}
diff --git a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
index 60cc930a..6aedbdc6 100644
--- a/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
+++ b/Simulation/DetSimAna/src/Edm4hepWriterAnaElemTool.h
@@ -16,6 +16,7 @@
#include "edm4hep/SimCalorimeterHitCollection.h"
#include "edm4hep/CaloHitContributionCollection.h"
#include "edm4hep/SimPrimaryIonizationClusterCollection.h"
+#include <DetSimInterface/IDedxSimTool.h>
class Edm4hepWriterAnaElemTool: public extends<AlgTool, IAnaElemTool> {
@@ -155,6 +156,8 @@ private:
double Z = 0;
bool verboseOutput = false;
+ ToolHandle<IDedxSimTool> m_TrackHeedSimTool;
+ bool hasTrackHeedSimTool = false;
};
#endif
--
GitLab