diff --git a/.gitignore b/.gitignore index 25122738..e644d2ec 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,5 @@ node_modules book.pdf *~ build -venv \ No newline at end of file +venv +.vscode \ No newline at end of file diff --git a/4-full-detector-sim/FCCeeGeneralOverview/FCCeeGeneralOverview.md b/4-full-detector-sim/FCCeeGeneralOverview/FCCeeGeneralOverview.md index 366c50bd..e5d766e5 100644 --- a/4-full-detector-sim/FCCeeGeneralOverview/FCCeeGeneralOverview.md +++ b/4-full-detector-sim/FCCeeGeneralOverview/FCCeeGeneralOverview.md @@ -373,9 +373,9 @@ Let's first generate the files containing the geometry that will be used by the ```bash cd ../../.. -wget https://fccsw.web.cern.ch/fccsw/tutorials/static/python/dd4hep2root -chmod +x dd4hep2root -./dd4hep2root -c $K4GEO/FCCee/CLD/compact/CLD_o2_v07/CLD_o2_v07.xml -o CLD_o2_v07_geom.root +wget https://raw.githubusercontent.com/key4hep/k4geo/main/utils/dd4hep2root.py +chmod +x dd4hep2root.py +./dd4hep2root.py -c $K4GEO/FCCee/CLD/compact/CLD_o2_v07/CLD_o2_v07.xml -o CLD_o2_v07_geom.root echo $PWD/CLD_o2_v07_geom.root ``` diff --git a/4-full-detector-sim/Visualization/Visualization.md b/4-full-detector-sim/Visualization/Visualization.md index 1c7043e9..30a6c4d0 100644 --- a/4-full-detector-sim/Visualization/Visualization.md +++ b/4-full-detector-sim/Visualization/Visualization.md @@ -219,7 +219,7 @@ There are several ways how to import FCC detector geometry into Phoenix. Currently the preferred method is to convert compact DD4hep file(s) to ROOT files and from ROOT files to glTF files. The first conversion (`.xml` -> `.root`) is straightforward and can be done using script like -[this](https://fccsw.web.cern.ch/fccsw/tutorials/static/python/dd4hep2root). +[this](https://github.com/key4hep/k4geo/blob/main/utils/dd4hep2root.py). With the most important part being the building of the detector geometry from the compact file @@ -237,17 +237,17 @@ ROOT.gGeoManager.Export(out_path) ``` We will try to convert FCCee Noble Liquid Calorimeter. On the remote machine -with FCCSW stack already sourced download the `dd4hep2root` script +with FCCSW stack already sourced download the `dd4hep2root.py` script ```sh -wget https://fccsw.web.cern.ch/fccsw/tutorials/static/python/dd4hep2root +wget https://raw.githubusercontent.com/key4hep/k4geo/main/utils/dd4hep2root.py ``` make it executable -``` -chmod u+x dd4hep2root +```sh +chmod u+x dd4hep2root.py ``` and run the conversion with ```sh -./dd4hep2root -c ${FCCDETECTORS}/Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectEmptyMaster.xml \ +./dd4hep2root.py -c ${FCCDETECTORS}/Detector/DetFCCeeIDEA-LAr/compact/FCCee_DectEmptyMaster.xml \ ${FCCDETECTORS}/Detector/DetFCCeeECalInclined/compact/FCCee_ECalBarrel.xml -o fccee_lar.root ```