Better data prep test: ACTS ART Test

Better data prep test: ACTS ART Test

InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_ttbar_PU200.sh → InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_run4_acts_dataprep_ttbar_PU200.sh

@@ -9,9 +9,9 @@
 # art-athena-mt: 8
 
 lastref_dir=last_results
-ref_trk=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPhysValMonitoring/ReferenceHistograms/ActsTest_AthenaRef.IDPVM.root
 dcubeXml=dcube_IDPVMPlots_ACTS_R22.xml
 rdo_23p0=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/PhaseIIUpgrade/RDO/ATLAS-P2-RUN4-03-00-00/mc21_14TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.recon.RDO.e8481_s4149_r14700/RDO.33629020._000047.pool.root.1
+nEvents=20
 
 # search in $DATAPATH for matching file
 dcubeXmlAbsPath=$(find -H ${DATAPATH//:/ } -mindepth 1 -maxdepth 1 -name $dcubeXml -print -quit 2>/dev/null)
@@ -35,18 +35,19 @@ run () {
     return $rc
 }
 
+# Run ACTS Reco
 export ATHENA_CORE_NUMBER=8
 ignore_pattern="ActsTrackFindingAlg.+ERROR.+Propagation.+reached.+the.+step.+count.+limit,ActsTrackFindingAlg.+ERROR.+Propagation.+failed:.+PropagatorError:3.+Propagation.+reached.+the.+configured.+maximum.+number.+of.+steps.+with.+the.+initial.+parameters"
-run "Reconstruction" \
+run "Reconstruction-acts" \
     Reco_tf.py --CA \
     --inputRDOFile ${rdo_23p0} \
-    --outputAODFile AOD.root \
+    --outputAODFile AOD.acts.root \
     --steering doRAWtoALL \
     --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude" \
     --postInclude "ActsConfig.ActsRegionsOfInterestConfig.ActsMainRegionsOfInterestCreatorAlgCfg,ActsConfig.ActsClusterizationConfig.ActsMainClusterizationCfg,ActsConfig.ActsSpacePointFormationConfig.ActsMainSpacePointFormationCfg,ActsConfig.ActsPostIncludes.PersistifyActsEDMCfg" \
     --preExec "flags.Reco.EnableHGTDExtension=False;flags.Acts.EDM.PersistifyClusters=True;flags.Acts.EDM.PersistifySpacePoints=True;" \
     --ignorePatterns "${ignore_pattern}" \
-    --maxEvents 20 \
+    --maxEvents ${nEvents} \
     --perfmon fullmonmt \
     --multithreaded
 
@@ -55,10 +56,39 @@ if [ $reco_rc != 0 ]; then
     exit $reco_rc
 fi
 
-run "IDPVM" \
+# Run Athena Reco
+run "Reconstruction-athena" \
+    Reco_tf.py --CA \
+    --inputRDOFile ${rdo_23p0} \
+    --outputAODFile AOD.athena.root \
+    --steering doRAWtoALL \
+    --preInclude "InDetConfig.ConfigurationHelpers.OnlyTrackingPreInclude" \
+    --postInclude "InDetConfig.InDetPrepRawDataFormationConfig.ITkInDetToXAODClusterConversionCfg,InDetConfig.SiSpacePointFormationConfig.InDetToXAODSpacePointConversionCfg,ActsConfig.ActsPostIncludes.PersistifyActsEDMCfg" \
+    --preExec "flags.Reco.EnableHGTDExtension=False;flags.Acts.EDM.PersistifyClusters=True;flags.Acts.EDM.PersistifySpacePoints=True;" \
+    --maxEvents ${nEvents} \
+    --perfmon fullmonmt \
+    --multithreaded
+
+reco_rc=$?
+if [ $reco_rc != 0 ]; then
+    exit $reco_rc
+fi
+
+run "IDPVM-acts" \
+    runIDPVM.py \
+    --filesInput AOD.acts.root \
+    --outputFile idpvm.acts.root \
+    --doActs
+
+reco_rc=$?
+if [ $reco_rc != 0 ]; then
+    exit $reco_rc
+fi
+
+run "IDPVM-athena" \
     runIDPVM.py \
-    --filesInput AOD.root \
-    --outputFile idpvm.root \
+    --filesInput AOD.athena.root \
+    --outputFile idpvm.athena.root \
     --doActs
 
 reco_rc=$?
@@ -74,14 +104,14 @@ run "dcube-last" \
     $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
     -p -x dcube_last \
     -c ${dcubeXmlAbsPath} \
-    -r ${lastref_dir}/idpvm.root \
-    idpvm.root
+    -r ${lastref_dir}/idpvm.acts.root \
+    idpvm.acts.root
 
 run "dcube-trk" \
     $ATLAS_LOCAL_ROOT/dcube/current/DCubeClient/python/dcube.py \
     -p -x dcube_trk \
     -c ${dcubeXmlAbsPath} \
-    -r ${ref_trk} \
-    idpvm.root
+    -r idpvm.athena.root \
+    idpvm.acts.root
 
 

Tracking/Acts/ActsConfig/python/ActsPostIncludes.py

@@ -32,7 +32,8 @@ def PersistifyActsEDMCfg(flags) -> ComponentAccumulator:
                       'xAOD::StripClusterAuxContainer#ITkConversionStripClustersAux.' + strip_cluster_variables]
         
     if flags.Acts.EDM.PersistifySpacePoints:
-        pixel_spacepoint_shortlist = ['-measurements']
+        pixel_spacepoint_shortlist = ['-measurements',
+                                      '-pixelSpacePointLink']
         strip_spacepoint_shortlist = ['topHalfStripLength', 
                                       'bottomHalfStripLength', 
                                       'topStripDirection',