From 8a1a38a0bbbc29bee1025f59135d936db6410717 Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Thu, 16 Jan 2025 10:16:58 +0100
Subject: [PATCH 1/4] Fix the path to the pandora settings XML file

---
 CLDConfig/CLDReconstruction.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLDConfig/CLDReconstruction.xml b/CLDConfig/CLDReconstruction.xml
index 65272cc..88b8097 100644
--- a/CLDConfig/CLDReconstruction.xml
+++ b/CLDConfig/CLDReconstruction.xml
@@ -915,7 +915,7 @@
     <parameter name="StripSplittingOn" type="int">0 </parameter>
 
     <processor name="MyDDMarlinPandora_10ns" type="DDPandoraPFANewProcessor">
-      <parameter name="PandoraSettingsXmlFile" type="String"> PandoraSettingsFCCee/PandoraSettingsDefault.xml </parameter>
+      <parameter name="PandoraSettingsXmlFile" type="String"> PandoraSettingsCLD/PandoraSettingsDefault.xml </parameter>
       <parameter name="SoftwareCompensationWeights" type="FloatVec">2.40821 -0.0515852 0.000711414 -0.0254891 -0.0121505 -1.63084e-05 0.062149 0.0690735 -0.223064</parameter>
       <!-- Calibration constants -->
       <parameter name="ECalToMipCalibration" type="float">175.439</parameter>

From 1e60696816e384f39333069abbd0e6c1377e8b5a Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Thu, 16 Jan 2025 10:23:32 +0100
Subject: [PATCH 2/4] Use CLD_o2_v07 by default

---
 CLDConfig/CLDReconstruction.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CLDConfig/CLDReconstruction.xml b/CLDConfig/CLDReconstruction.xml
index 88b8097..8195a7c 100644
--- a/CLDConfig/CLDReconstruction.xml
+++ b/CLDConfig/CLDReconstruction.xml
@@ -123,7 +123,7 @@
     <!--Name of the DD4hep compact xml file to load-->
     <parameter name="EncodingStringParameter"> GlobalTrackerReadoutID </parameter>
     <parameter name="DD4hepXMLFile" type="string">
-      /cvmfs/clicdp.cern.ch/iLCSoft/builds/nightly/x86_64-slc6-gcc62-opt/lcgeo/HEAD/FCCee/compact/FCCee_o1_v04/FCCee_o1_v04.xml
+      /cvmfs/sw.hsf.org/key4hep/releases/2024-10-03/x86_64-almalinux9-gcc14.2.0-opt/k4geo/0.21-d5gbnd/share/k4geo/FCCee/CLD/compact/CLD_o2_v07/CLD_o2_v07.xml
     </parameter>
   </processor>
 

From b9d6dd367fa4d74321ef1427f4db0922839152ed Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Thu, 16 Jan 2025 10:26:59 +0100
Subject: [PATCH 3/4] Add a test to run with Marlin

---
 test/CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 932f858..d72a37f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -84,3 +84,8 @@ add_test(NAME Help
          COMMAND k4run --help CLDReconstruction.py
 )
 set_property(TEST Help APPEND PROPERTY PASS_REGULAR_EXPRESSION "show this help message and exit")
+
+add_test(NAME marlin
+         WORKING_DIRECTORY ${CLDConfig_DIR}
+         COMMAND Marlin --global.LCIOInputFiles=test.slcio --InitDD4hep.DD4hepXMLFile=${DETECTOR} CLDReconstruction.xml
+)

From 2a3b114b1788b84772a7f04cc593146be996fabb Mon Sep 17 00:00:00 2001
From: jmcarcell <jmcarcell@users.noreply.github.com>
Date: Thu, 16 Jan 2025 10:30:05 +0100
Subject: [PATCH 4/4] Add missing property

---
 test/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d72a37f..149c62a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -89,3 +89,4 @@ add_test(NAME marlin
          WORKING_DIRECTORY ${CLDConfig_DIR}
          COMMAND Marlin --global.LCIOInputFiles=test.slcio --InitDD4hep.DD4hepXMLFile=${DETECTOR} CLDReconstruction.xml
 )
+set_property(TEST marlin APPEND PROPERTY DEPENDS ddsim_lcio)