diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle.sh b/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle.sh
index e58540c2f735976998423bbf8a5c68b1465572de..747d8db34a2741b808dc825a6fa8a9f3631caf46 100644
--- a/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle.sh
@@ -12,24 +12,36 @@ particle=$1
energy=$2
geometry=$3
script=$4
-echo 'Particle type: '$particle', energy: '$energy', geometry: '${geometry}', script name: ',${script}
+clustering=$5
-if [ $particle == "muons" ]; then
+
+echo 'Particle type: '${particle}', energy: '${energy}', geometry: '${geometry}', script name: '${script}', clustering: '${clustering}
+
+if [ ${particle} == "muons" ]; then
particle1="mu"
-elif [ $particle == "electrons" ]; then
+elif [ ${particle} == "electrons" ]; then
particle1="e"
fi
-if [ $energy == "1GeV" ]; then
+if [ ${energy} == "1GeV" ]; then
energy1="Pt1"
-elif [ $energy == "10GeV" ]; then
+elif [ ${energy} == "10GeV" ]; then
energy1="Pt10"
-elif [ $energy == "100GeV" ]; then
+elif [ ${energy} == "100GeV" ]; then
energy1="Pt100"
fi
+# Set analogue clustering by default
+if [ ${clustering} != 'digital' ]; then
+ clustering="analogue"
+fi
+if [ ${clustering} == 'digital' ]; then
+ clustering_type='InDetSLHC_Example/postInclude.DigitalClustering.py'
+elif [ ${clustering} == 'analogue' ]; then
+ clustering_type='InDetSLHC_Example/postInclude.AnalogueClustering.py'
+fi
-
+echo "Clustering: "${clustering_type}
# Fix ordering of output in logfile
exec 2>&1
@@ -99,9 +111,13 @@ dcubecfg_digi_strip=${artdata}/InDetSLHC_Example/dcube/config/ITk_SCT_RDOAnalysi
dcubecfg_rec=${artdata}/InDetSLHC_Example/dcube/config/ITk_IDPVM.xml
+if [ ${clustering} == 'digital' ]; then
+ dcuberef_rec=${artdata}/InDetSLHC_Example/ReferenceHistograms/physval.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}_digi.root
+elif [ ${clustering} == 'analogue' ]; then
+ dcuberef_rec=${artdata}/InDetSLHC_Example/ReferenceHistograms/physval.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}_ana.root
+fi
dcuberef_sim=${artdata}/InDetSLHC_Example/ReferenceHistograms/SiHit_ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}.root
-dcuberef_rec=${artdata}/InDetSLHC_Example/ReferenceHistograms/physval.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}_digi.root
dcuberef_digi_pixel=${artdata}/InDetSLHC_Example/ReferenceHistograms/PixelRDOAnalysis.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}.root
dcuberef_digi_strip=${artdata}/InDetSLHC_Example/ReferenceHistograms/SCT_RDOAnalysis.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}.root
@@ -207,7 +223,7 @@ if [ $dorec -ne 0 ]; then
--conditionsTag OFLCOND-MC15c-SDR-14-03 \
--DataRunNumber 242000 \
--steering doRAWtoALL \
- --postInclude 'all:InDetSLHC_Example/postInclude.SLHC_Setup_ITK.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'HITtoRDO:InDetSLHC_Example/postInclude.SLHC_Digitization_lowthresh.py' 'RAWtoALL:InDetSLHC_Example/postInclude.DigitalClustering.py,InDetSLHC_Example/postInclude.RDOAnalysis.py'\
+ --postInclude 'all:InDetSLHC_Example/postInclude.SLHC_Setup_ITK.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'HITtoRDO:InDetSLHC_Example/postInclude.SLHC_Digitization_lowthresh.py' 'RAWtoALL:'${clustering_type}',InDetSLHC_Example/postInclude.RDOAnalysis.py'\
--preExec 'all:from AthenaCommon.GlobalFlags import globalflags; globalflags.DataSource.set_Value_and_Lock("geant4"); from InDetSLHC_Example.SLHC_JobProperties import SLHC_Flags; SLHC_Flags.doGMX.set_Value_and_Lock(True)' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.doInDetNoise.set_Value_and_Lock(False); digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"]'\
'RAWtoALL:from InDetRecExample.InDetJobProperties import InDetFlags;from PixelConditionsServices.PixelConditionsServicesConf import PixelCalibSvc;ServiceMgr +=PixelCalibSvc();InDetFlags.useDCS.set_Value_and_Lock(True);ServiceMgr.PixelCalibSvc.DisableDB=True; from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags; InDetDxAODFlags.DumpLArCollisionTime.set_Value_and_Lock(False);InDetDxAODFlags.DumpSctInfo.set_Value_and_Lock(True); InDetDxAODFlags.ThinHitsOnTrack.set_Value_and_Lock(False)'\
--preInclude 'all:InDetSLHC_Example/preInclude.SLHC_Setup.py,InDetSLHC_Example/preInclude.SLHC_Setup_Strip_GMX.py' 'HITtoRDO:InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.SiliconOnly.py' 'default:InDetSLHC_Example/preInclude.SLHC.SiliconOnly.Reco.py,InDetSLHC_Example/SLHC_Setup_Reco_TrackingGeometry_GMX.py'\
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle_ana.sh b/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle_ana.sh
deleted file mode 100755
index 9d957451b8242d39c38648afe13ed60d37fc7ba0..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetExample/InDetSLHC_Example/share/test_ITk_single_particle_ana.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/bin/bash
-# art-description: InclinedDuals sim+reco
-# art-type: grid
-# art-include: 21.9/Athena
-# art-output: *.root
-# art-output: *.xml
-# art-output: dcube*
-
-echo "Input Parameters"
-
-particle=$1
-energy=$2
-geometry=$3
-script=$4
-echo 'Particle type: '$particle', energy: '$energy', geometry: '${geometry}', script name: ',${script}
-
-if [ $particle == "muons" ]; then
- particle1="mu"
-elif [ $particle == "electrons" ]; then
- particle1="e"
-fi
-if [ $energy == "1GeV" ]; then
- energy1="Pt1"
-elif [ $energy == "10GeV" ]; then
- energy1="Pt10"
-elif [ $energy == "100GeV" ]; then
- energy1="Pt100"
-fi
-
-
-
-
-
-# Fix ordering of output in logfile
-exec 2>&1
-run() { (set -x; exec "$@") }
-
-# Following specify which steps to run.
-dosim=1
-dorec=1 # Reco_tf.py not yet working
-dophy=1 # If dorec=0, set dophy=1 to run InDetPhysValMonitoring over old ESD
-
-# Following specify DCube output directories. Set empty to disable.
-dcube_sim_fixref="dcube_sim_${particle}_${energy}"
-dcube_sim_lastref="dcube_sim_${particle}_${energy}_last"
-dcube_digi_pixel_fixref="dcube_digi_pixel_${particle}_${energy}"
-dcube_digi_pixel_lastref="dcube_digi_pixel_${particle}_${energy}_last"
-dcube_digi_strip_fixref="dcube_digi_strip_${particle}_${energy}"
-dcube_digi_strip_lastref="dcube_digi_strip_${particle}_${energy}_last"
-dcube_rec_fixref="dcube_${particle}_${energy}"
-dcube_rec_lastref="dcube_${particle}_${energy}_last"
-
-artdata=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art
-#artdata=/eos/atlas/atlascerngroupdisk/data-art/grid-input
-
-name="InclinedAlternative"
-
-
-# Set the input file
-if [ $particle == "muons" -a $energy == "1GeV" ]; then
- evnt_particle_energy=$artdata/InDetSLHC_Example/inputs/EVNT.09244569.*.pool.root.1
-elif [ $particle == "muons" -a $energy == "10GeV" ]; then
- evnt_particle_energy=$artdata/InDetSLHC_Example/inputs/EVNT.09244573.*.pool.root.1
-elif [ $particle == "muons" -a $energy == "100GeV" ]; then
- evnt_particle_energy=$artdata/InDetSLHC_Example/inputs/EVNT.09244578.*.pool.root.1
-elif [ $particle == "electrons" -a $energy == "100GeV" ]; then
- evnt_particle_energy=$artdata/InDetSLHC_Example/inputs/electrons_100GeV_EVNT.09244567._000004.pool.root.1
-fi
-
-
-
-if [ $dosim -ne 0 ]; then
- hits_particle_energy=physval_${particle}_${energy}.HITS.root
-else
- echo "Sim job not configured to run... no HITS input available for reco step, exiting test!"
- exit
-### hits_muons_1GeV="$hits_ref_muons_1GeV"
-fi
-if [ $dorec -ne 0 ]; then
- esd_particle_energy=physval_${particle}_${energy}.ESD.root
- daod_particle_energy=physval_${particle}_${energy}.DAOD_IDTRKVALID.root
-else
- echo "Sim job not configured to run... no HITS input available for reco step, exiting test!"
- exit
-### esd_muons_1GeV=$artdata/InDetSLHC_Example/inputs/InclinedDuals_ESD_mu_1GeV.root
-### daod_muons_1GeV=$artdata/InDetSLHC_Example/inputs/physval_muons_1GeV.DAOD_IDTRKVALID.root
-fi
-#jo=$artdata/InDetSLHC_Example/jobOptions/PhysValITk_jobOptions.py moved to share/
-dcubemon_sim=SiHitValid_${particle}_${energy}.root
-dcubemon_digi_pixel=PixelRDOAnalysis_${particle}_${energy}.root
-dcubemon_digi_strip=SCT_RDOAnalysis_${particle}_${energy}.root
-dcubemon_rec=physval_${particle}_${energy}.root
-
-
-
-dcubecfg_sim=${artdata}/InDetSLHC_Example/dcube/config/ITk_SiHitAnalysis.xml
-dcubecfg_digi_pixel=${artdata}/InDetSLHC_Example/dcube/config/ITk_PixelRDOAnalysis.xml
-dcubecfg_digi_strip=${artdata}/InDetSLHC_Example/dcube/config/ITk_SCT_RDOAnalysis.xml
-dcubecfg_rec=${artdata}/InDetSLHC_Example/dcube/config/ITk_IDPVM.xml
-
-
-
-dcuberef_sim=${artdata}/InDetSLHC_Example/ReferenceHistograms/SiHit_ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}.root
-### dcuberef_rec=${artdata}/InDetSLHC_Example/ReferenceHistograms/physval.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}_digi.root
-dcuberef_rec=${artdata}/InDetSLHC_Example/ReferenceHistograms/physval.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}_ana.root
-
-dcuberef_digi_pixel=${artdata}/InDetSLHC_Example/ReferenceHistograms/PixelRDOAnalysis.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}.root
-dcuberef_digi_strip=${artdata}/InDetSLHC_Example/ReferenceHistograms/SCT_RDOAnalysis.ATLAS-P2-ITK-17-04-02_single_${particle1}_${energy1}.root
-
-
-art_dcube=/cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube
-lastref_dir=last_results_${particle}_${energy}
-
-
-
-dcube() {
- # Run DCube and print art-result (if $2 is not empty)
- step="$1" statname="$2" dcubemon="$3" dcubecfg="$4" dcuberef="$5" dcubedir="$6"
- test -n "$dcubedir" || return
- run ls -lLU "$art_dcube" "$dcubemon" "$dcubecfg" "$dcuberef"
- if [ ! -s "$dcubemon" ]; then
- echo "$script: $step output '$dcubemon' not created. Don't create $dcubedir output." 2>&1
- test -n "$statname" && echo "art-result: 20 $statname"
- return
- fi
- if [ ! -s "$dcuberef" ]; then
- echo "$script: $step DCube reference '$dcuberef' not available. Don't create $dcubedir output." 2>&1
- test -n "$statname" && echo "art-result: 21 $statname"
- return
- fi
- echo "$script: DCube comparison of $step output '$dcubemon' with '$dcuberef' reference"
- keep=""
- test "$dcubedir" != "dcube" -a -d "dcube" && keep="dcube_keep_`uuidgen`"
- test -n "$keep" && run mv -f dcube "$keep"
- run "$art_dcube" "$name" "$dcubemon" "$dcubecfg" "$dcuberef"
- dcube_stat=$?
- test -n "$statname" && echo "art-result: $dcube_stat $statname"
- test "$dcubedir" != "dcube" && run mv -f dcube "$dcubedir"
- test -n "$keep" && run mv -f "$keep" dcube
-}
-
-if [ $dosim -ne 0 ]; then
-
- ## this runs single particle simulation
- run ls -lL "$evnt_${particle}_${energy}"
-
- # Sim step: based on RTT SimInclinedDuals_GMX job:
- run Sim_tf.py \
- --inputEVNTFile $evnt_particle_energy \
- --outputHITSFile $hits_particle_energy \
- --skipEvents 0 \
- --maxEvents 10000 \
- --randomSeed 873254 \
- --geometryVersion ${geometry}_VALIDATION \
- --conditionsTag OFLCOND-MC15c-SDR-14-04 \
- --truthStrategy MC15aPlus \
- --DataRunNumber 242000 \
- --preInclude all:'InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.SiliconOnly.py,InDetSLHC_Example/preInclude.SLHC_Setup.py,InDetSLHC_Example/preInclude.SLHC_Setup_Strip_GMX.py' \
- --preExec all:'from InDetSLHC_Example.SLHC_JobProperties import SLHC_Flags; SLHC_Flags.doGMX.set_Value_and_Lock(True); SLHC_Flags.LayoutOption="InclinedAlternative"' \
- --postInclude all:'PyJobTransforms/UseFrontier.py,InDetSLHC_Example/postInclude.SLHC_Setup_ITK.py,InDetSLHC_Example/postInclude.SLHC_Setup.py,InDetSLHC_Example/postInclude.SiHitAnalysis.py' \
- --postExec EVNTtoHITS:'ServiceMgr.DetDescrCnvSvc.DoInitNeighbours = False; from AthenaCommon import CfgGetter;CfgGetter.getService("ISF_MC15aPlusTruthService").BeamPipeTruthStrategies+=["ISF_MCTruthStrategyGroupIDHadInt_MC15"];' all:'ServiceMgr.PixelLorentzAngleSvc.ITkL03D = True'
-
-
-
- echo "art-result: $? sim"
-
-
-
-
- mv ./SiHitValid.root ./$dcubemon_sim
-
-
- if [ \( $dosim -ne 0 -a -n "$dcube_sim_lastref" \) -o \( $dophy -ne 0 -a -n "$dcube_rec_lastref" \) ]; then
- run art.py download --user=artprod --dst="$lastref_dir" InDetSLHC_Example "$script"
- run ls -la "$lastref_dir"
- fi
-
-
- # DCube Sim hit plots
- dcube Sim_tf sim-plot "$dcubemon_sim" "$dcubecfg_sim" "$lastref_dir/$dcubemon_sim" "$dcube_sim_lastref"
- dcube Sim_tf "" "$dcubemon_sim" "$dcubecfg_sim" "$dcuberef_sim" "$dcube_sim_fixref"
-
-fi
-
-if [ $dorec -ne 0 ]; then
-
- ## Starting reconstruction for single particles
- if [ $dosim -ne 0 ] && [ ! -s "$hits_particle_energy" ] ; then
- echo "$script: Sim_tf output '$hits_particle_energy' not created. Not running Reco_tf and stopping" 2>&1
- exit
- fi
-
- run ls -lL "$hits_particle_energy"
-
-
-
- # Reco step: based on RecoInclinedDuals_GMX RTT job
- # some preExecs for E2D step are workarounds - should be revisited.
- run Reco_tf.py \
- --inputHITSFile "$hits_particle_energy" \
- --outputRDOFile "physval_${particle}_${energy}.RDO.root" \
- --outputESDFile "$esd_particle_energy" \
- --outputAODFile "physval_${particle}_${energy}.AOD.root" \
- --outputDAOD_IDTRKVALIDFile "$daod_particle_energy" \
- --maxEvents -1 \
- --steering 'doRAWtoALL' \
- --digiSteeringConf 'StandardInTimeOnlyTruth' \
- --geometryVersion "all:${geometry}" \
- --conditionsTag OFLCOND-MC15c-SDR-14-03 \
- --DataRunNumber 242000 \
- --steering doRAWtoALL \
- --postInclude 'all:InDetSLHC_Example/postInclude.SLHC_Setup_ITK.py,InDetSLHC_Example/postInclude.SLHC_Setup.py' 'HITtoRDO:InDetSLHC_Example/postInclude.SLHC_Digitization_lowthresh.py' 'RAWtoALL:InDetSLHC_Example/postInclude.AnalogueClustering.py,InDetSLHC_Example/postInclude.RDOAnalysis.py'\
- --preExec 'all:from AthenaCommon.GlobalFlags import globalflags; globalflags.DataSource.set_Value_and_Lock("geant4"); from InDetSLHC_Example.SLHC_JobProperties import SLHC_Flags; SLHC_Flags.doGMX.set_Value_and_Lock(True)' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags; digitizationFlags.doInDetNoise.set_Value_and_Lock(False); digitizationFlags.overrideMetadata+=["SimLayout","PhysicsList"]'\
- 'RAWtoALL:from InDetRecExample.InDetJobProperties import InDetFlags;from PixelConditionsServices.PixelConditionsServicesConf import PixelCalibSvc;ServiceMgr +=PixelCalibSvc();InDetFlags.useDCS.set_Value_and_Lock(True);ServiceMgr.PixelCalibSvc.DisableDB=True; from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags; InDetDxAODFlags.DumpLArCollisionTime.set_Value_and_Lock(False);InDetDxAODFlags.DumpSctInfo.set_Value_and_Lock(True); InDetDxAODFlags.ThinHitsOnTrack.set_Value_and_Lock(False)'\
- --preInclude 'all:InDetSLHC_Example/preInclude.SLHC_Setup.py,InDetSLHC_Example/preInclude.SLHC_Setup_Strip_GMX.py' 'HITtoRDO:InDetSLHC_Example/preInclude.SLHC.py,InDetSLHC_Example/preInclude.SiliconOnly.py' 'default:InDetSLHC_Example/preInclude.SLHC.SiliconOnly.Reco.py,InDetSLHC_Example/SLHC_Setup_Reco_TrackingGeometry_GMX.py'\
- --postExec 'HITtoRDO:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'RAWtoALL:ToolSvc.InDetSCT_ClusteringTool.useRowInformation=True; from AthenaCommon.AppMgr import ToolSvc; ToolSvc.InDetTrackSummaryTool.OutputLevel=INFO;from InDetPhysValMonitoring.InDetPhysValMonitoringConf import InDetPhysValDecoratorAlg;decorators = InDetPhysValDecoratorAlg();topSequence += decorators;' 'all:ServiceMgr.PixelLorentzAngleSvc.ITkL03D = True'
-
-
-
-
-
-
-
- reco_stat=$?
- echo "art-result: $reco_stat reco"
- if [ "$reco_stat" -ne 0 ]; then
- echo "$script: Reco_tf.py isn't working yet. Remove jobReport.json to prevent pilot declaring a failed job."
- run rm -f jobReport.json
- fi
-
- mv ./PixelRDOAnalysis.root ./$dcubemon_digi_pixel
- mv ./SCT_RDOAnalysis.root ./$dcubemon_digi_strip
-
- # DCube digi plots
- dcube Reco_tf digi-plot "$dcubemon_digi_pixel" "$dcubecfg_digi_pixel" "$lastref_dir/$dcubemon_digi_pixel" "$dcube_digi_pixel_lastref"
- dcube Reco_tf "" "$dcubemon_digi_pixel" "$dcubecfg_digi_pixel" "$dcuberef_digi_pixel" "$dcube_digi_pixel_fixref"
-
- dcube Reco_tf digi-plot "$dcubemon_digi_strip" "$dcubecfg_digi_strip" "$lastref_dir/$dcubemon_digi_strip" "$dcube_digi_strip_lastref"
- dcube Reco_tf "" "$dcubemon_digi_strip" "$dcubecfg_digi_strip" "$dcuberef_digi_strip" "$dcube_digi_strip_fixref"
-
-fi
-
-if [ $dophy -ne 0 ]; then
-
- ## phys validation and dcube for single particles
- run ls -lLU "$esd_particle_energy"
-
- if [ ! -s "$esd_particle_energy" ]; then
- echo "$script: Reco_tf output '$esd_particle_energy' not created - exit" 2>&1
- echo "art-result: 21 physval"
-# test -n "$dcube_rec_fixref" && echo "art-result: 22 plot-fixref"
- test -n "$dcube_rec_lastref" && echo "art-result: 22 plot"
- exit
- fi
-
- # Run InDetPhysValMonitoring on DAOD.
- # It should eventually be possible to include this in the reco step, but this needs Reco_tf to support the ITk IDPVM setup.
- ( set -x
- exec athena.py InDetPhysValMonitoring/PhysValITk_jobOptions.py -c "INFILE='$daod_particle_energy'"
-###MW exec athena.py InDetSLHC_Example/PhysValITk_jobOptions.py -c "INFILE='$daod_particle_energy'"
- )
- echo "art-result: $? physval"
-
-
- mv ./MyPhysVal.root ./$dcubemon_rec
-
- # DCube InDetPhysValMonitoring performance plots
- dcube InDetPhysValMonitoring plot "$dcubemon_rec" "$dcubecfg_rec" "$lastref_dir/$dcubemon_rec" "$dcube_rec_lastref"
- dcube InDetPhysValMonitoring "" "$dcubemon_rec" "$dcubecfg_rec" "$dcuberef_rec" "$dcube_rec_fixref"
-
-fi
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV.sh
index 03ecdac7d270441c96f178ec0487b4d86ba0722c..9a23eaecdce3e19756b7310e13166ad719bf3e66 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV.sh
@@ -16,7 +16,7 @@ script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" electrons 100GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" electrons 100GeV ATLAS-P2-ITK-22-02-00 ${script} digital
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV_ana.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV_ana.sh
index a432c2a500dcef4e001ec6cbd3036b8e71b710dd..198bac9c98abb03d03cec0a3800212e47c4d7275 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV_ana.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_electrons_100GeV_ana.sh
@@ -11,12 +11,12 @@
#
-file=test_ITk_single_particle_ana.sh
+file=test_ITk_single_particle.sh
script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" electrons 100GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" electrons 100GeV ATLAS-P2-ITK-22-02-00 ${script} analogue
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV.sh
index 5790282ad678edd5b4ad5794efb82400a878fdc8..9e4ce9749c38fb7bf9bcb3f8a99e219459947dd0 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV.sh
@@ -16,7 +16,7 @@ script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" muons 100GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" muons 100GeV ATLAS-P2-ITK-22-02-00 ${script} digital
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV_ana.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV_ana.sh
index 21394206ad14e46ff6e880caaeb90021bfcc7b40..9d1cd9ae0e3c86ce53dce96b0013355672142ad7 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV_ana.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_100GeV_ana.sh
@@ -11,12 +11,12 @@
#
-file=test_ITk_single_particle_ana.sh
+file=test_ITk_single_particle.sh
script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" muons 100GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" muons 100GeV ATLAS-P2-ITK-22-02-00 ${script} analogue
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV.sh
index b2028458f11bc89f35e9e224bebcbfc3db62ec5e..c80a207ef27f4c2cfd8f9256403b5bb036aea6d6 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV.sh
@@ -16,7 +16,7 @@ script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" muons 10GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" muons 10GeV ATLAS-P2-ITK-22-02-00 ${script} digital
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV_ana.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV_ana.sh
index 8c718c20efbd4eb83984a82e7e8753aa993985c0..c4792117741649c7c7c9804c31e4b8919c1dca15 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV_ana.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_10GeV_ana.sh
@@ -11,12 +11,12 @@
#
-file=test_ITk_single_particle_ana.sh
+file=test_ITk_single_particle.sh
script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" muons 10GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" muons 10GeV ATLAS-P2-ITK-22-02-00 ${script} analogue
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV.sh
index 3f63aa3bfebc4e11f148b7da95fc2a12ff325a62..cd5cb7edfa9a60c9e449b2264934b7c82100cca0 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV.sh
@@ -16,7 +16,7 @@ script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" muons 1GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" muons 1GeV ATLAS-P2-ITK-22-02-00 ${script} digital
diff --git a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV_ana.sh b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV_ana.sh
index 5da4fa277d805b72ad73c7767cb9c198653e2193..c248cf690e2f139169af5da18d3444f5be128598 100755
--- a/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV_ana.sh
+++ b/InnerDetector/InDetExample/InDetSLHC_Example/test/test_ATLAS-P2-ITK-22-02-00_single_muons_1GeV_ana.sh
@@ -11,12 +11,12 @@
#
-file=test_ITk_single_particle_ana.sh
+file=test_ITk_single_particle.sh
script="`basename \"$0\"`"
echo "Executing script ${file}"
echo " "
-"$file" muons 1GeV ATLAS-P2-ITK-22-02-00 ${script}
+"$file" muons 1GeV ATLAS-P2-ITK-22-02-00 ${script} analogue