Merge branch 'master' into master

icecube · Jan 18, 2024 · 785cafe · 785cafe
2 parents ab0121c + 1ac75c5
commit 785cafe
Show file tree

Hide file tree

Showing 14 changed files with 3,018 additions and 79 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -4,8 +4,8 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/**",
-                "/data/root/include",
-                "/data/geant4/geant4-v11.1.1/install/include/Geant4"
+                "/data/n_kryb02/root/include",
+                "/data/n_kryb02/geant4-v11.1.2/install/include/Geant4"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/gcc",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "cmake.configureOnOpen": true,
-    "cmake.configureArgs": ["-DGeant4_DIR=/data/geant4/geant4-v11.1.1/install/lib/Geant4-11.1.1/"],
+    "cmake.configureArgs": ["-DGeant4_DIR=/data/n_kryb02/geant4-v11.1.2/install/lib/Geant4-v11.1.2/"],
     "files.associations": {
         "stdexcept": "cpp",
         "allocator": "cpp",

diff --git a/common/data/Materials/RiAbs_NicoChromium.dat b/common/data/Materials/RiAbs_NicoChromium.dat
@@ -0,0 +1,36 @@
+{
+   "jName": "RiAbs_NicoChromium_",
+   "jDataType": "RiAbs",
+   "jComponentName": [
+      "G4_Sb",
+      "G4_K",
+      "G4_Cs"
+   ],
+   "jComponents": {
+      "G4_Sb": 0.5,
+      "G4_O": 0.35,
+      "G4_Cs": 0.15
+   },
+   "jDensity": {
+      "jValue": 2.0,
+      "jUnit": "g/cm3"
+   },
+   "jState": "kStateSolid",
+   "jRefractiveIdx": [
+      2.69,
+      2.69
+   ],
+   "jRefractiveIdxWavelength": [
+      150,
+      730
+   ],
+   "jAbsLength": [
+      8.10981e-6,
+      8.10981e-6
+   ],
+   "jAbsLengthWavelength": [
+      350,
+      730
+   ]
+}
+
diff --git a/common/data/Materials/RiAbs_NicoGlass.dat b/common/data/Materials/RiAbs_NicoGlass.dat
@@ -0,0 +1,28 @@
+{
+   "jName": "RiAbs_NicoGlass_",
+   "jComponents": {
+      "G4_Pyrex_Glass": 1.0
+   },
+   "jDataType": "RiAbs",
+   "jDensity": {
+      "jValue": 2.23,
+      "jUnit": "g/cm3"
+   },
+   "jState": "kStateSolid",
+   "jRefractiveIdx": [
+      1.525,
+      1.525
+   ],
+   "jRefractiveIdxWavelength": [
+      150.0,
+      730.0
+   ],
+   "jAbsLength": [
+      100,
+      100
+   ],
+   "jAbsLengthWavelength": [
+      200.0,
+      700.0
+   ]
+}
diff --git a/common/data/Materials/RiAbs_NicoPalladium.dat b/common/data/Materials/RiAbs_NicoPalladium.dat
@@ -0,0 +1,36 @@
+{
+   "jName": "RiAbs_NicoPalladium_",
+   "jDataType": "RiAbs",
+   "jComponentName": [
+      "G4_Sb",
+      "G4_K",
+      "G4_Cs"
+   ],
+   "jComponents": {
+      "G4_Sb": 0.5,
+      "G4_O": 0.35,
+      "G4_Cs": 0.15
+   },
+   "jDensity": {
+      "jValue": 2.0,
+      "jUnit": "g/cm3"
+   },
+   "jState": "kStateSolid",
+   "jRefractiveIdx": [
+      1.61,
+      1.61
+   ],
+   "jRefractiveIdxWavelength": [
+      150,
+      730
+   ],
+   "jAbsLength": [
+      10.4937e+6,
+      10.4937e+6
+   ],
+   "jAbsLengthWavelength": [
+      350,
+      730
+   ]
+}
+
diff --git a/common/data/Materials/RiAbs_NicoPhotoCat.dat b/common/data/Materials/RiAbs_NicoPhotoCat.dat
@@ -0,0 +1,35 @@
+{
+   "jName": "RiAbs_NicoPhotCat",
+   "jDataType": "RiAbs",
+   "jComponentName": [
+      "G4_Sb",
+      "G4_K",
+      "G4_Cs"
+   ],
+   "jComponents": {
+      "G4_Sb": 0.5,
+      "G4_O": 0.35,
+      "G4_Cs": 0.15
+   },
+   "jDensity": {
+      "jValue": 2.0,
+      "jUnit": "g/cm3"
+   },
+   "jState": "kStateSolid",
+   "jRefractiveIdx": [
+      2.81,
+      3.14
+   ],
+   "jRefractiveIdxWavelength": [
+      150,
+      730
+   ],
+   "jAbsLength": [
+      1,
+      1
+   ],
+   "jAbsLengthWavelength": [
+      350,
+      730
+   ]
+}
diff --git a/common/data/Materials/RiAbs_TotalAbsorber.dat b/common/data/Materials/RiAbs_TotalAbsorber.dat
@@ -0,0 +1,35 @@
+{
+   "jName": "RiAbs_TotalAbsorber",
+   "jDataType": "RiAbs",
+   "jComponentName": [
+      "G4_Sb",
+      "G4_K",
+      "G4_Cs"
+   ],
+   "jComponents": {
+      "G4_Sb": 0.5,
+      "G4_O": 0.35,
+      "G4_Cs": 0.15
+   },
+   "jDensity": {
+      "jValue": 2.0,
+      "jUnit": "g/cm3"
+   },
+   "jState": "kStateSolid",
+   "jRefractiveIdx": [
+      1,
+      1
+   ],
+   "jRefractiveIdxWavelength": [
+      150,
+      730
+   ],
+   "jAbsLength": [
+      0.000000000000000000001,
+      0.000000000000000000001
+   ],
+   "jAbsLengthWavelength": [
+      150,
+      730
+   ]
+}
diff --git a/common/framework/include/OMSimHitManager.hh b/common/framework/include/OMSimHitManager.hh
@@ -14,7 +14,7 @@
 #define OMSimHitManager_h 1
 
 #include "OMSimPMTResponse.hh"
-
+#include "OMSimSensitiveDetector.hh"
 #include <G4ThreeVector.hh>
 #include <fstream>