Small fixes in recipe and input file for recipe (#52)

key4hep · Dec 4, 2023 · d44c21a · d44c21a
1 parent c856ebc
commit d44c21a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/docs/clic-recipe.md b/docs/clic-recipe.md
@@ -32,7 +32,7 @@ git clone https://github.com/iLCSoft/CLICPerformance
 cd CLICPerformance/clicConfig
 ddsim --steeringFile clic_steer.py --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml --enableGun --gun.distribution uniform --gun.particle gamma --gun.energy 10*GeV --outputFile gamma_10GeV_edm4hep.root --numberOfEvents 10
 
-cp ../../k4MarlinWrapper/test/gaudi_opts/clicRec_e4h_input.py .
+cp $K4MARLINWRAPPER/examples/clicRec_e4h_input.py .
 k4run clicRec_e4h_input.py --EventDataSvc.input gamma_10GeV_edm4hep.root
 
 #Run CLUE in CLIC reconstruction

diff --git a/gaudi_opts/clicRec_e4h_input_gps.py b/gaudi_opts/clicRec_e4h_input_gps.py
@@ -103,7 +103,7 @@
 InitDD4hep.OutputLevel = WARNING
 InitDD4hep.ProcessorType = "InitializeDD4hep"
 InitDD4hep.Parameters = {
-                         "DD4hepXMLFile": [os.environ["K4GEO"]+"/compact/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml"],
+                         "DD4hepXMLFile": [os.environ["K4GEO"]+"/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml"],
                          "EncodingStringParameter": ["GlobalTrackerReadoutID"]
                          }
 
@@ -701,7 +701,7 @@
                                   "FullRecoRelation": ["false"],
                                   "InvertedNonDestructiveInteractionLogic": ["false"],
                                   "KeepDaughtersPDG": ["22", "111", "310", "13", "211", "321", "3120"],
-                                  "MCParticleCollection": ["MCParticles"],
+                                  "MCParticleCollection": ["MCPhysicsParticles"],
                                   "MCParticlesSkimmedName": ["MCParticlesSkimmed"],
                                   "MCTruthClusterLinkName": [],
                                   "MCTruthRecoLinkName": [],

diff --git a/gaudi_opts/clicRec_e4h_input_gun_clue.py b/gaudi_opts/clicRec_e4h_input_gun_clue.py
@@ -16,6 +16,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+import os 
+
 from Gaudi.Configuration import *
 
 from Configurables import LcioEvent, MarlinProcessorWrapper
@@ -43,7 +46,7 @@
 
 from Configurables import k4DataSvc, PodioInput
 evtsvc = k4DataSvc('EventDataSvc')
-evtsvc.input = '$TEST_DIR/inputFiles/ttbar_edm4hep_frame.root'
+evtsvc.input = os.path.join('$TEST_DIR/inputFiles/', os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root"))
 
 
 inp = PodioInput('InputReader')
@@ -1720,6 +1723,9 @@
   "BuildUpVertices_V0": "BuildUpVertices_V0",
   "BuildUpVertices": "BuildUpVertices",
   "PrimaryVertices": "PrimaryVertices",
+  "BuildUpVertices_RP": "BuildUpVertices_RP",
+  "BuildUpVertices_V0_RP": "BuildUpVertices_V0_RP",
+  "PrimaryVertices_RP": "PrimaryVertices_RP",
   }
 VertexFinderLCIOConv.OutputLevel = DEBUG
 # Add it to VertexFinder Algorithm
@@ -1789,9 +1795,9 @@
 MyClueGaudiAlgorithmWrapper.OutputLevel = INFO
 MyClueGaudiAlgorithmWrapper.BarrelCaloHitsCollection = "ECALBarrel"
 MyClueGaudiAlgorithmWrapper.EndcapCaloHitsCollection = "ECALEndcap"
-MyClueGaudiAlgorithmWrapper.CriticalDistance = 10.00
+MyClueGaudiAlgorithmWrapper.CriticalDistance = 15.00
 MyClueGaudiAlgorithmWrapper.MinLocalDensity = 0.02
-MyClueGaudiAlgorithmWrapper.OutlierDeltaFactor = 1.00
+MyClueGaudiAlgorithmWrapper.OutlierDeltaFactor = 3.00
 
 # EDM4hep to LCIO converter
 ClueAlgorithmEDM4hepConv = EDM4hep2LcioTool("MyDDMarlinPandoraEDM4hep2lcioConv")
@@ -1824,6 +1830,7 @@
 out = PodioOutput("PodioOutput", filename = "my_output_clue.root")
 out.outputCommands = ["keep *"]
 
+
 algList.append(inp)
 algList.append(MyAIDAProcessor)
 algList.append(EventNumber)