test

CMakeLists.txt

@@ -31,34 +31,6 @@ find_package(OpenSSL REQUIRED)
 
 # For logging with spdlog
 find_package(spdlog REQUIRED)
-if(NOT spdlog_FOUND)
-    message(STATUS "spdlog not found. Will download and build it.")
-
-    set(SPDLOG_INSTALL_DIR ${CMAKE_BINARY_DIR}/spdlog-install)
-
-    ExternalProject_Add(
-        spdlog_external
-        GIT_REPOSITORY https://github.com/gabime/spdlog.git
-        GIT_TAG v1.11.0  # Specify the version you want
-        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR}
-            -DSPDLOG_BUILD_EXAMPLES=OFF
-            -DSPDLOG_BUILD_TESTS=OFF
-        )
-
-    set(spdlog_INCLUDE_DIRS ${SPDLOG_INSTALL_DIR}/include)
-    set(spdlog_LIBRARIES ${SPDLOG_INSTALL_DIR}/lib/libspdlog.a)
-
-    add_library(spdlog::spdlog STATIC IMPORTED)
-    set_target_properties(spdlog::spdlog PROPERTIES
-        IMPORTED_LOCATION ${spdlog_LIBRARIES}
-        INTERFACE_INCLUDE_DIRECTORIES ${spdlog_INCLUDE_DIRS}
-    )
-    add_dependencies(spdlog::spdlog spdlog_external)
-else()
-    message(STATUS "Found spdlog: ${spdlog_VERSION}")
-endif()
-
 
 # Include OpenSSL's headers in the project
 include_directories(${OPENSSL_INCLUDE_DIR})

README.md

@@ -33,11 +33,9 @@ For the latest updates and information, check our [GitHub repository](https://gi
 Install the required dependencies using:
 
 ```bash
-sudo apt-get -y install libxerces-c-dev libxmu-dev libxpm-dev libglu1-mesa-dev qtbase5-dev libmotif-dev libargtable2-0 libboost-all-dev libqt53dextras5 libfmt-dev
+sudo apt-get -y install libxerces-c-dev libxmu-dev libxpm-dev libglu1-mesa-dev qtbase5-dev libmotif-dev libargtable2-0 libboost-all-dev libqt53dextras5 libfmt-dev spdlog-dev
 ``` 
 
-Note: spdlog will be automatically installed by CMake if not found on your system.
-
 ### Installing ROOT
 
 1. Download the latest ROOT binary from [ROOT's official website](https://root.cern/releases/) (e.g., version 6.28/04 at the time of writing), or compile from source.

common/data/Materials/NoOptic_Absorber.dat

@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Absorber",
-   "jDataType": "NoOptic",
    "jComponents": {
       "G4_C": 1.0
    },

common/data/Materials/NoOptic_Photocathode (copy).dat

@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Photocathode",
-   "jDataType": "NoOptic",
    "jComponentName": [
       "G4_Sb",
       "G4_K",
@@ -16,4 +15,4 @@
       "jUnit": "g/cm3"
    },
    "jState": "kStateSolid"
-}
+}

common/data/Materials/NoOptic_Reflector.dat

@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Reflector",
-   "jDataType": "NoOptic",
    "jComponents": {
       "G4_Al": 1.0
    },

common/data/Materials/NoOptic_Stahl.dat

@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Stahl",
-   "jDataType": "NoOptic",
    "jComponents": {
       "G4_STAINLESS-STEEL": 1.0
    },

common/data/Materials/RiAbs_Absorber.dat

@@ -1,6 +1,5 @@
 {
    "jName": "RiAbs_Absorber",
-   "jDataType": "RiAbs",
    "jComponents": {
       "G4_AIR": 1.0
    },
@@ -9,20 +8,26 @@
       "jUnit": "mg/cm3"
    },
    "jState": "kStateGas",
-   "jRefractiveIdx": [
-      1.0003,
-      1.0003
-   ],
-   "jRefractiveIdxWavelength": [
-      150,
-      730
-   ],
-      "jAbsLength": [
-      0.0000000000000000000000000001,
-      0.0000000000000000000000000001
-   ],
-   "jAbsLengthWavelength": [
-      150,
-      730
-   ]
+   "jProperties": {
+      "RINDEX": {
+         "jValue": [
+            1.0003,
+            1.0003
+         ],
+         "jWavelength": [
+            150,
+            730
+         ]
+      },
+      "ABSLENGTH": {
+         "jValue": [
+            1e-28,
+            1e-28
+         ],
+         "jWavelength": [
+            150,
+            730
+         ]
+      }
+   }
 }