From cb70bb3ff943e887f111ac2fab615ace14eec677 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Fri, 10 Feb 2023 13:29:51 +0100 Subject: [PATCH 1/3] add pre-commit config files --- .clang-format | 10 ++++++++++ .cmake-format.yaml | 6 ++++++ .pre-commit-config.yaml | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 .clang-format create mode 100644 .cmake-format.yaml create mode 100644 .pre-commit-config.yaml diff --git a/.clang-format b/.clang-format new file mode 100644 index 00000000..f01f570b --- /dev/null +++ b/.clang-format @@ -0,0 +1,10 @@ +# Our style is based on the Google style +# https://google.github.io/styleguide/cppguide.html +BasedOnStyle: Google + +# we use left pointer alignment +DerivePointerAlignment: false +PointerAlignment: Left + +IndentWidth: 4 +ColumnLimit: 110 diff --git a/.cmake-format.yaml b/.cmake-format.yaml new file mode 100644 index 00000000..5b703c9d --- /dev/null +++ b/.cmake-format.yaml @@ -0,0 +1,6 @@ +# https://cmake-format.readthedocs.io/en/latest/configuration.html + +format: + tab_size: 4 + separate_ctrl_name_with_space: true + separate_fn_name_with_space: false diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..87c5b7f6 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,35 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: check-added-large-files + - id: check-case-conflict + - id: check-merge-conflict + - id: check-symlinks + - id: check-yaml + - id: check-xml + - id: requirements-txt-fixer + - id: end-of-file-fixer + exclude: external/.*$ + - id: mixed-line-ending + exclude: external/.*$ + - id: trailing-whitespace + exclude: external/.*$ + + - repo: https://github.com/pre-commit/mirrors-clang-format + rev: v15.0.6 + hooks: + - id: clang-format + exclude: external/.*$ + + - repo: https://github.com/cheshirekow/cmake-format-precommit + rev: v0.6.13 + hooks: + - id: cmake-format + additional_dependencies: [ pyyaml ] + # - id: cmake-lint + + - repo: https://github.com/psf/black + rev: 22.12.0 + hooks: + - id: black From e66594bcc99c6848f9f2de2f36729fae8e7e2278 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Fri, 10 Feb 2023 13:35:38 +0100 Subject: [PATCH 2/3] format files according to pre-commit config --- CMakeLists.txt | 71 +++++++++------- examples/01.NLDBD/NLDBD.rml | 2 +- .../01.NLDBD/geometry/myGeometryTemplate.gdml | 2 +- .../01.NLDBD/geometry/mySetupTemplate.gdml | 2 +- examples/02.TREXDM/g4Analysis.rml | 5 +- examples/02.TREXDM/geometry/README.md | 4 +- examples/03.Fluorescence/electron.rml | 2 +- examples/03.Fluorescence/g4Analysis.rml | 5 +- examples/03.Fluorescence/gamma.rml | 2 +- examples/03.Fluorescence/geometry/setup.gdml | 2 +- examples/05.PandaXIII/README.md | 7 +- .../05.PandaXIII/geometry/AcrylicPart.gdml | 1 - .../05.PandaXIII/geometry/CopperRings.gdml | 2 +- .../05.PandaXIII/geometry/LeadShelding.gdml | 1 - .../05.PandaXIII/geometry/OtherXeTMAGas.gdml | 1 - .../05.PandaXIII/geometry/Resistance.gdml | 2 +- .../05.PandaXIII/geometry/Th232_SS_01.rml | 4 +- .../05.PandaXIII/geometry/XeTMAGas_new.gdml | 1 - examples/06.IonRecoils/README.md | 1 - examples/06.IonRecoils/geometry/setup.gdml | 2 +- examples/06.IonRecoils/recoils.rml | 2 +- examples/07.FullChainDecay/README.md | 1 - examples/07.FullChainDecay/fullChain.rml | 2 +- .../07.FullChainDecay/geometry/setup.gdml | 2 +- examples/07.FullChainDecay/singleDecay.rml | 2 +- examples/08.Alphas/alphas.rml | 2 +- examples/08.Alphas/analysis.rml | 5 +- examples/09.Pb210_Shield/Pb210.rml | 2 +- examples/09.Pb210_Shield/README.md | 1 - examples/09.Pb210_Shield/geometry/setup.gdml | 2 +- examples/10.Geometries/Assembly.rml | 2 +- examples/10.Geometries/Validate.C | 2 +- .../geometry/assemblyDepthOne/geometry.gdml | 2 +- .../geometry/noAssembly/geometry.gdml | 2 +- examples/11.Xrays/Fe55.rml | 2 +- examples/11.Xrays/analysis.rml | 5 +- examples/11.Xrays/geometry/setup.gdml | 4 +- examples/11.Xrays/xrays.rml | 4 +- examples/12.Generators/geometry/setup.gdml | 2 +- examples/14.DetectorResponse/README.md | 3 +- examples/14.DetectorResponse/analysis.rml | 4 +- examples/14.DetectorResponse/geometry.gdml | 2 +- .../pandaXIII/biasing/externalTh232.rml | 2 +- .../v2.1.7/pandaXIII/biasing/externalU238.rml | 6 +- examples/v2.1.7/pandaXIII/generateExamples.sh | 9 +-- .../resistive/pandaXIII_Geometry.gdml | 8 +- .../geometry/resistive/pandaXIII_Setup.gdml | 1 - .../traditional/pandaXIII_Geometry.gdml | 10 +-- .../traditional/pandaXIII_Setup_WT12m.gdml | 51 ++++++------ .../traditional/pandaXIII_Setup_WT6m.gdml | 51 ++++++------ .../templates/biasedIsotopeFromVirtualBox.rml | 4 +- .../pandaXIII/templates/decay0FromVolume.rml | 4 +- .../pandaXIII/templates/isotopeFromPoint.rml | 4 +- .../templates/isotopeFromVCylinder.rml | 2 +- .../pandaXIII/templates/isotopeFromVolume.rml | 4 +- examples/v2.1.7/replaceRMLVars.py | 81 ++++++++++--------- mac/visualtrack.mac | 1 - src/ActionInitialization.cxx | 2 +- 58 files changed, 205 insertions(+), 209 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7185b4aa..aa01fb33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,15 +2,20 @@ project(restG4) message("=============== ${PROJECT_NAME} ==============") -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake ${CMAKE_MODULE_PATH}) +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake + ${CMAKE_MODULE_PATH}) if (${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME}) - # this will only be accessed when build restG4 as a standalone package, not when building the framework - CMAKE_MINIMUM_REQUIRED(VERSION 3.16) + # this will only be accessed when build restG4 as a standalone package, not + # when building the framework + cmake_minimum_required(VERSION 3.16) find_package(REST REQUIRED) string(FIND ${REST_LIBRARIES} "RestGeant4" REST_GEANT4_FOUND) - If (${REST_GEANT4_FOUND} EQUAL -1) - message(SEND_ERROR "REST found but 'RestGeant4' library is not present. Please install REST with Geant4Lib") + if (${REST_GEANT4_FOUND} EQUAL -1) + message( + SEND_ERROR + "REST found but 'RestGeant4' library is not present. Please install REST with Geant4Lib" + ) endif () endif () @@ -18,7 +23,10 @@ endif () find_package(ROOT REQUIRED COMPONENTS RIO Geom) execute_process(COMMAND root-config --cflags OUTPUT_VARIABLE ROOT_CFLAGS) string(STRIP ${ROOT_CFLAGS} ROOT_CFLAGS) -message(STATUS "-- Found ROOT version: ${ROOT_VERSION} with compilation flags: ${ROOT_CFLAGS} and libraries: ${ROOT_LIBRARIES}") +message( + STATUS + "-- Found ROOT version: ${ROOT_VERSION} with compilation flags: ${ROOT_CFLAGS} and libraries: ${ROOT_LIBRARIES}" +) # Find Geant4 find_package(Geant4 REQUIRED ui_all vis_all) @@ -28,7 +36,10 @@ message("-- Found Geant4 version: ${Geant4_VERSION}") # Check Geant4 C++ standard is correct execute_process(COMMAND geant4-config --cxxstd OUTPUT_VARIABLE GEANT4_CXX_STD) if (NOT ${GEANT4_CXX_STD} MATCHES "17") - message(FATAL_ERROR "Geant4 installation was compiled with C++${GEANT4_CXX_STD} standard, but C++17 is required for REST") + message( + FATAL_ERROR + "Geant4 installation was compiled with C++${GEANT4_CXX_STD} standard, but C++17 is required for REST" + ) endif () # Fix for older Geant4 versions @@ -36,7 +47,8 @@ if (${Geant4_VERSION} VERSION_LESS 11.0.0) add_compile_definitions(GEANT4_VERSION_LESS_11_0_0) endif () -# Fix to allow compatibility with older Geant4 versions that don't have G4RunManagerFactory +# Fix to allow compatibility with older Geant4 versions that don't have +# G4RunManagerFactory if (NOT EXISTS "${Geant4_INCLUDE_DIRS}/G4RunManagerFactory.hh") add_compile_definitions(GEANT4_WITHOUT_G4RunManagerFactory) endif () @@ -45,27 +57,32 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX ${REST_PATH}) endif () -message(STATUS "Package ${PROJECT_NAME} will be installed in ${CMAKE_INSTALL_PREFIX}") +message( + STATUS + "Package ${PROJECT_NAME} will be installed in ${CMAKE_INSTALL_PREFIX}") if (NOT CMAKE_CXX_FLAGS) set(CMAKE_CXX_FLAGS " -std=c++1y") endif () # Set include and lib -set(INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/include ${ROOT_INCLUDE_DIRS} ${Geant4_INCLUDE_DIR} ${REST_INCLUDE_DIRS}) +set(INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/include ${ROOT_INCLUDE_DIRS} + ${Geant4_INCLUDE_DIR} ${REST_INCLUDE_DIRS}) if (NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME}) set(INCLUDE_DIRS ${INCLUDE_DIRS} ${rest_include_dirs}) endif () -set(LINK_LIBRARIES ${Geant4_LIBRARIES} ${ROOT_LIBRARIES} RestFramework RestGeant4) +set(LINK_LIBRARIES ${Geant4_LIBRARIES} ${ROOT_LIBRARIES} RestFramework + RestGeant4) string(STRIP "${LINK_LIBRARIES}" LINK_LIBRARIES) file(GLOB sources ${PROJECT_SOURCE_DIR}/src/*.cxx) file(GLOB headers ${PROJECT_SOURCE_DIR}/include/*.h) # Create a library, necessary to enable testing -set(LIBRARY RestRestG4) # this way the `ADD_LIBRARY_TEST` macro will pick the library name correctly +set(LIBRARY RestRestG4) # this way the `ADD_LIBRARY_TEST` macro will pick the + # library name correctly add_library(${LIBRARY} SHARED) target_sources(${LIBRARY} PUBLIC ${sources}) @@ -73,34 +90,32 @@ target_link_libraries(${LIBRARY} ${LINK_LIBRARIES}) target_include_directories(${LIBRARY} SYSTEM PUBLIC ${INCLUDE_DIRS}) if (NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME}) - ADD_LIBRARY_TEST() + add_library_test() endif () # Add the executable add_executable(${PROJECT_NAME} main.cxx) -target_link_libraries( - ${PROJECT_NAME} PUBLIC - ${LIBRARY} -) +target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARY}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/examples - DESTINATION ${CMAKE_CURRENT_BINARY_DIR} - ) + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples/ - DESTINATION ./examples/restG4/ - COMPONENT install - ) +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples/ + DESTINATION ./examples/restG4/ + COMPONENT install) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mac - DESTINATION macros - COMPONENT install - ) +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mac + DESTINATION macros + COMPONENT install) install(TARGETS ${PROJECT_NAME} DESTINATION bin) install(TARGETS ${LIBRARY} DESTINATION lib) if (NOT ${CMAKE_PROJECT_NAME} STREQUAL ${PROJECT_NAME}) set(package_added "${PROJECT_NAME} ") - set(package_added ${package_added} PARENT_SCOPE) + set(package_added + ${package_added} + PARENT_SCOPE) endif () diff --git a/examples/01.NLDBD/NLDBD.rml b/examples/01.NLDBD/NLDBD.rml index 5b228df6..f5751ace 100644 --- a/examples/01.NLDBD/NLDBD.rml +++ b/examples/01.NLDBD/NLDBD.rml @@ -5,7 +5,7 @@ First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/01.NLDBD/geometry/myGeometryTemplate.gdml b/examples/01.NLDBD/geometry/myGeometryTemplate.gdml index 72dbb6c4..c10a5602 100644 --- a/examples/01.NLDBD/geometry/myGeometryTemplate.gdml +++ b/examples/01.NLDBD/geometry/myGeometryTemplate.gdml @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/examples/01.NLDBD/geometry/mySetupTemplate.gdml b/examples/01.NLDBD/geometry/mySetupTemplate.gdml index 8d9636dc..85e81889 100644 --- a/examples/01.NLDBD/geometry/mySetupTemplate.gdml +++ b/examples/01.NLDBD/geometry/mySetupTemplate.gdml @@ -9,7 +9,7 @@ - @@ -47,4 +47,3 @@ internal values are saved. - diff --git a/examples/02.TREXDM/geometry/README.md b/examples/02.TREXDM/geometry/README.md index 005635ec..91e14a02 100644 --- a/examples/02.TREXDM/geometry/README.md +++ b/examples/02.TREXDM/geometry/README.md @@ -1,8 +1,8 @@ This geometry was extracted from the [trexdm-geometry](https://lfna.unizar.es/gifna/trexdm-geometry) project. Check there for the most official and updated TREX-DM geometries. -These files define a very basic geometry without great detail but integrating the most important components. +These files define a very basic geometry without great detail but integrating the most important components. -- Complete enclosing vessel +- Complete enclosing vessel - Mylar cathode diff --git a/examples/03.Fluorescence/electron.rml b/examples/03.Fluorescence/electron.rml index 65b095ed..2c652f81 100644 --- a/examples/03.Fluorescence/electron.rml +++ b/examples/03.Fluorescence/electron.rml @@ -5,7 +5,7 @@ First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/03.Fluorescence/g4Analysis.rml b/examples/03.Fluorescence/g4Analysis.rml index 92a2e1cf..c6d351dc 100644 --- a/examples/03.Fluorescence/g4Analysis.rml +++ b/examples/03.Fluorescence/g4Analysis.rml @@ -1,7 +1,7 @@ - @@ -46,4 +46,3 @@ internal values are saved. - diff --git a/examples/03.Fluorescence/gamma.rml b/examples/03.Fluorescence/gamma.rml index 8c5dcc70..f8851d95 100644 --- a/examples/03.Fluorescence/gamma.rml +++ b/examples/03.Fluorescence/gamma.rml @@ -5,7 +5,7 @@ First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/03.Fluorescence/geometry/setup.gdml b/examples/03.Fluorescence/geometry/setup.gdml index 1cf13bc5..ecb17064 100644 --- a/examples/03.Fluorescence/geometry/setup.gdml +++ b/examples/03.Fluorescence/geometry/setup.gdml @@ -9,7 +9,7 @@ - - diff --git a/examples/07.FullChainDecay/README.md b/examples/07.FullChainDecay/README.md index 87bccfe0..f03dc62f 100644 --- a/examples/07.FullChainDecay/README.md +++ b/examples/07.FullChainDecay/README.md @@ -25,4 +25,3 @@ restG4 singleDecay.rml ``` See also `Validation.C` for validation routines executed in the pipeline. - diff --git a/examples/07.FullChainDecay/fullChain.rml b/examples/07.FullChainDecay/fullChain.rml index 6ede4297..8736043d 100644 --- a/examples/07.FullChainDecay/fullChain.rml +++ b/examples/07.FullChainDecay/fullChain.rml @@ -5,7 +5,7 @@ First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/07.FullChainDecay/geometry/setup.gdml b/examples/07.FullChainDecay/geometry/setup.gdml index 1cf13bc5..ecb17064 100644 --- a/examples/07.FullChainDecay/geometry/setup.gdml +++ b/examples/07.FullChainDecay/geometry/setup.gdml @@ -9,7 +9,7 @@ - - diff --git a/examples/08.Alphas/alphas.rml b/examples/08.Alphas/alphas.rml index d14726cc..9fcae1e1 100644 --- a/examples/08.Alphas/alphas.rml +++ b/examples/08.Alphas/alphas.rml @@ -3,7 +3,7 @@ File : config.rml First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/08.Alphas/analysis.rml b/examples/08.Alphas/analysis.rml index 7ccfa48e..b266c8d4 100644 --- a/examples/08.Alphas/analysis.rml +++ b/examples/08.Alphas/analysis.rml @@ -1,7 +1,7 @@ - @@ -50,4 +50,3 @@ internal values are saved. - diff --git a/examples/09.Pb210_Shield/Pb210.rml b/examples/09.Pb210_Shield/Pb210.rml index d77e45d5..4c2942f6 100644 --- a/examples/09.Pb210_Shield/Pb210.rml +++ b/examples/09.Pb210_Shield/Pb210.rml @@ -5,7 +5,7 @@ First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/09.Pb210_Shield/README.md b/examples/09.Pb210_Shield/README.md index 9c4f7cbc..8bcf3902 100644 --- a/examples/09.Pb210_Shield/README.md +++ b/examples/09.Pb210_Shield/README.md @@ -18,4 +18,3 @@ restG4 Pb210.rml ``` See also `Validation.C` for validation routines executed in the pipeline. - diff --git a/examples/09.Pb210_Shield/geometry/setup.gdml b/examples/09.Pb210_Shield/geometry/setup.gdml index 44ee284f..c7ebca65 100644 --- a/examples/09.Pb210_Shield/geometry/setup.gdml +++ b/examples/09.Pb210_Shield/geometry/setup.gdml @@ -9,7 +9,7 @@ - - diff --git a/examples/10.Geometries/Validate.C b/examples/10.Geometries/Validate.C index dc4c1354..0aa6a2ec 100644 --- a/examples/10.Geometries/Validate.C +++ b/examples/10.Geometries/Validate.C @@ -57,7 +57,7 @@ Int_t Validate(const char* filename) { return 3; } - if (TMath::Abs(momentum.Mag() - 1) > 1e-4){ + if (TMath::Abs(momentum.Mag() - 1) > 1e-4) { cout << "Incorrect momentum magnitude: " << momentum.Mag() << endl; return 4; } diff --git a/examples/10.Geometries/geometry/assemblyDepthOne/geometry.gdml b/examples/10.Geometries/geometry/assemblyDepthOne/geometry.gdml index 10b67635..54c5aba3 100644 --- a/examples/10.Geometries/geometry/assemblyDepthOne/geometry.gdml +++ b/examples/10.Geometries/geometry/assemblyDepthOne/geometry.gdml @@ -184,4 +184,4 @@ - \ No newline at end of file + diff --git a/examples/10.Geometries/geometry/noAssembly/geometry.gdml b/examples/10.Geometries/geometry/noAssembly/geometry.gdml index a85b4611..255d7f7f 100644 --- a/examples/10.Geometries/geometry/noAssembly/geometry.gdml +++ b/examples/10.Geometries/geometry/noAssembly/geometry.gdml @@ -177,4 +177,4 @@ - \ No newline at end of file + diff --git a/examples/11.Xrays/Fe55.rml b/examples/11.Xrays/Fe55.rml index fc71eed3..e459d772 100644 --- a/examples/11.Xrays/Fe55.rml +++ b/examples/11.Xrays/Fe55.rml @@ -3,7 +3,7 @@ File : config.rml First concept author J. Galan (26-Apr-2015) --> - diff --git a/examples/11.Xrays/analysis.rml b/examples/11.Xrays/analysis.rml index c4074e69..ea6b5ee3 100644 --- a/examples/11.Xrays/analysis.rml +++ b/examples/11.Xrays/analysis.rml @@ -1,7 +1,7 @@ - @@ -46,4 +46,3 @@ internal values are saved. - diff --git a/examples/11.Xrays/geometry/setup.gdml b/examples/11.Xrays/geometry/setup.gdml index a6a55cdc..1949d7ed 100644 --- a/examples/11.Xrays/geometry/setup.gdml +++ b/examples/11.Xrays/geometry/setup.gdml @@ -9,7 +9,7 @@ - - @@ -66,7 +66,7 @@ By default REST units are mm, keV and degrees // Use only one EM physics list - + diff --git a/examples/12.Generators/geometry/setup.gdml b/examples/12.Generators/geometry/setup.gdml index 16379842..b01e8bb8 100644 --- a/examples/12.Generators/geometry/setup.gdml +++ b/examples/12.Generators/geometry/setup.gdml @@ -9,7 +9,7 @@ - diff --git a/examples/14.DetectorResponse/geometry.gdml b/examples/14.DetectorResponse/geometry.gdml index 8d96747a..96173a9c 100644 --- a/examples/14.DetectorResponse/geometry.gdml +++ b/examples/14.DetectorResponse/geometry.gdml @@ -13,7 +13,7 @@ - + diff --git a/examples/v2.1.7/pandaXIII/biasing/externalTh232.rml b/examples/v2.1.7/pandaXIII/biasing/externalTh232.rml index f5e8b4d5..e2fca5cf 100644 --- a/examples/v2.1.7/pandaXIII/biasing/externalTh232.rml +++ b/examples/v2.1.7/pandaXIII/biasing/externalTh232.rml @@ -1,6 +1,6 @@ - - + diff --git a/examples/v2.1.7/pandaXIII/geometry/resistive/pandaXIII_Setup.gdml b/examples/v2.1.7/pandaXIII/geometry/resistive/pandaXIII_Setup.gdml index 81be8232..b4b60551 100644 --- a/examples/v2.1.7/pandaXIII/geometry/resistive/pandaXIII_Setup.gdml +++ b/examples/v2.1.7/pandaXIII/geometry/resistive/pandaXIII_Setup.gdml @@ -47,4 +47,3 @@ &solids; - diff --git a/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Geometry.gdml b/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Geometry.gdml index 62341726..33dc397b 100644 --- a/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Geometry.gdml +++ b/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Geometry.gdml @@ -12,13 +12,13 @@ - + - + @@ -601,7 +601,7 @@ - + @@ -770,7 +770,7 @@ - + @@ -917,7 +917,7 @@ - + diff --git a/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT12m.gdml b/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT12m.gdml index 373e3b27..4a9a384d 100644 --- a/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT12m.gdml +++ b/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT12m.gdml @@ -40,7 +40,7 @@ - + @@ -147,53 +147,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,4 +227,3 @@ &solids; - diff --git a/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT6m.gdml b/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT6m.gdml index 3f1da1ae..1a169cc7 100644 --- a/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT6m.gdml +++ b/examples/v2.1.7/pandaXIII/geometry/traditional/pandaXIII_Setup_WT6m.gdml @@ -40,7 +40,7 @@ - + @@ -147,53 +147,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,4 +227,3 @@ &solids; - diff --git a/examples/v2.1.7/pandaXIII/templates/biasedIsotopeFromVirtualBox.rml b/examples/v2.1.7/pandaXIII/templates/biasedIsotopeFromVirtualBox.rml index f76d1d6e..9742f219 100644 --- a/examples/v2.1.7/pandaXIII/templates/biasedIsotopeFromVirtualBox.rml +++ b/examples/v2.1.7/pandaXIII/templates/biasedIsotopeFromVirtualBox.rml @@ -1,6 +1,6 @@ -