diff --git a/WL_list.md b/WL_list.md
index f1fe7d9119db3756a3f2fc9d0a1e2f6da7df492e..172892321a7fdb762920a3f967b0ca653dcfee9f 100644
--- a/WL_list.md
+++ b/WL_list.md
@@ -21,23 +21,23 @@ where:
| Experiment | WL repo | SIF image registry | Docker image registry| Latest Built Version | Latest Pipeline status | Unpacked container size |
| -------- | -------- | -------- | -------- | -------- | -------- | -------- |
-| alice | [digi-reco-core-run3-ma][alice_digi-reco-core-run3-ma_code] | [click for link][alice_digi-reco-core-run3-ma_sif] | [click for link][alice_digi-reco-core-run3-ma_img] | [v2.2][alice_digi-reco-core-run3-ma_pipelink] | ![ci][alice_digi-reco-core-run3-ma_pipeline]| 14G |
-| atlas | [gen_sherpa-ma][atlas_gen_sherpa-ma_code] | [click for link][atlas_gen_sherpa-ma_sif] | [click for link][atlas_gen_sherpa-ma_img] | [v2.1][atlas_gen_sherpa-ma_pipelink] | ![ci][atlas_gen_sherpa-ma_pipeline]| 22G |
-| atlas | [kv][atlas_kv_code] | [click for link][atlas_kv_sif] | [click for link][atlas_kv_img] | [ci2.0][atlas_kv_pipelink] | ![ci][atlas_kv_pipeline]| -n |
-| atlas | [reco_mt-ma][atlas_reco_mt-ma_code] | [click for link][atlas_reco_mt-ma_sif] | [click for link][atlas_reco_mt-ma_img] | [v2.3][atlas_reco_mt-ma_pipelink] | ![ci][atlas_reco_mt-ma_pipeline]| 22G |
-| atlas | [sim_mt-ma][atlas_sim_mt-ma_code] | [click for link][atlas_sim_mt-ma_sif] | [click for link][atlas_sim_mt-ma_img] | [v2.1][atlas_sim_mt-ma_pipelink] | ![ci][atlas_sim_mt-ma_pipeline]| 20G |
-| belle2 | [gen-sim-reco-ma][belle2_gen-sim-reco-ma_code] | [click for link][belle2_gen-sim-reco-ma_sif] | [click for link][belle2_gen-sim-reco-ma_img] | [v2.2][belle2_gen-sim-reco-ma_pipelink] | ![ci][belle2_gen-sim-reco-ma_pipeline]| 3.4G |
-| cms | [digi-run3-ma][cms_digi-run3-ma_code] | [click for link][cms_digi-run3-ma_sif] | [click for link][cms_digi-run3-ma_img] | [v1.1][cms_digi-run3-ma_pipelink] | ![ci][cms_digi-run3-ma_pipeline]| 5.8G |
-| cms | [gen-sim-run3-ma][cms_gen-sim-run3-ma_code] | [click for link][cms_gen-sim-run3-ma_sif] | [click for link][cms_gen-sim-run3-ma_img] | [v1.1][cms_gen-sim-run3-ma_pipelink] | ![ci][cms_gen-sim-run3-ma_pipeline]| 6.2G |
-| cms | [hlt-ma][cms_hlt-ma_code] | [click for link][cms_hlt-ma_sif] | [click for link][cms_hlt-ma_img] | [v0.2][cms_hlt-ma_pipelink] | ![ci][cms_hlt-ma_pipeline]| 19G |
-| cms | [mlpf][cms_mlpf_code] | [click for link][cms_mlpf_sif] | [click for link][cms_mlpf_img] | [v0.1][cms_mlpf_pipelink] | ![ci][cms_mlpf_pipeline]| |
-| cms | [reco-run3-ma][cms_reco-run3-ma_code] | [click for link][cms_reco-run3-ma_sif] | [click for link][cms_reco-run3-ma_img] | [v1.2][cms_reco-run3-ma_pipelink] | ![ci][cms_reco-run3-ma_pipeline]| 6.5G |
-| hello | [world-c7-ma][hello_world-c7-ma_code] | [click for link][hello_world-c7-ma_sif] | [click for link][hello_world-c7-ma_img] | [v1.0][hello_world-c7-ma_pipelink] | ![ci][hello_world-c7-ma_pipeline]| 759M |
-| hello | [world-cs8-ma][hello_world-cs8-ma_code] | [click for link][hello_world-cs8-ma_sif] | [click for link][hello_world-cs8-ma_img] | [ci-v1.0][hello_world-cs8-ma_pipelink] | ![ci][hello_world-cs8-ma_pipeline]| 518M |
-| igwn | [pe][igwn_pe_code] | [click for link][igwn_pe_sif] | [click for link][igwn_pe_img] | [v0.5][igwn_pe_pipelink] | ![ci][igwn_pe_pipeline]| 2.9G |
-| juno | [gen-sim-reco][juno_gen-sim-reco_code] | [click for link][juno_gen-sim-reco_sif] | [click for link][juno_gen-sim-reco_img] | [v2.2][juno_gen-sim-reco_pipelink] | ![ci][juno_gen-sim-reco_pipeline]| 3.0G |
-| lhcb | [sim-run3-ma][lhcb_sim-run3-ma_code] | [click for link][lhcb_sim-run3-ma_sif] | [click for link][lhcb_sim-run3-ma_img] | [v1.1][lhcb_sim-run3-ma_pipelink] | ![ci][lhcb_sim-run3-ma_pipeline]| 5.4G |
-| mg5amc | [madgraph4gpu-2022][mg5amc_madgraph4gpu-2022_code] | [click for link][mg5amc_madgraph4gpu-2022_sif] | [click for link][mg5amc_madgraph4gpu-2022_img] | [ci-v0.10][mg5amc_madgraph4gpu-2022_pipelink] | ![ci][mg5amc_madgraph4gpu-2022_pipeline]| 11G |
+| alice | [digi-reco-core-run3-ma][alice_digi-reco-core-run3-ma_code] | [click for link][alice_digi-reco-core-run3-ma_sif] | [click for link][alice_digi-reco-core-run3-ma_img] | [v2.2][alice_digi-reco-core-run3-ma_pipelink] | ![ci][alice_digi-reco-core-run3-ma_pipeline]| 14G |
+| atlas | [gen_sherpa-ma][atlas_gen_sherpa-ma_code] | [click for link][atlas_gen_sherpa-ma_sif] | [click for link][atlas_gen_sherpa-ma_img] | [v2.1][atlas_gen_sherpa-ma_pipelink] | ![ci][atlas_gen_sherpa-ma_pipeline]| 22G |
+| atlas | [kv][atlas_kv_code] | [click for link][atlas_kv_sif] | [click for link][atlas_kv_img] | [ci2.0][atlas_kv_pipelink] | ![ci][atlas_kv_pipeline]| -n |
+| atlas | [reco_mt-ma][atlas_reco_mt-ma_code] | [click for link][atlas_reco_mt-ma_sif] | [click for link][atlas_reco_mt-ma_img] | [v2.3][atlas_reco_mt-ma_pipelink] | ![ci][atlas_reco_mt-ma_pipeline]| 22G |
+| atlas | [sim_mt-ma][atlas_sim_mt-ma_code] | [click for link][atlas_sim_mt-ma_sif] | [click for link][atlas_sim_mt-ma_img] | [v2.1][atlas_sim_mt-ma_pipelink] | ![ci][atlas_sim_mt-ma_pipeline]| 20G |
+| belle2 | [gen-sim-reco-ma][belle2_gen-sim-reco-ma_code] | [click for link][belle2_gen-sim-reco-ma_sif] | [click for link][belle2_gen-sim-reco-ma_img] | [v2.2][belle2_gen-sim-reco-ma_pipelink] | ![ci][belle2_gen-sim-reco-ma_pipeline]| 3.4G |
+| cms | [digi-run3-ma][cms_digi-run3-ma_code] | [click for link][cms_digi-run3-ma_sif] | [click for link][cms_digi-run3-ma_img] | [v1.1][cms_digi-run3-ma_pipelink] | ![ci][cms_digi-run3-ma_pipeline]| 5.8G |
+| cms | [gen-sim-run3-ma][cms_gen-sim-run3-ma_code] | [click for link][cms_gen-sim-run3-ma_sif] | [click for link][cms_gen-sim-run3-ma_img] | [v1.1][cms_gen-sim-run3-ma_pipelink] | ![ci][cms_gen-sim-run3-ma_pipeline]| 6.2G |
+| cms | [hlt-ma][cms_hlt-ma_code] | [click for link][cms_hlt-ma_sif] | [click for link][cms_hlt-ma_img] | [v0.2][cms_hlt-ma_pipelink] | ![ci][cms_hlt-ma_pipeline]| 19G |
+| cms | [mlpf][cms_mlpf_code] | [click for link][cms_mlpf_sif] | [click for link][cms_mlpf_img] | [v0.1][cms_mlpf_pipelink] | ![ci][cms_mlpf_pipeline]| |
+| cms | [reco-run3-ma][cms_reco-run3-ma_code] | [click for link][cms_reco-run3-ma_sif] | [click for link][cms_reco-run3-ma_img] | [v1.2][cms_reco-run3-ma_pipelink] | ![ci][cms_reco-run3-ma_pipeline]| 6.5G |
+| hello | [world-c7-ma][hello_world-c7-ma_code] | [click for link][hello_world-c7-ma_sif] | [click for link][hello_world-c7-ma_img] | [v1.0][hello_world-c7-ma_pipelink] | ![ci][hello_world-c7-ma_pipeline]| 759M |
+| hello | [world-cs8-ma][hello_world-cs8-ma_code] | [click for link][hello_world-cs8-ma_sif] | [click for link][hello_world-cs8-ma_img] | [ci-v1.0][hello_world-cs8-ma_pipelink] | ![ci][hello_world-cs8-ma_pipeline]| 518M |
+| igwn | [pe][igwn_pe_code] | [click for link][igwn_pe_sif] | [click for link][igwn_pe_img] | [v0.5][igwn_pe_pipelink] | ![ci][igwn_pe_pipeline]| 2.9G |
+| juno | [gen-sim-reco][juno_gen-sim-reco_code] | [click for link][juno_gen-sim-reco_sif] | [click for link][juno_gen-sim-reco_img] | [v3.0][juno_gen-sim-reco_pipelink] | ![ci][juno_gen-sim-reco_pipeline]| 3.3G |
+| lhcb | [sim-run3-ma][lhcb_sim-run3-ma_code] | [click for link][lhcb_sim-run3-ma_sif] | [click for link][lhcb_sim-run3-ma_img] | [v1.1][lhcb_sim-run3-ma_pipelink] | ![ci][lhcb_sim-run3-ma_pipeline]| 5.4G |
+| mg5amc | [madgraph4gpu-2022][mg5amc_madgraph4gpu-2022_code] | [click for link][mg5amc_madgraph4gpu-2022_sif] | [click for link][mg5amc_madgraph4gpu-2022_img] | [ci-v0.10][mg5amc_madgraph4gpu-2022_pipelink] | ![ci][mg5amc_madgraph4gpu-2022_pipeline]| 11G |
[alice_digi-reco-core-run3-ma_code]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/blob/master/alice/digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma
[alice_digi-reco-core-run3-ma_sif]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads-sif/container_registry/?search%5B%5D=alice-digi-reco-core-run3-ma-bmk
@@ -126,7 +126,7 @@ where:
[juno_gen-sim-reco_code]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/blob/master/juno/gen-sim-reco/juno-gen-sim-reco
[juno_gen-sim-reco_sif]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads-sif/container_registry/?search%5B%5D=juno-gen-sim-reco-bmk
[juno_gen-sim-reco_img]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/container_registry/?search%5B%5D=juno-gen-sim-reco-bmk
-[juno_gen-sim-reco_pipelink]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/pipelines/6471841
+[juno_gen-sim-reco_pipelink]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/pipelines/6743071
[juno_gen-sim-reco_pipeline]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/badges/qa-build-juno-gen-sim-reco/pipeline.svg
[lhcb_sim-run3-ma_code]: https://gitlab.cern.ch/hep-benchmarks/hep-workloads/-/blob/master/lhcb/sim-run3-ma/lhcb-sim-run3-ma
diff --git a/alice/digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma-bmk.sh b/alice/digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma-bmk.sh
index b383278cadb5da2daf1bbe60094786e7a041d347..36253c5638b488701fd7f2e92c28b57f60173c9e 100755
--- a/alice/digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma-bmk.sh
+++ b/alice/digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma/alice-digi-reco-core-run3-ma-bmk.sh
@@ -35,7 +35,7 @@ function doOne(){
sed -i 's/import pandas/#import pandas/g' o2dpg_sim_workflow.py
export PYTHONPATH=$PYTHONPATH:${O2DPG_ROOT}/MC/bin/
- export HEPSCORE_CCDB_ROOT=/cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/v0.1.5-coredigireco-snapshot-compatible-20221215-1
+ export HEPSCORE_CCDB_ROOT=/cvmfs/alice.cern.ch/el7-x86_64/Packages/HEPscore-CCDB/v0.1.5-coredigireco-snapshot-compatible-20221215_v2-1
# make sure O2DPG + O2 is loaded
[ ! "${O2DPG_ROOT}" ] && echo "Error: This needs O2DPG loaded" && return 1
diff --git a/juno/gen-sim-reco/CHANGELOG.md b/juno/gen-sim-reco/CHANGELOG.md
index f5e94e148e461a2c4897edfc35874bbd7bfcd8a1..4cfd3fedc683b5f3af56c933ef63c2b3e3f49e40 100644
--- a/juno/gen-sim-reco/CHANGELOG.md
+++ b/juno/gen-sim-reco/CHANGELOG.md
@@ -2,6 +2,13 @@
## [Unreleased]
+## [v3.0] 2023-12-21
+- Update to latest JUNO version J23.1.0-rc5.dc1. This version of juno software integrate 4 steps event processing into 2 steps.
+Another feature is output detail event processing time.
+- Reduce gen-sim memory usage. But the RECO memory usage is still more than 2GB.
+- Exclude the initial time of juno event processing.
+- Fix the problem of junodb connections.
+
## [v2.2] 2023-11-13
- Limit the number of loaded cores using the argument -n | --ncores
diff --git a/juno/gen-sim-reco/juno-gen-sim-reco.spec b/juno/gen-sim-reco/juno-gen-sim-reco.spec
index 2a9270af64483a9a38ef6b96fa02a21e964b57fe..489a53bc05d36ce1d3515325cb39a9958fade717 100644
--- a/juno/gen-sim-reco/juno-gen-sim-reco.spec
+++ b/juno/gen-sim-reco/juno-gen-sim-reco.spec
@@ -1,11 +1,12 @@
-HEPWL_BMKOS="gitlab-registry.cern.ch/linuxsupport/cc7-base:20211101-1.x86_64"
+HEPWL_BMKOS="centos:centos7.9.2009"
HEPWL_BMKEXE=juno-gen-sim-reco-bmk.sh
HEPWL_BMKOPTS="-e 10 -c 1"
HEPWL_BMKDIR=juno-gen-sim-reco
HEPWL_BMKDESCRIPTION="juno-gen-sim-reco-bmk"
HEPWL_DOCKERIMAGENAME=juno-gen-sim-reco-bmk
-HEPWL_DOCKERIMAGETAG=v2.2
+HEPWL_DOCKERIMAGETAG=v3.0
+HEPWL_BUILDARCH="x86_64"
HEPWL_CVMFSREPOS=juno.ihep.ac.cn
HEPWL_CVMFS_PROXY="http://squid-01.ihep.ac.cn:3128"
-HEPWL_CVMFS_SERVER_URL="http://cvmfs-stratum-one.ihep.ac.cn:8000/cvmfs/@fqrn@;http://cvmfs-egi.gridpp.rl.ac.uk:8000/cvmfs/@fqrn@" # from /etc/cvmfs/domain.d/ihep.ac.cn.conf
-HEPWL_CVMFS_KEYS_DIR="/etc/cvmfs/keys/ihep.ac.cn" # from /etc/cvmfs/domain.d/ihep.ac.cn.conf
+HEPWL_CVMFS_SERVER_URL="http://cvmfs-stratum-one.ihep.ac.cn:8000/cvmfs/@fqrn@;http://cvmfs-egi.gridpp.rl.ac.uk:8000/cvmfs/@fqrn@" # from /etc/cvmfs/domain.d/ihep.ac.cn.conf
+HEPWL_CVMFS_KEYS_DIR="/etc/cvmfs/keys/ihep.ac.cn" # from /etc/cvmfs/domain.d/ihep.ac.cn.conf
diff --git a/juno/gen-sim-reco/juno-gen-sim-reco/juno-gen-sim-reco-bmk.sh b/juno/gen-sim-reco/juno-gen-sim-reco/juno-gen-sim-reco-bmk.sh
index b6518121f4b4fe6c3e83b5cfcedc37d5474392b3..dd835e96c14bf32bfd4cc9d14b51981515076538 100755
--- a/juno/gen-sim-reco/juno-gen-sim-reco/juno-gen-sim-reco-bmk.sh
+++ b/juno/gen-sim-reco/juno-gen-sim-reco/juno-gen-sim-reco-bmk.sh
@@ -19,25 +19,53 @@ function doOne(){
curdir=`pwd`
echo "Current directory: $curdir"
# Suppress unnecessary warning message
- export CMTCONFIG=amd64_linux26
- source /cvmfs/juno.ihep.ac.cn/centos7_amd64_gcc830/Pre-Release/J21v2r0-branch/setup.sh > /dev/null
- export CMTCONFIG=amd64_linux26
- source /cvmfs/juno.ihep.ac.cn/centos7_amd64_gcc830/Pre-Release/J21v2r0-branch/setup.sh > /dev/null
+ #export CMTCONFIG=amd64_linux26
+ source /cvmfs/juno.ihep.ac.cn/centos7_amd64_gcc1120/Pre-Release/J23.1.0-rc5.dc1/setup.sh > /dev/null
+ #export CMTCONFIG=amd64_linux26
# Execute WL copy
echo "Executing the following number of threads:"
echo $NTHREADS
+ # run N+1 event, and only calculate 2 to N+1 event time. Exclude the fisrt enven time.
+ let EVT_NUM=${NEVENTS_THREAD}+1
+
+
# Ignore requests for multi-threading
- echo "Start gen-sim:"
- /usr/bin/time -p -f %e -o outputsim.time python $TUTORIALROOT/share/tut_detsim.py --seed 10000 --evtmax ${NEVENTS_THREAD} --output detsim_10000_$1.root --user-output userdetsim_10000_$1.root gun > $curdir/outputsim
- echo "End gen-sim and Start Elec sim"
- /usr/bin/time -p -f %e -o outputdetele.time python $TUTORIALROOT/share/tut_det2elec.py --input detsim_10000_$1.root --output det2elec_10000_$1.root --evtmax -1> $curdir/outputdetele
- echo "End Elec sim and start calb rec"
- /usr/bin/time -p -f %e -o outputelecal.time python $TUTORIALROOT/share/tut_elec2calib.py --no-conddb --input det2elec_10000_$1.root --output elec2calib_10000_$1.root --evtmax -1 > $curdir/outputelecal
- echo "End calb rec and start envent rec"
- /usr/bin/time -p -f %e -o outputrec.time python $TUTORIALROOT/share/tut_calib2rec.py --no-conddb --input elec2calib_10000_$1.root --output calib2rec_10000_$1.root --evtmax -1> $curdir/outputrec
+ echo "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* Start Gen-sim: #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*"
+ python $TUTORIALROOT/share/tut_detsim.py --no-ion-php --profiling --profiling-details --evtmax $EVT_NUM gun > $curdir/output.sim
+
+ # get total event+1 time
+ echo "############## list after GEN-SIM directory ##################"
+ ls -alhs
+ sim_total1=`cat output.sim |grep "Sum of junotoptask"|awk '{print $5}'`
+ # get the first gen-sim event time
+ sim_event1=`cat junotoptas* |head -n 2|tail -n 1|awk '{print $3}'`
+ # get total gen-sim event time = sum - first
+ sim_totalms=`echo "$sim_total1-$sim_event1"|bc`
+ sim_totals=$(echo "scale=3; $sim_totalms/1000"|bc)
+ # out put gen-sim event time in second
+ echo $sim_totals > $curdir/outputsim
+ echo "SIM Time: $sim_totals"
+ mv junotoptas* outputsimprofile
+
+ echo "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#* Start RECO: #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*"
+ python $TUTORIALROOT/share/tut_elec2rec.py --profiling --profiling-details --no-db --evtmax $EVT_NUM > $curdir/output.rec
+ echo "############## list after RECO directory ##################"
+ ls -alhs
+ # get the total rec event time
+ rec_total1=`cat output.rec |grep "Sum of junotoptask"|awk '{print $5}'`
+ # get the first rec event time
+ rec_event1=`cat junotoptas* |head -n 2|tail -n 1|awk '{print $9}'`
+ # get the total rec event rec_total - first
+ rec_totalms=`echo "$rec_total1-$rec_event1"|bc`
+ rec_totals=$(echo "scale=3; $rec_totalms/1000"|bc)
+ # output rec event time in second
+ echo $rec_totals > $curdir/outputrec
+ echo "RECO Time: $rec_totals"
+
+ mv junotoptas* outputrecprofile
+ rm junotoptask* -f
status=$?
- echo "End event rec"
# Set to 1 to print workload output to screen
debug=0
diff --git a/juno/gen-sim-reco/juno-gen-sim-reco/parseResults.py b/juno/gen-sim-reco/juno-gen-sim-reco/parseResults.py
index 12c984c42ff73a0911ff53076aeffef349bcc285..f1ce9426a20cdb98ad264dee4b77541fae551391 100755
--- a/juno/gen-sim-reco/juno-gen-sim-reco/parseResults.py
+++ b/juno/gen-sim-reco/juno-gen-sim-reco/parseResults.py
@@ -7,27 +7,15 @@ from typing import DefaultDict
#print("########################PARSERESULTS.PY########################")
-GenScores = []
SimScores = []
-TrigSimScores = []
RecoScores = []
TotalScores = []
-MaxGen = 0
-AvgGen = 0
-MedGen = 0
-MinGen = 1000000
-
MaxSim = 0
AvgSim = 0
MedSim = 0
MinSim = 1000000
-MaxTrigSim = 0
-AvgTrigSim = 0
-MedTrigSim = 0
-MinTrigSim = 1000000
-
MaxReco = 0
AvgReco = 0
MedReco = 0
@@ -53,10 +41,8 @@ def event_time(filename):
# Each copy generates an output file
for i in range(0, int(os.environ['NCOPIES'])):
#for i in range(0,1):
- simtime = "proc_" + str(i + 1) + "/outputsim.time"
- deteletime = "proc_" + str(i + 1) + "/outputdetele.time"
- elecaltime = "proc_" + str(i + 1) + "/outputelecal.time"
- rectime = "proc_" + str(i + 1) + "/outputrec.time"
+ simtime = "proc_" + str(i + 1) + "/outputsim"
+ rectime = "proc_" + str(i + 1) + "/outputrec"
# The parser reports separately the time taken by event generation, simulation, trigger simulation,
# and reconstruction (and the total). Times are reported from many sub-modules; these keywords
@@ -65,88 +51,60 @@ for i in range(0, int(os.environ['NCOPIES'])):
#keepgoing = False;
#startintwo = False;
- Gen = 0
Sim = 0
- TrigSim = 0
Reco = 0
Total = 0
- Gen = event_time(simtime)
- Sim = event_time(deteletime)
- TrigSim = event_time(elecaltime)
+ Sim = event_time(simtime)
Reco = event_time(rectime)
- Total = Gen + Sim + TrigSim + Reco
+ Total = Sim + Reco
# Output is in seconds; convert to events / second
- Gen = float(os.environ['NEVENTS_THREAD']) / Gen
Sim = float(os.environ['NEVENTS_THREAD']) / Sim
- TrigSim = float(os.environ['NEVENTS_THREAD']) / TrigSim
Reco = float(os.environ['NEVENTS_THREAD']) / Reco
Total = float(os.environ['NEVENTS_THREAD']) / Total
- print ("Gen: " + str(Gen))
print ("Sim: " + str(Sim))
- print ("TrigSim: " + str(TrigSim))
print ("Reco: " + str(Reco))
print ("Total: " + str(Total))
- GenScores.append(Gen)
SimScores.append(Sim)
- TrigSimScores.append(TrigSim)
RecoScores.append(Reco)
TotalScores.append(Total)
- print (GenScores)
print (SimScores)
- print (TrigSimScores)
print (RecoScores)
print (TotalScores)
- if Gen > MaxGen:
- MaxGen = Gen
if Sim > MaxSim:
MaxSim = Sim
- if TrigSim > MaxTrigSim:
- MaxTrigSim = TrigSim
if Reco > MaxReco:
MaxReco = Reco
if Total > MaxTotal:
MaxTotal = Total
- if Gen < MinGen:
- MinGen = Gen
if Sim < MinSim:
MinSim = Sim
- if TrigSim < MinTrigSim:
- MinTrigSim = TrigSim
if Reco < MinReco:
MinReco = Reco
if Total < MinTotal:
MinTotal = Total
- AvgGen = AvgGen + Gen / float(os.environ['NCOPIES'])
AvgSim = AvgSim + Sim / float(os.environ['NCOPIES'])
- AvgTrigSim = AvgTrigSim + TrigSim / float(os.environ['NCOPIES'])
AvgReco = AvgReco + Reco / float(os.environ['NCOPIES'])
AvgTotal = AvgTotal + Total / float(os.environ['NCOPIES'])
-GenScores.sort()
SimScores.sort()
-TrigSimScores.sort()
RecoScores.sort()
TotalScores.sort()
-if len(GenScores) % 2 == 0:
- MedGen = (GenScores[int(len(GenScores) / 2)] + GenScores[int(len(GenScores) / 2 - 1)]) / 2.0
+if len(SimScores) % 2 == 0:
MedSim = (SimScores[int(len(SimScores) / 2)] + SimScores[int(len(SimScores) / 2 - 1)]) / 2.0
- MedTrigSim = (TrigSimScores[int(len(TrigSimScores) / 2)] + TrigSimScores[int(len(TrigSimScores) / 2 - 1)]) / 2.0
MedReco = (RecoScores[int(len(RecoScores) / 2)] + RecoScores[int(len(RecoScores) / 2 - 1)]) / 2.0
MedTotal = (TotalScores[int(len(TotalScores) / 2)] + TotalScores[int(len(TotalScores) / 2 - 1)]) / 2.0
else:
- MedGen = GenScores[int(len(GenScores) / 2)]
MedSim = SimScores[int(len(SimScores) / 2)]
- MedTrigSim = TrigSimScores[int(len(TrigSimScores) / 2)]
MedReco = RecoScores[int(len(RecoScores) / 2)]
MedTotal = TotalScores[int(len(TotalScores) / 2)]
@@ -155,28 +113,19 @@ OutputJSON = {}
OutputJSON['wl-scores'] = DefaultDict(dict)
OutputJSON['wl-stats'] = DefaultDict(dict)
-OutputJSON['wl-scores']['gen'] = AvgGen * int(os.environ['NCOPIES'])
-OutputJSON['wl-scores']['sim'] = 1.0 / (1.0 / AvgSim + 1.0 / AvgTrigSim) * int(os.environ['NCOPIES'])
+OutputJSON['wl-scores']['sim'] = AvgSim * int(os.environ['NCOPIES'])
OutputJSON['wl-scores']['reco'] = AvgReco * int(os.environ['NCOPIES'])
OutputJSON['wl-scores']['gen-sim-reco'] = AvgTotal * int(os.environ['NCOPIES'])
OutputJSON['wl-stats']['gen-sim-reco']['avg'] = AvgTotal
-#OutputJSON['wl-stats']['gen-sim-reco']['median'] = MedTotal
OutputJSON['wl-stats']['gen-sim-reco']['min'] = MinTotal
OutputJSON['wl-stats']['gen-sim-reco']['max'] = MaxTotal
OutputJSON['wl-stats']['gen-sim-reco']['count'] = int(os.environ['NCOPIES'])
-OutputJSON['wl-stats']['gen']['avg'] = AvgGen
-#OutputJSON['wl-stats']['gen']['median'] = MedGen
-OutputJSON['wl-stats']['gen']['min'] = MinGen
-OutputJSON['wl-stats']['gen']['max'] = MaxGen
-OutputJSON['wl-stats']['gen']['count'] = int(os.environ['NCOPIES'])
-OutputJSON['wl-stats']['sim']['avg'] = 1.0 / (1.0 / AvgSim + 1.0 / AvgTrigSim)
-#OutputJSON['wl-stats']['sim']['median'] = 1.0 / (1.0 / MedSim + 1.0 / MedTrigSim)
-OutputJSON['wl-stats']['sim']['min'] = 1.0 / (1.0 / MinSim + 1.0 / MinTrigSim)
-OutputJSON['wl-stats']['sim']['max'] = 1.0 / (1.0 / MaxSim + 1.0 / MaxTrigSim)
+OutputJSON['wl-stats']['sim']['avg'] = AvgSim
+OutputJSON['wl-stats']['sim']['min'] = MinSim
+OutputJSON['wl-stats']['sim']['max'] = MaxSim
OutputJSON['wl-stats']['sim']['count'] = int(os.environ['NCOPIES'])
OutputJSON['wl-stats']['reco']['avg'] = AvgReco
-#OutputJSON['wl-stats']['reco']['median'] = MedReco
OutputJSON['wl-stats']['reco']['min'] = MinReco
OutputJSON['wl-stats']['reco']['max'] = MaxReco
OutputJSON['wl-stats']['reco']['count'] = int(os.environ['NCOPIES'])