From 385f2b9174e2ea3fe8d5dabd2057c9feba4b9408 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Sat, 17 Apr 2021 17:41:55 -0500
Subject: [PATCH] deleted: options/emcal_barrel_reco.py
modified: scripts/emcal_barrel_electrons_analysis.cxx modified:
scripts/emcal_barrel_pions_analysis.cxx
---
.../calorimeters/options/emcal_barrel_reco.py | 63 -------------------
.../emcal_barrel_electrons_analysis.cxx | 6 +-
.../scripts/emcal_barrel_pions_analysis.cxx | 6 +-
3 files changed, 6 insertions(+), 69 deletions(-)
delete mode 100644 benchmarks/calorimeters/options/emcal_barrel_reco.py
diff --git a/benchmarks/calorimeters/options/emcal_barrel_reco.py b/benchmarks/calorimeters/options/emcal_barrel_reco.py
deleted file mode 100644
index 37565e42..00000000
--- a/benchmarks/calorimeters/options/emcal_barrel_reco.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#######################################
-# EMCAL Barrel detector Reconstruction
-# J.KIM 04/02/2021
-#######################################
-
-from Gaudi.Configuration import *
-import os
-
-from GaudiKernel.DataObjectHandleBase import DataObjectHandleBase
-from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
-from GaudiKernel import SystemOfUnits as units
-
-detector_name = "topside"
-if "JUGGLER_DETECTOR" in os.environ :
- detector_name = str(os.environ["JUGGLER_DETECTOR"])+"/"+detector_name
-
-input_sim_file = "jug_input.root"
-if "JUGGLER_SIM_FILE" in os.environ :
- input_sim_file = str(os.environ["JUGGLER_SIM_FILE"])
-else :
- print(" ERROR : JUGGLER_SIM_FILE not set" )
-
-output_rec_file = "jug_rec.root"
-if "JUGGLER_REC_FILE" in os.environ :
- output_rec_file = str(os.environ["JUGGLER_REC_FILE"])
-else :
- print(" ERROR : JUGGLER_REC_FILE not set" )
-
-n_events = 100
-if "JUGGLER_N_EVENTS" in os.environ :
- n_events = str(os.environ["JUGGLER_N_EVENTS"])
-
-geo_service = GeoSvc("GeoSvc", detectors=["{}.xml".format(detector_name)])
-podioevent = EICDataSvc("EventDataSvc", inputs=["sim_output/{}".format(input_sim_file)], OutputLevel=DEBUG)
-
-from Configurables import PodioInput
-from Configurables import Jug__Base__InputCopier_dd4pod__Geant4ParticleCollection_dd4pod__Geant4ParticleCollection_ as MCCopier
-from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollection_dd4pod__CalorimeterHitCollection_ as CalCopier
-
-podioinput = PodioInput("PodioReader", collections=["mcparticles","EcalBarrelAstroPixHits"], OutputLevel=DEBUG)
-
-# Thrown Information
-copier = MCCopier("MCCopier",
- inputCollection="mcparticles",
- outputCollection="mcparticles2",
- OutputLevel=DEBUG)
-# Geant4 Information
-embarrelcopier = CalCopier("CalBarrelCopier",
- inputCollection="EcalBarrelAstroPixHits",
- outputCollection="EcalBarrelAstroPixHits2",
- OutputLevel=DEBUG)
-
-out = PodioOutput("out", filename=output_rec_file)
-
-out.outputCommands = ["keep *"]
-
-ApplicationMgr(
- TopAlg = [podioinput, copier, embarrelcopier, out],
- EvtSel = 'NONE',
- EvtMax = n_events,
- ExtSvc = [podioevent],
- OutputLevel=DEBUG
- )
diff --git a/benchmarks/calorimeters/scripts/emcal_barrel_electrons_analysis.cxx b/benchmarks/calorimeters/scripts/emcal_barrel_electrons_analysis.cxx
index 8bbbf845..e944518a 100644
--- a/benchmarks/calorimeters/scripts/emcal_barrel_electrons_analysis.cxx
+++ b/benchmarks/calorimeters/scripts/emcal_barrel_electrons_analysis.cxx
@@ -66,9 +66,9 @@ void emcal_barrel_electrons_analysis(const char* input_fname = "sim_output/sim_e
};
// Define variables
- auto d1 = d0.Define("Ethr", Ethr, {"mcparticles2"})
- .Define("nhits", nhits, {"EcalBarrelAstroPixHits2"})
- .Define("Esim", Esim, {"EcalBarrelAstroPixHits2"})
+ auto d1 = d0.Define("Ethr", Ethr, {"mcparticles"})
+ .Define("nhits", nhits, {"EcalBarrelAstroPixHits"})
+ .Define("Esim", Esim, {"EcalBarrelAstroPixHits"})
.Define("fsam", fsam, {"Esim","Ethr"})
;
diff --git a/benchmarks/calorimeters/scripts/emcal_barrel_pions_analysis.cxx b/benchmarks/calorimeters/scripts/emcal_barrel_pions_analysis.cxx
index be1e9b47..a30ae4c6 100644
--- a/benchmarks/calorimeters/scripts/emcal_barrel_pions_analysis.cxx
+++ b/benchmarks/calorimeters/scripts/emcal_barrel_pions_analysis.cxx
@@ -66,9 +66,9 @@ void emcal_barrel_pions_analysis(const char* input_fname = "sim_output/sim_emcal
};
// Define variables
- auto d1 = d0.Define("Ethr", Ethr, {"mcparticles2"})
- .Define("nhits", nhits, {"EcalBarrelAstroPixHits2"})
- .Define("Esim", Esim, {"EcalBarrelAstroPixHits2"})
+ auto d1 = d0.Define("Ethr", Ethr, {"mcparticles"})
+ .Define("nhits", nhits, {"EcalBarrelAstroPixHits"})
+ .Define("Esim", Esim, {"EcalBarrelAstroPixHits"})
.Define("fsam", fsam, {"Esim","Ethr"})
;
--
GitLab