const properties always with unit

icecube · Aug 29, 2024 · e3112d6 · e3112d6
1 parent fe5b1b5
commit e3112d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/common/data/Materials/Surf_Generic_Photocathode_20nm.dat b/common/data/Materials/Surf_Generic_Photocathode_20nm.dat
@@ -3,7 +3,11 @@
    "jFinish": "polished",
    "jType": "coated",
    "jConstProperties": {
-   "COATEDTHICKNESS": 20
+   "COATEDTHICKNESS":  {
+         "jValue": 20,
+         "jUnit": "nm",
+         "jInvertUnit" : ""
+      }
    },
    "jProperties": {
       "RINDEX": {

diff --git a/common/data/scintillation/Custom_Vitrovex_radioactivity.dat b/common/data/scintillation/Custom_Vitrovex_radioactivity.dat
@@ -1,7 +1,7 @@
 {
    "jName": "Radioactivity_Vitrovex",
    "jMaterialName": "RiAbs_Glass_Vitrovex",
-   "ConstProperties": {
+   "jConstProperties": {
       "K40_ACTIVITY": {
          "jValue": 61,
          "jUnit": "kg",

diff --git a/common/framework/src/OMSimMaterialHandler.cc b/common/framework/src/OMSimMaterialHandler.cc
@@ -154,8 +154,8 @@ void OMSimMaterialHandler::processConstProperties()
   for (const auto &property : m_jsonTree.get_child("jConstProperties"))
   {
     G4String key = property.first;
-    G4double value = property.second.get_value<G4double>();
-    m_MPT->AddConstProperty(key.c_str(), value);
+    G4double value = m_fileData->getValueWithUnit(m_jsonTree.get<G4String>("jName"), "jConstProperties." + key);
+    m_MPT->AddConstProperty(key.c_str(), value, true);
   }
 }