updated material handling

icecube · Aug 28, 2024 · 840fd48 · 840fd48
1 parent 7bf1528
commit 840fd48
Show file tree

Hide file tree

Showing 49 changed files with 7,574 additions and 7,617 deletions.
diff --git a/common/data/Materials/NoOptic_Absorber.dat b/common/data/Materials/NoOptic_Absorber.dat
@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Absorber",
-   "jDataType": "NoOptic",
    "jComponents": {
       "G4_C": 1.0
    },

diff --git a/common/data/Materials/NoOptic_Photocathode (copy).dat b/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"
-}
+}
diff --git a/common/data/Materials/NoOptic_Reflector.dat b/common/data/Materials/NoOptic_Reflector.dat
@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Reflector",
-   "jDataType": "NoOptic",
    "jComponents": {
       "G4_Al": 1.0
    },

diff --git a/common/data/Materials/NoOptic_Stahl.dat b/common/data/Materials/NoOptic_Stahl.dat
@@ -1,6 +1,5 @@
 {
    "jName": "NoOptic_Stahl",
-   "jDataType": "NoOptic",
    "jComponents": {
       "G4_STAINLESS-STEEL": 1.0
    },

diff --git a/common/data/Materials/RiAbs_Absorber.dat b/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
+         ]
+      }
+   }
 }