Change LCGEO to K4GEO

key4hep · Sep 5, 2023 · 3c06536 · 3c06536
1 parent f54a963
commit 3c06536
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/doc/starterkit/k4MarlinWrapperCLIC/CEDViaWrapper.md b/doc/starterkit/k4MarlinWrapperCLIC/CEDViaWrapper.md
@@ -40,7 +40,7 @@ To create an input file for the event display we run a simple detector simulatio
 
 ```bash
 ddsim --steeringFile CLICPerformance/clicConfig/clic_steer.py \
-      --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
+      --compactFile $K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
       --enableGun \
       --gun.distribution uniform \
       --gun.particle gamma \

diff --git a/doc/starterkit/k4MarlinWrapperCLIC/Readme.md b/doc/starterkit/k4MarlinWrapperCLIC/Readme.md
@@ -48,7 +48,7 @@ output in such format:
 ```bash
 cd CLICPerformance/clicConfig
 
-ddsim --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
+ddsim --compactFile $K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
       --outputFile ttbar_edm4hep.root \
       --steeringFile clic_steer.py \
       --inputFiles ../Tests/yyxyev_000.stdhep \
@@ -61,7 +61,7 @@ in such format:
 ```bash
 cd CLICPerformance/clicConfig
 
-ddsim --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
+ddsim --compactFile $K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
       --outputFile ttbar.slcio \
       --steeringFile clic_steer.py \
       --inputFiles ../Tests/yyxyev_000.stdhep \
@@ -79,7 +79,7 @@ To run the reconstruction with ``Marlin``:
 cd CLICPerformance/clicConfig
 
 Marlin clicReconstruction.xml \
-       --InitDD4hep.DD4hepXMLFile=$LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
+       --InitDD4hep.DD4hepXMLFile=$K4GEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml \
        --global.LCIOInputFiles=ttbar.slcio \
        --global.MaxRecordNumber=3
 ```

diff --git a/k4MarlinWrapper/examples/runit.py b/k4MarlinWrapper/examples/runit.py
@@ -58,7 +58,7 @@
 proc1.ProcessorType = "InitializeDD4hep"
 proc1.Parameters = {#"EncodingStringParameter", "GlobalTrackerReadoutID"},
                     #"DD4hepXMLFile", "/cvmfs/clicdp.cern.ch/iLCSoft/builds/nightly/x86_64-slc6-gcc62-opt/lcgeo/HEAD/CLIC/compact/CLIC_o3_v13/CLIC_o3_v13.xml"},
-                    "DD4hepXMLFile": [os.path.join(os.environ["LCGEO"], "CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml")],
+                    "DD4hepXMLFile": [os.path.join(os.environ["K4GEO"], "CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml")],
                     }
 algList.append(proc1)
 

diff --git a/test/gaudi_opts/clicReconstruction_mt.py b/test/gaudi_opts/clicReconstruction_mt.py
@@ -173,7 +173,7 @@
 InitDD4hep.OutputLevel = WARNING
 InitDD4hep.ProcessorType = "InitializeDD4hep"
 InitDD4hep.Parameters = {
-                          "DD4hepXMLFile": [os.environ["LCGEO"]+"/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml"],
+                          "DD4hepXMLFile": [os.environ["K4GEO"]+"/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml"],
                          "EncodingStringParameter": ["GlobalTrackerReadoutID"]
                          }
 

diff --git a/test/gaudi_opts/simple_processors.py b/test/gaudi_opts/simple_processors.py
@@ -55,7 +55,7 @@
 proc1.OutputLevel = DEBUG
 proc1.ProcessorType = "InitializeDD4hep"
 proc1.Parameters = {#"EncodingStringParameter": ["GlobalTrackerReadoutID"],
-                    "DD4hepXMLFile": [os.path.join(os.environ.get('LCGEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
+                    "DD4hepXMLFile": [os.path.join(os.environ.get('K4GEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
                     }
 algList.append(proc1)
 
@@ -84,3 +84,4 @@
                 ExtSvc = [evtsvc],
                 OutputLevel=DEBUG
 )
+
diff --git a/test/gaudi_opts/simple_processors2.py b/test/gaudi_opts/simple_processors2.py
@@ -55,7 +55,7 @@
 proc1.OutputLevel = DEBUG
 proc1.ProcessorType = "InitializeDD4hep"
 proc1.Parameters = {#"EncodingStringParameter": ["GlobalTrackerReadoutID"],
-                     "DD4hepXMLFile": [os.path.join(os.environ.get('LCGEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
+                     "DD4hepXMLFile": [os.path.join(os.environ.get('K4GEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
                     }
 algList.append(proc1)
 

diff --git a/test/gaudi_opts/simple_processors3.py b/test/gaudi_opts/simple_processors3.py
@@ -64,7 +64,7 @@
 proc1.OutputLevel = DEBUG
 proc1.ProcessorType = "InitializeDD4hep"
 proc1.Parameters = {#"EncodingStringParameter": ["GlobalTrackerReadoutID"],
-                     "DD4hepXMLFile": [os.path.join(os.environ.get('LCGEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
+                     "DD4hepXMLFile": [os.path.join(os.environ.get('K4GEO'), 'CLIC/compact/CLIC_o2_v04/CLIC_o2_v04.xml')]
                     }
 algList.append(proc1)